Revert "cros_bundle_firmware: Support selection of a skeleton file"
This reverts commit 85dd6930d8017c40e214130bc2c95133ec54a574.
Specifically, reverting CL Id3694559.
Looks to be the cause of:
http://build.chromium.org/p/chromiumos/builders/tegra2%20seaboard%20full/builds/3501/steps/BuildTarget/logs/stdio
Change-Id: I2cede6bf5078d5d78a7ec121c50b490c1bece57a
Reviewed-on: https://gerrit.chromium.org/gerrit/24918
Reviewed-by: Brian Harring <ferringb@chromium.org>
Tested-by: Brian Harring <ferringb@chromium.org>
diff --git a/host/lib/bundle_firmware.py b/host/lib/bundle_firmware.py
index 201068a..064546b 100644
--- a/host/lib/bundle_firmware.py
+++ b/host/lib/bundle_firmware.py
@@ -103,7 +103,6 @@
self.exynos_bl1 = None # Filename of Exynos BL1 (pre-boot)
self.exynos_bl2 = None # Filename of Exynos BL2 (SPL)
self.spl_source = 'straps' # SPL boot according to board settings
- self.skeleton_fname = None # Filename of Coreboot skeleton file
def SetDirs(self, keydir):
"""Set up directories required for Bundle.
@@ -114,8 +113,7 @@
self._keydir = keydir
def SetFiles(self, board, bct, uboot=None, bmpblk=None, coreboot=None,
- postload=None, seabios=None, exynos_bl1=None, exynos_bl2=None,
- skeleton=None):
+ postload=None, seabios=None, exynos_bl1=None, exynos_bl2=None):
"""Set up files required for Bundle.
Args:
@@ -126,9 +124,6 @@
coreboot: The filename of the coreboot image to use (on x86)
postload: The filename of the u-boot-post.bin image to use.
seabios: The filename of the SeaBIOS payload to use if any.
- exynos_bl1: The filename of the exynos BL1 file
- exynos_bl2: The filename of the exynos BL2 file (U-Boot spl)
- skeleton: The filename of the coreboot skeleton file.
"""
self._board = board
self.uboot_fname = uboot
@@ -139,7 +134,6 @@
self.seabios_fname = seabios
self.exynos_bl1 = exynos_bl1
self.exynos_bl2 = exynos_bl2
- self.skeleton_fname = skeleton
def SetOptions(self, small):
"""Set up options supported by Bundle.
@@ -185,10 +179,6 @@
self.exynos_bl1 = os.path.join(build_root, 'E5250.nbl1.bin')
if not self.exynos_bl2:
self.exynos_bl2 = os.path.join(build_root, 'smdk5250-spl.bin')
- if not self.coreboot_fname:
- self.coreboot_fname = os.path.join(build_root, 'coreboot.rom')
- if not self.skeleton_fname:
- self.skeleton_fname = os.path.join(build_root, 'skeleton.bin')
def GetFiles(self):
"""Get a list of files that we know about.
@@ -748,7 +738,6 @@
# Get all our blobs ready
pack.AddProperty('boot', self.uboot_fname)
- pack.AddProperty('skeleton', self.skeleton_fname)
# Make a copy of the fdt for the bootstub
fdt_data = self._tools.ReadFile(fdt.fname)