[coreboot-gerrit] [S] Change in coreboot[master]: soc/amd: Add amdfw.rom to fmap if it is at 0x20000

[Bao Zheng (Code Review)]

Attention is currently required from: Jason Glenesk, Raul Rangel, Matt DeVillier, Zheng Bao, Fred Reitberger, Felix Held.

Hello Zheng Bao,

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

https://review.coreboot.org/c/coreboot/+/67326

to review the following change.

Change subject: soc/amd: Add amdfw.rom to fmap if it is at 0x20000
......................................................................

soc/amd: Add amdfw.rom to fmap if it is at 0x20000

For the AMD family SOC which only accepts one EFS header at 0x20000,
CBFS layout can not handle. So we need to add it into the flashmap.

FLASH@0xFF000000 16M {
    BIOS {
    	EC 128K
    	AMDFW @128K 2M
    	RW_MRC_CACHE 64K
    	FMAP 4K
    	COREBOOT(CBFS)
    }
}

TODO: Need to handle the case which flash size is other than 16MB.

Change-Id: I777f0b975a5aecc3a5f64a533c2dd2161fb88195
Signed-off-by: Zheng Bao 
---
M src/soc/amd/common/Makefile.inc
1 file changed, 31 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/26/67326/1

diff --git a/src/soc/amd/common/Makefile.inc b/src/soc/amd/common/Makefile.inc
index 03e57c0..435e59c 100644
--- a/src/soc/amd/common/Makefile.inc
+++ b/src/soc/amd/common/Makefile.inc
@@ -26,10 +26,16 @@

amd_microcode_bins += $(wildcard ${FIRMWARE_LOCATION}/*UcodePatch_*.bin)

+#TODO
+ifeq ($(AMD_SOC_FWM_POSITION), 4278321152)
+$(call add_intermediate, AMDFWROM, $(obj)/amdfw.rom)
+	$(CBFSTOOL) $(obj)/coreboot.pre write -r AMDFW -f $(obj)/amdfw.rom --fill-upward
+else
 cbfs-files-y += apu/amdfw
 apu/amdfw-file := $(obj)/amdfw.rom
 apu/amdfw-position := $(AMD_SOC_FWM_POSITION)
 apu/amdfw-type := raw
+endif

ifeq ($(CONFIG_VBOOT_SLOTS_RW_AB)$(CONFIG_VBOOT_STARTS_BEFORE_BOOTBLOCK),yy)
 cbfs-files-y += apu/amdfw_a