From 0ef9d890fabe1b4fd2a525acd49ae7dcb74aab2a Mon Sep 17 00:00:00 2001 From: Fred Reitberger Date: Wed, 8 Feb 2023 13:02:42 -0500 Subject: mb/amd/birman: Split FMD for phoenix/glinda Glinda and Phoenix have different requirements, so split the birman FMD files to better apply to each SoC. TEST='./util/scripts/testsoc -K PHOENIX -K GLINDA' successfully builds all boards Signed-off-by: Fred Reitberger Change-Id: Ia2dbaeb8af04fb1d1224c397d728929c50800dfe Reviewed-on: https://review.coreboot.org/c/coreboot/+/72904 Tested-by: build bot (Jenkins) Reviewed-by: Arthur Heymans --- src/mainboard/amd/birman/Kconfig | 8 ++++--- src/mainboard/amd/birman/board.fmd | 8 ------- src/mainboard/amd/birman/board_glinda.fmd | 8 +++++++ src/mainboard/amd/birman/board_phoenix.fmd | 8 +++++++ src/mainboard/amd/birman/chromeos.fmd | 34 --------------------------- src/mainboard/amd/birman/chromeos_glinda.fmd | 34 +++++++++++++++++++++++++++ src/mainboard/amd/birman/chromeos_phoenix.fmd | 34 +++++++++++++++++++++++++++ 7 files changed, 89 insertions(+), 45 deletions(-) delete mode 100644 src/mainboard/amd/birman/board.fmd create mode 100644 src/mainboard/amd/birman/board_glinda.fmd create mode 100644 src/mainboard/amd/birman/board_phoenix.fmd delete mode 100644 src/mainboard/amd/birman/chromeos.fmd create mode 100644 src/mainboard/amd/birman/chromeos_glinda.fmd create mode 100644 src/mainboard/amd/birman/chromeos_phoenix.fmd diff --git a/src/mainboard/amd/birman/Kconfig b/src/mainboard/amd/birman/Kconfig index d6697416af..35c6f070db 100644 --- a/src/mainboard/amd/birman/Kconfig +++ b/src/mainboard/amd/birman/Kconfig @@ -16,8 +16,10 @@ config BOARD_SPECIFIC_OPTIONS select SOC_AMD_COMMON_BLOCK_ESPI_RETAIN_PORT80_EN config FMDFILE - default "src/mainboard/amd/birman/chromeos.fmd" if CHROMEOS - default "src/mainboard/amd/birman/board.fmd" + default "src/mainboard/amd/birman/chromeos_glinda.fmd" if CHROMEOS && BOARD_AMD_BIRMAN_GLINDA + default "src/mainboard/amd/birman/chromeos_phoenix.fmd" if CHROMEOS && BOARD_AMD_BIRMAN_PHOENIX + default "src/mainboard/amd/birman/board_glinda.fmd" if BOARD_AMD_BIRMAN_GLINDA + default "src/mainboard/amd/birman/board_phoenix.fmd" config MAINBOARD_DIR default "amd/birman" @@ -54,7 +56,7 @@ config BIRMAN_MCHP_FW_FILE config BIRMAN_MCHP_FW_OFFSET hex depends on BIRMAN_HAVE_MCHP_FW - default 0xB80000 + 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 diff --git a/src/mainboard/amd/birman/board.fmd b/src/mainboard/amd/birman/board.fmd deleted file mode 100644 index 32c7a5a6dd..0000000000 --- a/src/mainboard/amd/birman/board.fmd +++ /dev/null @@ -1,8 +0,0 @@ -FLASH@0xFF000000 16M { - BIOS { - EC 4K - FMAP 4K - COREBOOT(CBFS) - RW_MRC_CACHE 120K - } -} diff --git a/src/mainboard/amd/birman/board_glinda.fmd b/src/mainboard/amd/birman/board_glinda.fmd new file mode 100644 index 0000000000..32c7a5a6dd --- /dev/null +++ b/src/mainboard/amd/birman/board_glinda.fmd @@ -0,0 +1,8 @@ +FLASH@0xFF000000 16M { + BIOS { + EC 4K + FMAP 4K + COREBOOT(CBFS) + RW_MRC_CACHE 120K + } +} diff --git a/src/mainboard/amd/birman/board_phoenix.fmd b/src/mainboard/amd/birman/board_phoenix.fmd new file mode 100644 index 0000000000..32c7a5a6dd --- /dev/null +++ b/src/mainboard/amd/birman/board_phoenix.fmd @@ -0,0 +1,8 @@ +FLASH@0xFF000000 16M { + BIOS { + EC 4K + FMAP 4K + COREBOOT(CBFS) + RW_MRC_CACHE 120K + } +} diff --git a/src/mainboard/amd/birman/chromeos.fmd b/src/mainboard/amd/birman/chromeos.fmd deleted file mode 100644 index 538dfbd1c6..0000000000 --- a/src/mainboard/amd/birman/chromeos.fmd +++ /dev/null @@ -1,34 +0,0 @@ -FLASH@0xFF000000 16M { - SI_BIOS { - WP_RO 8M { - EC 4K - RO_VPD(PRESERVE) 16K - RO_SECTION { - FMAP 2K - RO_FRID 64 - COREBOOT(CBFS) - GBB 448K - } - } - RW_SECTION_A 3M { - VBLOCK_A 8K - FW_MAIN_A(CBFS) - RW_FWID_A 256 - } - RW_SECTION_B 3M { - VBLOCK_B 8K - FW_MAIN_B(CBFS) - RW_FWID_B 256 - } - RW_ELOG(PRESERVE) 4K - RW_SHARED 16K { - SHARED_DATA 8K - VBLOCK_DEV 8K - } - RW_VPD(PRESERVE) 8K - RW_NVRAM(PRESERVE) 20K - SMMSTORE(PRESERVE) 64K - RW_LEGACY(CBFS) - RW_MRC_CACHE(PRESERVE) 120K - } -} diff --git a/src/mainboard/amd/birman/chromeos_glinda.fmd b/src/mainboard/amd/birman/chromeos_glinda.fmd new file mode 100644 index 0000000000..538dfbd1c6 --- /dev/null +++ b/src/mainboard/amd/birman/chromeos_glinda.fmd @@ -0,0 +1,34 @@ +FLASH@0xFF000000 16M { + SI_BIOS { + WP_RO 8M { + EC 4K + RO_VPD(PRESERVE) 16K + RO_SECTION { + FMAP 2K + RO_FRID 64 + COREBOOT(CBFS) + GBB 448K + } + } + RW_SECTION_A 3M { + VBLOCK_A 8K + FW_MAIN_A(CBFS) + RW_FWID_A 256 + } + RW_SECTION_B 3M { + VBLOCK_B 8K + FW_MAIN_B(CBFS) + RW_FWID_B 256 + } + RW_ELOG(PRESERVE) 4K + RW_SHARED 16K { + SHARED_DATA 8K + VBLOCK_DEV 8K + } + RW_VPD(PRESERVE) 8K + RW_NVRAM(PRESERVE) 20K + SMMSTORE(PRESERVE) 64K + RW_LEGACY(CBFS) + RW_MRC_CACHE(PRESERVE) 120K + } +} diff --git a/src/mainboard/amd/birman/chromeos_phoenix.fmd b/src/mainboard/amd/birman/chromeos_phoenix.fmd new file mode 100644 index 0000000000..538dfbd1c6 --- /dev/null +++ b/src/mainboard/amd/birman/chromeos_phoenix.fmd @@ -0,0 +1,34 @@ +FLASH@0xFF000000 16M { + SI_BIOS { + WP_RO 8M { + EC 4K + RO_VPD(PRESERVE) 16K + RO_SECTION { + FMAP 2K + RO_FRID 64 + COREBOOT(CBFS) + GBB 448K + } + } + RW_SECTION_A 3M { + VBLOCK_A 8K + FW_MAIN_A(CBFS) + RW_FWID_A 256 + } + RW_SECTION_B 3M { + VBLOCK_B 8K + FW_MAIN_B(CBFS) + RW_FWID_B 256 + } + RW_ELOG(PRESERVE) 4K + RW_SHARED 16K { + SHARED_DATA 8K + VBLOCK_DEV 8K + } + RW_VPD(PRESERVE) 8K + RW_NVRAM(PRESERVE) 20K + SMMSTORE(PRESERVE) 64K + RW_LEGACY(CBFS) + RW_MRC_CACHE(PRESERVE) 120K + } +} -- cgit v1.2.3