Attention is currently required from: Felix Held, Fred Reitberger, Jason Glenesk.
Patrick Rudolph has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/86585?usp=email )
Change subject: soc/amd/glinda: Move AMDFWBODY to upper 16MiB ......................................................................
soc/amd/glinda: Move AMDFWBODY to upper 16MiB
Move the AMDFWBODY into the upper part of the SPI flash. Since this region is not accessed by the host there's no need to have it in the lower 16MiB that is accessible by the ROM2 mapping.
While on it fix the SPI flash size being set in Kconfig.
Change-Id: Ifdc8618a87588469eb8801cb73eb25cdca486adf Signed-off-by: Patrick Rudolph patrick.rudolph@9elements.com --- M src/mainboard/amd/birman/Kconfig M src/mainboard/amd/birman/board_glinda.fmd M src/mainboard/amd/birman/chromeos_glinda.fmd M src/mainboard/amd/birman_plus/Kconfig M src/mainboard/amd/birman_plus/board_glinda.fmd M src/mainboard/amd/birman_plus/chromeos_glinda.fmd 6 files changed, 19 insertions(+), 9 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/85/86585/1
diff --git a/src/mainboard/amd/birman/Kconfig b/src/mainboard/amd/birman/Kconfig index 9fafae1..a57908e 100644 --- a/src/mainboard/amd/birman/Kconfig +++ b/src/mainboard/amd/birman/Kconfig @@ -2,7 +2,6 @@
config BOARD_AMD_BIRMAN_COMMON def_bool n - select BOARD_ROMSIZE_KB_16384 # Birman actually has a 32MiB ROM select EC_ACPI select SOC_AMD_COMMON_BLOCK_USE_ESPI if !SOC_AMD_COMMON_BLOCK_SIMNOW_BUILD select DRIVERS_PCIE_RTD3_DEVICE @@ -16,14 +15,17 @@ select SPI_FLASH_EXIT_4_BYTE_ADDR_MODE
config BOARD_AMD_BIRMAN_PHOENIX_FSP + select BOARD_ROMSIZE_KB_16384 # Birman actually has a 32MiB ROM select BOARD_AMD_BIRMAN_COMMON select SOC_AMD_PHOENIX_FSP
config BOARD_AMD_BIRMAN_PHOENIX_OPENSIL + select BOARD_ROMSIZE_KB_16384 # Birman actually has a 32MiB ROM select BOARD_AMD_BIRMAN_COMMON select SOC_AMD_PHOENIX_OPENSIL
config BOARD_AMD_BIRMAN_GLINDA + select BOARD_ROMSIZE_KB_32768 select BOARD_AMD_BIRMAN_COMMON select SOC_AMD_GLINDA
diff --git a/src/mainboard/amd/birman/board_glinda.fmd b/src/mainboard/amd/birman/board_glinda.fmd index 3aff7c1..85b52cd 100644 --- a/src/mainboard/amd/birman/board_glinda.fmd +++ b/src/mainboard/amd/birman/board_glinda.fmd @@ -1,10 +1,12 @@ -FLASH@0xFF000000 16M { +FLASH@0xFF000000 32M { BIOS { EC_SIG 4K FMAP 4K COREBOOT(CBFS) - AMDFWBODY 6M EC_BODY@15872K 256K RW_MRC_CACHE 120K } + BIOS_TOP @16M { + AMDFWBODY + } } diff --git a/src/mainboard/amd/birman/chromeos_glinda.fmd b/src/mainboard/amd/birman/chromeos_glinda.fmd index 7adfabc..f4acf73 100644 --- a/src/mainboard/amd/birman/chromeos_glinda.fmd +++ b/src/mainboard/amd/birman/chromeos_glinda.fmd @@ -1,4 +1,4 @@ -FLASH@0xFF000000 16M { +FLASH@0xFF000000 32M { SI_BIOS { WP_RO 8M { EC_SIG 4K @@ -9,7 +9,6 @@ COREBOOT(CBFS) GBB 448K } - AMDFWBODY 6M } RW_SECTION_A 3M { VBLOCK_A 8K @@ -33,4 +32,7 @@ EC_BODY@15872K 256K RW_MRC_CACHE(PRESERVE) 120K } + BIOS_TOP @16M { + AMDFWBODY + } } diff --git a/src/mainboard/amd/birman_plus/Kconfig b/src/mainboard/amd/birman_plus/Kconfig index 91e39bf..486416f 100644 --- a/src/mainboard/amd/birman_plus/Kconfig +++ b/src/mainboard/amd/birman_plus/Kconfig @@ -2,7 +2,7 @@
config BOARD_AMD_BIRMANPLUS_COMMON def_bool n - select BOARD_ROMSIZE_KB_16384 # Birman+ actually has a 64MiB ROM + select BOARD_ROMSIZE_KB_65536 # Birman+ actually has a 64MiB ROM select EC_ACPI select SOC_AMD_COMMON_BLOCK_USE_ESPI if !SOC_AMD_COMMON_BLOCK_SIMNOW_BUILD select DRIVERS_PCIE_RTD3_DEVICE diff --git a/src/mainboard/amd/birman_plus/board_glinda.fmd b/src/mainboard/amd/birman_plus/board_glinda.fmd index eb26a2a..489d2f3 100644 --- a/src/mainboard/amd/birman_plus/board_glinda.fmd +++ b/src/mainboard/amd/birman_plus/board_glinda.fmd @@ -3,9 +3,11 @@ EC_SIG 4K FMAP 4K COREBOOT(CBFS) - AMDFWBODY 6M SMMSTORE(PRESERVE) 256K EC_BODY@15872K 256K RW_MRC_CACHE 120K } + BIOS_TOP @16M { + AMDFWBODY + } } diff --git a/src/mainboard/amd/birman_plus/chromeos_glinda.fmd b/src/mainboard/amd/birman_plus/chromeos_glinda.fmd index 7adfabc..b9bfb3d 100644 --- a/src/mainboard/amd/birman_plus/chromeos_glinda.fmd +++ b/src/mainboard/amd/birman_plus/chromeos_glinda.fmd @@ -1,4 +1,4 @@ -FLASH@0xFF000000 16M { +FLASH@0xFF000000 64M { SI_BIOS { WP_RO 8M { EC_SIG 4K @@ -9,7 +9,6 @@ COREBOOT(CBFS) GBB 448K } - AMDFWBODY 6M } RW_SECTION_A 3M { VBLOCK_A 8K @@ -33,4 +32,7 @@ EC_BODY@15872K 256K RW_MRC_CACHE(PRESERVE) 120K } + BIOS_TOP @16M { + AMDFWBODY + } }