Revert "cros_bundle_firmware: Add a 'firmware-type' in each firmware's fdt"
This reverts commit 85aba960bcd75638ebcafbef8e6c4f765f4ad054.
BUG=chrome-os-partner:14545
BRANCH=link
TEST=none
The original commit made an artificial distinction between the two RW BIOS
images to help with debugging. We need to take that back out so that they're
identical again. There *shouldn't* be any difference, but if the bits are
different there's a nagging suspicion that they just *might* behave
differently.
Change-Id: Id6bdf3e62ed50bb0bd7a8bf2f0b2a9711d079d53
Signed-off-by: Bill Richardson <wfrichar@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/36511
Reviewed-by: Simon Glass <sjg@chromium.org>
diff --git a/host/lib/bundle_firmware.py b/host/lib/bundle_firmware.py
index 272de3b..388959c 100644
--- a/host/lib/bundle_firmware.py
+++ b/host/lib/bundle_firmware.py
@@ -808,17 +808,6 @@
pack.AddProperty('skeleton', self.skeleton_fname)
pack.AddProperty('dtb', fdt.fname)
- # Let's create some copies of the fdt for vboot. These can be used to
- # pass a different fdt to each firmware type. For now it is just used to
- # check that the right fdt comes through.
- fdt_rwa = fdt.Copy(os.path.join(self._tools.outdir, 'updated-rwa.dtb'))
- fdt_rwa.PutString('/chromeos-config', 'firmware-type', 'rw-a')
- pack.AddProperty('dtb-rwa', fdt_rwa.fname)
- fdt_rwb = fdt.Copy(os.path.join(self._tools.outdir, 'updated-rwb.dtb'))
- fdt_rwb.PutString('/chromeos-config', 'firmware-type', 'rw-b')
- pack.AddProperty('dtb-rwb', fdt_rwb.fname)
- fdt.PutString('/chromeos-config', 'firmware-type', 'ro')
-
# 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)
