diff options
| author | Patrick Georgi <pgeorgi@chromium.org> | 2017-01-23 13:21:44 +0100 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2017-01-24 23:23:06 +0100 |
| commit | 29c19a027af013d9fadb9b372c3378da6ed0586f (patch) | |
| tree | 3b4b655ec8752a3dbdea7afdc027e8219b0df0ef | |
| parent | 0ffef882d8357b1e14e983829e0a26415ab43b48 (diff) | |
Revert "chromeos: Fill in the firmware id (RO, RW A, RW B) FMAP sections"
This reverts commit 580db7fd9036134b1da4fe7340e306fee4681659.
There's a (parallel) mechanism more closely aligned with how the values
are filled in (fixed device part + version string) that landed from
Chrome OS downstream (see commit 4399b85fdd).
Change-Id: I5ccd06eadabb396452cc9d1d4dff780ea0720523
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Reviewed-on: https://review.coreboot.org/18205
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Martin Roth <martinroth@google.com>
| -rw-r--r-- | src/vendorcode/google/chromeos/Makefile.inc | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/src/vendorcode/google/chromeos/Makefile.inc b/src/vendorcode/google/chromeos/Makefile.inc index f0762bcb55..af5e1786e0 100644 --- a/src/vendorcode/google/chromeos/Makefile.inc +++ b/src/vendorcode/google/chromeos/Makefile.inc @@ -145,19 +145,6 @@ $(obj)/VBLOCK_%.bin: $(obj)/FW_MAIN_%.bin $(FUTILITY) --kernelkey "$(CONFIG_VBOOT_KERNEL_KEY)" \ --flags $(CONFIG_VBOOT_KEYBLOCK_PREAMBLE_FLAGS) -$(obj)/RO_FRID.bin: $(obj)/coreboot.rom - $(CBFSTOOL) $(obj)/coreboot.rom read -r $(basename $(notdir $@)) -f $@ - printf $(KERNELVERSION) > $@.tmp - objcopy -I binary -O binary --pad-to=$$( stat --printf="%s" $@ ) --gap-fill=0 $@.tmp $@ - -$(obj)/RW_FWID_%.bin: $(obj)/coreboot.rom - $(CBFSTOOL) $(obj)/coreboot.rom read -r $(basename $(notdir $@)) -f $@ - printf $(KERNELVERSION) > $@.tmp - objcopy -I binary -O binary --pad-to=$$( stat --printf="%s" $@ ) --gap-fill=0 $@.tmp $@ - -files_added:: $(obj)/VBLOCK_A.bin $(obj)/VBLOCK_B.bin $(obj)/RO_FRID.bin $(obj)/RW_FWID_A.bin $(obj)/RW_FWID_B.bin +files_added:: $(obj)/VBLOCK_A.bin $(obj)/VBLOCK_B.bin $(CBFSTOOL) $(obj)/coreboot.rom write -u -r VBLOCK_A -f $(obj)/VBLOCK_A.bin $(CBFSTOOL) $(obj)/coreboot.rom write -u -r VBLOCK_B -f $(obj)/VBLOCK_B.bin - $(CBFSTOOL) $(obj)/coreboot.rom write -u -r RO_FRID -f $(obj)/RO_FRID.bin - $(CBFSTOOL) $(obj)/coreboot.rom write -u -r RW_FWID_A -f $(obj)/RW_FWID_A.bin - $(CBFSTOOL) $(obj)/coreboot.rom write -u -r RW_FWID_B -f $(obj)/RW_FWID_B.bin |