[coreboot-gerrit] [S] Change in coreboot[main]: mainboard/intel/beechnutcity_crb: Support configurable BIOS region

[Shuo Liu (Code Review)]

Attention is currently required from: Chen, Gang C, Jincheng Li.

Hello Chen, Gang C, Jincheng Li,

I'd like you to do a code review.
Please visit

https://review.coreboot.org/c/coreboot/+/86576?usp=email

to review the following change.

Change subject: mainboard/intel/beechnutcity_crb: Support configurable BIOS region
......................................................................

mainboard/intel/beechnutcity_crb: Support configurable BIOS region

Introduce BIOS_BASE for Beechnut City board to accommodate variable
BIOS regions.

Change-Id: I14d0d54d53f14a029dfc9f7fabb36f8dbac6637b
Signed-off-by: Gang Chen 
Signed-off-by: Jincheng Li 
---
M configs/builder/config.intel.crb.bnc
M src/mainboard/intel/beechnutcity_crb/Kconfig
M src/mainboard/intel/beechnutcity_crb/Makefile.mk
M src/mainboard/intel/beechnutcity_crb/board.fmd
4 files changed, 20 insertions(+), 3 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/76/86576/1

diff --git a/configs/builder/config.intel.crb.bnc b/configs/builder/config.intel.crb.bnc
index a4ffaf7..d95ceec 100644
--- a/configs/builder/config.intel.crb.bnc
+++ b/configs/builder/config.intel.crb.bnc
@@ -25,7 +25,7 @@
 #
 # [RW] IFWI Ingredients
 #
-CONFIG_IFD_BIN_PATH="site-local/beechnutcity/descriptor.bin"
+CONFIG_IFD_BIN_PATH="site-local/beechnutcity/descriptor_48m.bin"
 CONFIG_PBP_BIN_PATH="site-local/beechnutcity/pbp.bin"
 CONFIG_CPU_UCODE_BINARIES="site-local/beechnutcity/ucode.mcb"
 CONFIG_FSP_T_FILE="site-local/beechnutcity/Server_T.fd"
diff --git a/src/mainboard/intel/beechnutcity_crb/Kconfig b/src/mainboard/intel/beechnutcity_crb/Kconfig
index 3c2f02a..0efbaba 100644
--- a/src/mainboard/intel/beechnutcity_crb/Kconfig
+++ b/src/mainboard/intel/beechnutcity_crb/Kconfig
@@ -34,4 +34,8 @@
    int
    default 1

+config BIOS_SIZE
+	hex
+	default 0x3000000
+
 endif
diff --git a/src/mainboard/intel/beechnutcity_crb/Makefile.mk b/src/mainboard/intel/beechnutcity_crb/Makefile.mk
index cfff6d3..9dd04392 100644
--- a/src/mainboard/intel/beechnutcity_crb/Makefile.mk
+++ b/src/mainboard/intel/beechnutcity_crb/Makefile.mk
@@ -6,3 +6,16 @@
 romstage-y += config/iio.c
 ramstage-y += config/dimm_slot.c
 ramstage-y += ramstage.c
+
+ifeq ($(CONFIG_FMDFILE),)
+$(warning "FMDFILE is not set, there is no specified fmd file.")
+else ifneq ($(CONFIG_FMDFILE), 0)
+$(warning "Overriding fmd file.")
+FMAP_BIOS_BASE := $(shell printf "0x%x" \
+	$(call int-align, $(call int-subtract, \
+		$(CONFIG_ROM_SIZE) $(CONFIG_BIOS_SIZE)), 0x10000))
+$(obj)/fmap.fmd: $(CONFIG_FMDFILE) $(obj)/config.h
+	$(HOSTCC) $(PREPROCESS_ONLY) -include $(obj)/config.h $< -o $@.pre
+	sed -i "s/##BIOS_BASE##/$(FMAP_BIOS_BASE)/g" $@.pre
+	mv $@.pre $@
+endif
\ No newline at end of file
diff --git a/src/mainboard/intel/beechnutcity_crb/board.fmd b/src/mainboard/intel/beechnutcity_crb/board.fmd
index df5bc05..d894376 100644
--- a/src/mainboard/intel/beechnutcity_crb/board.fmd
+++ b/src/mainboard/intel/beechnutcity_crb/board.fmd
@@ -1,8 +1,8 @@
 FLASH@0xfc000000 64M {
-	SI_ALL 48M {
+	SI_ALL@0x0 ##BIOS_BASE## {
    	SI_DESC@0x0 0x1000
    }
-	SI_BIOS 16M {
+	SI_BIOS@##BIOS_BASE## {
    	RW_MRC_CACHE 0x10000
    	FMAP 0x800
    	RW_VPD(PRESERVE) 0x4000