New patch to review for coreboot: soc/intel/quark: Properly place rmu.bin for vboot

[Lee Leahy]

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

-gerrit

commit 691d07bf912b9c6ab288b6ba2acf1341ec620c47
Author: Lee Leahy 
Date:   Wed Jan 4 08:24:23 2017 -0800

soc/intel/quark: Properly place rmu.bin for vboot

Properly locate the rmu.bin file when using vboot.  Without this patch
    the build fails because the offset is outside the CBFS range.  With
    this patch, the file is placed properly in the COREBOOT section of the
    SPI flash and is also placed in the FW_MAIN_A and FW_MAIN_B areas as
    well.

CBFS       rmu.bin
    E: Could not add [3rdparty/blobs/soc/intel/quark/rmu.bin, 8192 bytes (8 KB)@0x4f0000]; too big?
    E: Failed to add '3rdparty/blobs/soc/intel/quark/rmu.bin' into ROM image.
    E: Failed while operating on 'FW_MAIN_A' region!
    E: The image will be left unmodified.
    make: *** [build/coreboot.pre] Error 1

TEST=Build and run on Galileo Gen2

Change-Id: I4a9bf1814651edde08c5d23c36580929bb6af7df
    Signed-off-by: Lee Leahy 
---
 src/soc/intel/quark/Makefile.inc | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/soc/intel/quark/Makefile.inc b/src/soc/intel/quark/Makefile.inc
index bd297ed..fd7a7a7 100644
--- a/src/soc/intel/quark/Makefile.inc
+++ b/src/soc/intel/quark/Makefile.inc
@@ -74,7 +74,11 @@ fsp.bin-type := raw
 # Add the chipset microcode file to the CBFS image
 cbfs-files-$(CONFIG_ADD_RMU_FILE) += rmu.bin
 rmu.bin-file := $(call strip_quotes,$(CONFIG_RMU_FILE))
-rmu.bin-position := $(CONFIG_RMU_LOC)
 rmu.bin-type := raw
+ifeq ($(CONFIG_VBOOT),y)
+rmu.bin-COREBOOT-position := $(CONFIG_RMU_LOC)
+else
+rmu.bin-position := $(CONFIG_RMU_LOC)
+endif # CONFIG_VBOOT

endif # CONFIG_SOC_INTEL_QUARK