[coreboot-gerrit] Patch set updated for coreboot: WIP: intel/amenia: Add changes for image assembly

[Bora Guvendik (bora.guvendik@intel.com)]

Bora Guvendik (bora.guvendik at intel.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/14897

-gerrit

commit 75761510bb67046837d73346675817ff84bbf03f
Author: Bora Guvendik <bora.guvendik at intel.com>
Date:   Wed May 18 14:56:27 2016 -0700

    WIP: intel/amenia: Add changes for image assembly
    
    Insert bootblock
    Use different base images for different variants
    Use generated fmd files for different variants
    
    BUG=chrome-os-partner:51844
    BRANCH=none
    TEST=boots to chrome OS
    
    Change-Id: I0e92858486ecf4720b8bcdf64bae97d9476caabc
    Signed-off-by: Bora Guvendik <bora.guvendik at intel.com>
---
 src/mainboard/intel/amenia/Kconfig    | 17 +++++++++++++++--
 src/soc/intel/apollolake/Makefile.inc |  5 +++++
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/mainboard/intel/amenia/Kconfig b/src/mainboard/intel/amenia/Kconfig
index e83b151..ee892b5 100644
--- a/src/mainboard/intel/amenia/Kconfig
+++ b/src/mainboard/intel/amenia/Kconfig
@@ -35,9 +35,22 @@ config FMAP_FILE
 	string
 	default "amenia"
 
-config PREBUILT_SPI_IMAGE
+config HAVE_IFD_BIN
+	default y
+
+config APOLLOLAKE_A0
+	bool
+	default y
+
+config IFD_BIN_PATH
+	string "Path and filename of the descriptor.bin file"
+	default "3rdparty/blobs/mainboard/$(CONFIG_MAINBOARD_DIR)/reef.bin.orig.a0" if APOLLOLAKE_A0
+	default "3rdparty/blobs/mainboard/$(CONFIG_MAINBOARD_DIR)/reef.bin.orig.b0" if !APOLLOLAKE_A0
+
+config FMDFILE
 	string
-	default "amenia.bin.orig.a0"
+	default "3rdparty/blobs/mainboard/$(CONFIG_MAINBOARD_DIR)/reef.bin.orig.a0.fmd" if APOLLOLAKE_A0
+	default "3rdparty/blobs/mainboard/$(CONFIG_MAINBOARD_DIR)/reef.bin.orig.b0.fmd" if !APOLLOLAKE_A0
 
 config IFD_BIOS_END
 	hex
diff --git a/src/soc/intel/apollolake/Makefile.inc b/src/soc/intel/apollolake/Makefile.inc
index 607ad13..909226b 100644
--- a/src/soc/intel/apollolake/Makefile.inc
+++ b/src/soc/intel/apollolake/Makefile.inc
@@ -68,4 +68,9 @@ files_added::
 	$(CBFSTOOL) $(obj)/coreboot.rom write -r $(CONFIG_LBP2_FMAP_NAME) -f $(CONFIG_LBP2_FILE_NAME) --fill-upward
 endif
 
+build_complete::
+	$(CBFSTOOL) $(obj)/coreboot.rom write \
+		-r bootblock \
+		-f $(objcbfs)/bootblock.bin
+
 endif