mb/amd/birman: Move EC FW to FMAP

Move EC FW from a CBFS file to an FMAP entry and rename the EC signature
section to EC_SIG.

An offset of (16M - 512K) was chosen to line up the EC FW before the
RW_MRC_CACHE.

Signed-off-by: Fred Reitberger <reitbergerfred@gmail.com>
Change-Id: I9b19d92043790b10acd20fbfdf394d5bd67b8295
Reviewed-on: https://review.coreboot.org/c/coreboot/+/70695
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Martin L Roth <gaumless@gmail.com>

6 files changed, 11 insertions, 21 deletions

diff --git a/src/mainboard/amd/birman/Kconfig b/src/mainboard/amd/birman/Kconfig
index f9881e3f73..cbe04702c9 100644
--- a/src/mainboard/amd/birman/Kconfig
+++ b/src/mainboard/amd/birman/Kconfig
@@ -51,17 +51,7 @@ config BIRMAN_MCHP_FW_FILE
 	depends on BIRMAN_HAVE_MCHP_FW
 	default "3rdparty/blobs/mainboard/amd/birman/EC_birman.bin"
 	help
-	  The EC firmware blob is at the BIRMAN_MCHP_FW_OFFSET offset of the
-	  firmware image.
-
-config BIRMAN_MCHP_FW_OFFSET
-	hex
-	depends on BIRMAN_HAVE_MCHP_FW
-	default 0xF00000
-	help
-	  The EC firmware blob defaults to the 4MByte offset of the firmware
-	  image. If this offset needs to change, a new signature block must be
-	  generated with the updated offset.
+	  The EC firmware blob is at the EC_BODY FMAP region of the firmware image.
 
 config VBOOT
 	select VBOOT_NO_BOARD_SUPPORT
diff --git a/src/mainboard/amd/birman/Makefile.inc b/src/mainboard/amd/birman/Makefile.inc
index f4a5924555..df931d991a 100644
--- a/src/mainboard/amd/birman/Makefile.inc
+++ b/src/mainboard/amd/birman/Makefile.inc
@@ -19,12 +19,8 @@ endif
 
 ifeq ($(CONFIG_BIRMAN_HAVE_MCHP_FW),y)
 $(call add_intermediate, add_mchp_fw)
-	$(CBFSTOOL) $(obj)/coreboot.pre write -r EC -f $(CONFIG_BIRMAN_MCHP_SIG_FILE) --fill-upward
-
-cbfs-files-y += apu/ecfw
-apu/ecfw-file := $(CONFIG_BIRMAN_MCHP_FW_FILE)
-apu/ecfw-position := $(CONFIG_BIRMAN_MCHP_FW_OFFSET)
-apu/ecfw-type := raw
+	$(CBFSTOOL) $(obj)/coreboot.pre write -r EC_SIG -f $(CONFIG_BIRMAN_MCHP_SIG_FILE) --fill-upward
+	$(CBFSTOOL) $(obj)/coreboot.pre write -r EC_BODY -f $(CONFIG_BIRMAN_MCHP_FW_FILE) --fill-upward
 
 else
 files_added:: warn_no_mchp
diff --git a/src/mainboard/amd/birman/board_glinda.fmd b/src/mainboard/amd/birman/board_glinda.fmd
index 32c7a5a6dd..756709044e 100644
--- a/src/mainboard/amd/birman/board_glinda.fmd
+++ b/src/mainboard/amd/birman/board_glinda.fmd
@@ -1,8 +1,9 @@
 FLASH@0xFF000000 16M {
 	BIOS {
-		EC 4K
+		EC_SIG 4K
 		FMAP 4K
 		COREBOOT(CBFS)
+		EC_BODY@15872K 256K
 		RW_MRC_CACHE 120K
 	}
 }
diff --git a/src/mainboard/amd/birman/board_phoenix.fmd b/src/mainboard/amd/birman/board_phoenix.fmd
index 6f7af56ecb..bc09fe75d5 100644
--- a/src/mainboard/amd/birman/board_phoenix.fmd
+++ b/src/mainboard/amd/birman/board_phoenix.fmd
@@ -1,8 +1,9 @@
 FLASH@0xFF000000 16M {
 	BIOS {
-		EC 4K
+		EC_SIG 4K
 		FMAP 4K
 		COREBOOT(CBFS)
+		EC_BODY@15872K 256K
 		RW_MRC_CACHE 256K
 	}
 }
diff --git a/src/mainboard/amd/birman/chromeos_glinda.fmd b/src/mainboard/amd/birman/chromeos_glinda.fmd
index 538dfbd1c6..843a026559 100644
--- a/src/mainboard/amd/birman/chromeos_glinda.fmd
+++ b/src/mainboard/amd/birman/chromeos_glinda.fmd
@@ -1,7 +1,7 @@
 FLASH@0xFF000000 16M {
 	SI_BIOS {
 		WP_RO 8M {
-			EC 4K
+			EC_SIG 4K
 			RO_VPD(PRESERVE) 16K
 			RO_SECTION {
 				FMAP 2K
@@ -29,6 +29,7 @@ FLASH@0xFF000000 16M {
 		RW_NVRAM(PRESERVE) 20K
 		SMMSTORE(PRESERVE) 64K
 		RW_LEGACY(CBFS)
+		EC_BODY@15872K 256K
 		RW_MRC_CACHE(PRESERVE) 120K
 	}
 }
diff --git a/src/mainboard/amd/birman/chromeos_phoenix.fmd b/src/mainboard/amd/birman/chromeos_phoenix.fmd
index dca61fc552..9d6d402169 100644
--- a/src/mainboard/amd/birman/chromeos_phoenix.fmd
+++ b/src/mainboard/amd/birman/chromeos_phoenix.fmd
@@ -1,7 +1,7 @@
 FLASH@0xFF000000 16M {
 	SI_BIOS {
 		WP_RO 8M {
-			EC 4K
+			EC_SIG 4K
 			RO_VPD(PRESERVE) 16K
 			RO_SECTION {
 				FMAP 2K
@@ -29,6 +29,7 @@ FLASH@0xFF000000 16M {
 		RW_NVRAM(PRESERVE) 20K
 		SMMSTORE(PRESERVE) 64K
 		RW_LEGACY(CBFS)
+		EC_BODY@15872K 256K
 		RW_MRC_CACHE(PRESERVE) 256K
 	}
 }