cros_bundle_firmware: Setup fdt configuration values earlier
BUG=chromium:595715
BRANCH=none
TEST=none
Change-Id: I61d07d13752019288862670416b961a73028ee54
Signed-off-by: Patrick Georgi <pgeorgi@google.com>
Reviewed-on: https://chromium-review.googlesource.com/397618
Commit-Ready: Patrick Georgi <pgeorgi@chromium.org>
Tested-by: Patrick Georgi <pgeorgi@chromium.org>
Reviewed-by: Martin Roth <martinroth@chromium.org>
diff --git a/host/lib/bundle_firmware.py b/host/lib/bundle_firmware.py
index 224bae6..9dc326a 100644
--- a/host/lib/bundle_firmware.py
+++ b/host/lib/bundle_firmware.py
@@ -922,8 +922,6 @@
self._out.Notice("Model: %s" % fdt.GetString('/', 'model'))
pack = PackFirmware(self._tools, self._out)
- if self._force_efs:
- fdt.PutInteger('/chromeos-config', 'early-firmware-selection', 1)
pack.use_efs = fdt.GetInt('/chromeos-config', 'early-firmware-selection',
0)
@@ -936,10 +934,6 @@
pack.AddProperty('skeleton', self.skeleton_fname)
pack.AddProperty('dtb', fdt.fname)
- # If we are writing a kernel, add its offset from TEXT_BASE to the fdt.
- if self.kernel_fname:
- fdt.PutInteger('/config', 'kernel-offset', pack.image_size)
-
if gbb:
pack.AddProperty('gbb', gbb)
@@ -1041,6 +1035,12 @@
fdt = fdt.Copy(os.path.join(self._tools.outdir, 'updated.dtb'))
self.fdt = fdt
fdt.PutString('/chromeos-config', 'board', self._board)
+ if self._force_efs:
+ fdt.PutInteger('/chromeos-config', 'early-firmware-selection', 1)
+ # If we are writing a kernel, add its offset from TEXT_BASE to the fdt.
+ if self.kernel_fname:
+ fdt.PutInteger('/config', 'kernel-offset', pack.image_size)
+
if fdt.GetProp('/flash', 'reg', ''):
raise ValueError('fmap.dts /flash is deprecated. Use chromeos.fmd')