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/+/86575?usp=email
to review the following change.
Change subject: mainboard/intel/avenuecity_crb: Support configurable BIOS region ......................................................................
mainboard/intel/avenuecity_crb: Support configurable BIOS region
Introduce BIOS_BASE for Avenue City board to accommodate variable BIOS regions.
Change-Id: Ie1289ec2e9d676584b8aeb7e0af27ce810a471eb Signed-off-by: Gang Chen gang.c.chen@intel.com Signed-off-by: Jincheng Li jincheng.li@intel.com --- M configs/builder/config.intel.crb.avc M src/mainboard/intel/avenuecity_crb/Kconfig M src/mainboard/intel/avenuecity_crb/Makefile.mk M src/mainboard/intel/avenuecity_crb/board.fmd 4 files changed, 20 insertions(+), 3 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/75/86575/1
diff --git a/configs/builder/config.intel.crb.avc b/configs/builder/config.intel.crb.avc index e547c41..24d7a65 100644 --- a/configs/builder/config.intel.crb.avc +++ b/configs/builder/config.intel.crb.avc @@ -25,7 +25,7 @@ # # [RW] IFWI Ingredients # -CONFIG_IFD_BIN_PATH="site-local/avenuecity/descriptor.bin" +CONFIG_IFD_BIN_PATH="site-local/avenuecity/descriptor_48m.bin" CONFIG_PBP_BIN_PATH="site-local/avenuecity/pbp.bin" CONFIG_CPU_UCODE_BINARIES="site-local/avenuecity/ucode.mcb" CONFIG_FSP_T_FILE="site-local/avenuecity/Server_T.fd" diff --git a/src/mainboard/intel/avenuecity_crb/Kconfig b/src/mainboard/intel/avenuecity_crb/Kconfig index fff244e..ff21b5a 100644 --- a/src/mainboard/intel/avenuecity_crb/Kconfig +++ b/src/mainboard/intel/avenuecity_crb/Kconfig @@ -34,4 +34,8 @@ int default 1
+config BIOS_SIZE + hex + default 0x3000000 + endif diff --git a/src/mainboard/intel/avenuecity_crb/Makefile.mk b/src/mainboard/intel/avenuecity_crb/Makefile.mk index cfff6d3..8a4f044 100644 --- a/src/mainboard/intel/avenuecity_crb/Makefile.mk +++ b/src/mainboard/intel/avenuecity_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 diff --git a/src/mainboard/intel/avenuecity_crb/board.fmd b/src/mainboard/intel/avenuecity_crb/board.fmd index df5bc05..d894376 100644 --- a/src/mainboard/intel/avenuecity_crb/board.fmd +++ b/src/mainboard/intel/avenuecity_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