New patch to review for coreboot: Revert "chromeos: Fill in the firmware id (RO, RW A, RW B) FMAP sections"

[Patrick Georgi]

Patrick Georgi ([e-mail]) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/18205

-gerrit

commit 3b67097f7f817c567c9d4c5a9459ce545b6a4e6e
Author: Patrick Georgi 
Date:   Mon Jan 23 13:21:44 2017 +0100

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 
---
 src/vendorcode/google/chromeos/Makefile.inc | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/src/vendorcode/google/chromeos/Makefile.inc b/src/vendorcode/google/chromeos/Makefile.inc
index f0762bc..af5e178 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