[coreboot-gerrit] Change in coreboot[master]: mb/amd/chausie: Moving EFS into FMAP section

[Fred Reitberger (Code Review)]

Fred Reitberger has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/61559 )

Change subject: mb/amd/chausie: Moving EFS into FMAP section
......................................................................

mb/amd/chausie: Moving EFS into FMAP section

The chausie mainboard uses the first 128kByte of SPI flash for the EC
firmware.  This enables the AMD_SOC_SEPARATE_EFS_SECTION option to use
the FMAP to locate the EFS/amdfw outside of the main CBFS.

Change-Id: Ifa9333f4097705a5c572756ac3ead3ae7a0b22a4
Signed-off-by: Fred Reitberger 
---
M src/mainboard/amd/chausie/Kconfig
M src/mainboard/amd/chausie/board.fmd
M src/soc/amd/sabrina/Makefile.inc
3 files changed, 11 insertions(+), 2 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/59/61559/1

diff --git a/src/mainboard/amd/chausie/Kconfig b/src/mainboard/amd/chausie/Kconfig
index dc6e090..6f17401 100644
--- a/src/mainboard/amd/chausie/Kconfig
+++ b/src/mainboard/amd/chausie/Kconfig
@@ -11,6 +11,9 @@
    select AMD_SOC_CONSOLE_UART
    select MAINBOARD_HAS_CHROMEOS

+config AMD_SOC_SEPARATE_EFS_SECTION
+	def_bool y
+
 config FMDFILE
    default "src/mainboard/amd/chausie/chromeos.fmd" if CHROMEOS
    default "src/mainboard/amd/chausie/board.fmd"
@@ -24,7 +27,7 @@
 config AMD_FWM_POSITION_INDEX
    int
    default 3 if CHROMEOS
-	default 4
+	default 5
    help
      TODO: might need to be adapted for better placement of files in cbfs

diff --git a/src/mainboard/amd/chausie/board.fmd b/src/mainboard/amd/chausie/board.fmd
index 442d80f..3475c41 100644
--- a/src/mainboard/amd/chausie/board.fmd
+++ b/src/mainboard/amd/chausie/board.fmd
@@ -1,6 +1,7 @@
 FLASH@0xFF000000 16M {
    BIOS {
    	EC 128K
+		EFS 3M
    	RW_MRC_CACHE 64K
    	FMAP 4K
    	COREBOOT(CBFS)
diff --git a/src/soc/amd/sabrina/Makefile.inc b/src/soc/amd/sabrina/Makefile.inc
index 22ba2cc..46d107f 100644
--- a/src/soc/amd/sabrina/Makefile.inc
+++ b/src/soc/amd/sabrina/Makefile.inc
@@ -268,11 +268,16 @@
    	--multilevel \
    	--output $@

-
+ifeq ($(CONFIG_AMD_SOC_SEPARATE_EFS_SECTION),y)
+$(call add_intermediate, amdfw_fmap_section)
+amdfw_fmap_section: $(obj)/coreboot.pre $(obj)/amdfw.rom $(obj)/fmap_config.h
+	$(CBFSTOOL) $(obj)/coreboot.pre write -r EFS -f $(obj)/amdfw.rom --fill-upward
+else # CONFIG_AMD_SOC_SEPARATE_EFS_SECTION
 cbfs-files-y += apu/amdfw
 apu/amdfw-file := $(obj)/amdfw.rom
 apu/amdfw-position := $(SABRINA_FWM_POSITION)
 apu/amdfw-type := raw
+endif # CONFIG_AMD_SOC_SEPARATE_EFS_SECTION

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