[coreboot-gerrit] New patch to review for coreboot: intel/amenia: Support 8MB and 16MB flash size

[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/15065

-gerrit

commit 4141534ac71525576f574c031fd844c1c3c3acbe
Author: Bora Guvendik <bora.guvendik at intel.com>
Date:   Fri May 13 17:19:42 2016 -0700

    intel/amenia: Support 8MB and 16MB flash size
    
    Use different set of blobs for 8MB and 16MB
    variants. In this case, descriptor.bin is
    the only difference
    Change IFD_BIOS_END based on image size
    Change ROMSIZE based on image size
    
    BUG=chrome-os-partner:52458
    TEST=Boot to chromeOS using 8MB and 16MB images
    CQ-DEPEND=CL:*260785,CL:*259285,CL:344770
    
    Change-Id: Ic2aedd5be589f5fb89af98c51bd9e01d3b0b8412
    Signed-off-by: Bora Guvendik <bora.guvendik at intel.com>
---
 src/mainboard/intel/amenia/Kconfig | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/mainboard/intel/amenia/Kconfig b/src/mainboard/intel/amenia/Kconfig
index bfc4091..f184a83 100644
--- a/src/mainboard/intel/amenia/Kconfig
+++ b/src/mainboard/intel/amenia/Kconfig
@@ -3,7 +3,6 @@ if BOARD_INTEL_AMENIA
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
 	select SOC_INTEL_APOLLOLAKE
-	select BOARD_ROMSIZE_KB_8192
 	select MAINBOARD_HAS_CHROMEOS
 	select EC_GOOGLE_CHROMEEC
 	select EC_GOOGLE_CHROMEEC_LPC
@@ -42,19 +41,32 @@ config APOLLOLAKE_A0
 	bool
 	default y
 
+config FLASH_SIZE_16MB
+	select BOARD_ROMSIZE_KB_16384
+	bool
+	default y
+
+config FLASH_SIZE_8MB
+	select BOARD_ROMSIZE_KB_8192
+	bool
+	default n
+
 config IFD_BIN_PATH
 	string "Path and filename of the descriptor.bin file"
-	default "3rdparty/blobs/baseboard-reef/reef.bin.orig.a0" if APOLLOLAKE_A0
+	default "3rdparty/blobs/baseboard-reef/reef.bin.orig.a0.16MB" if APOLLOLAKE_A0 && FLASH_SIZE_16MB
+	default "3rdparty/blobs/baseboard-reef/reef.bin.orig.a0.8MB" if APOLLOLAKE_A0 && FLASH_SIZE_8MB
 	default "3rdparty/blobs/baseboard-reef/reef.bin.orig.b0" if !APOLLOLAKE_A0
 
 config FMDFILE
 	string
-	default "3rdparty/blobs/baseboard-reef/reef.bin.orig.a0.fmd" if APOLLOLAKE_A0
+	default "3rdparty/blobs/baseboard-reef/reef.bin.orig.a0.16MB.fmd" if APOLLOLAKE_A0 && FLASH_SIZE_16MB
+	default "3rdparty/blobs/baseboard-reef/reef.bin.orig.a0.8MB.fmd" if APOLLOLAKE_A0 && FLASH_SIZE_8MB
 	default "3rdparty/blobs/baseboard-reef/reef.bin.orig.b0.fmd" if !APOLLOLAKE_A0
 
 config IFD_BIOS_END
 	hex
-	default 0x77F000
+	default 0xF7F000 if APOLLOLAKE_A0 && FLASH_SIZE_16MB
+	default 0x77F000 if APOLLOLAKE_A0 && FLASH_SIZE_8MB
 
 config IFD_BIOS_START
 	hex