From b50ceba64a85eeadc56afd950e2ea8c94ebfad26 Mon Sep 17 00:00:00 2001 From: Patrick Rudolph Date: Tue, 4 Mar 2025 09:34:00 +0100 Subject: [PATCH] mb/amd: Increase ROM size on boards, incorrectly limited to 16 MB Since commit bb66d07d410139d6b2fe07ff5a39bd0c5a3e682a "soc/amd/common: Always use genoa SPI MMAP driver" the ROM size can be actually be greater than 16MiB on all AMD platforms without seeing a boot failure. Since still only 16MiB of the SPI flash are MMAPed, the FMAP should not be extended, and if so should only contain non x86 firmwares in the upper 16MiB of flash. Now that common code supports ROM_SIZE greater than 16MiB select the correct BOARD_ROMSIZE_KB for each mainboard. Change-Id: Icdce01bddbc4873ba42ceddcda6d9075f5a42914 Signed-off-by: Patrick Rudolph Reviewed-on: https://review.coreboot.org/c/coreboot/+/86701 Tested-by: build bot (Jenkins) Reviewed-by: Maximilian Brune --- src/mainboard/amd/birman/Kconfig | 2 +- src/mainboard/amd/birman_plus/Kconfig | 2 +- src/mainboard/amd/crater/Kconfig | 2 +- src/mainboard/amd/mayan/Kconfig | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mainboard/amd/birman/Kconfig b/src/mainboard/amd/birman/Kconfig index 9fafae15e3..3a9ffc77f1 100644 --- a/src/mainboard/amd/birman/Kconfig +++ b/src/mainboard/amd/birman/Kconfig @@ -2,7 +2,7 @@ config BOARD_AMD_BIRMAN_COMMON def_bool n - select BOARD_ROMSIZE_KB_16384 # Birman actually has a 32MiB ROM + select BOARD_ROMSIZE_KB_32768 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/Kconfig b/src/mainboard/amd/birman_plus/Kconfig index 91e39bf260..62d5c29141 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 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/crater/Kconfig b/src/mainboard/amd/crater/Kconfig index 620bc3d084..11bd6b9cf7 100644 --- a/src/mainboard/amd/crater/Kconfig +++ b/src/mainboard/amd/crater/Kconfig @@ -2,7 +2,7 @@ config BOARD_AMD_CRATER_COMMON def_bool n - select BOARD_ROMSIZE_KB_16384 # Birman actually has a 32MiB ROM + select BOARD_ROMSIZE_KB_32768 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/mayan/Kconfig b/src/mainboard/amd/mayan/Kconfig index 327599d78c..1af2d1838b 100644 --- a/src/mainboard/amd/mayan/Kconfig +++ b/src/mainboard/amd/mayan/Kconfig @@ -4,7 +4,7 @@ if BOARD_AMD_MAYAN_PHOENIX config BOARD_SPECIFIC_OPTIONS def_bool y - select BOARD_ROMSIZE_KB_16384 # Mayan actually has a 32MiB ROM + select BOARD_ROMSIZE_KB_32768 select EC_ACPI select SOC_AMD_COMMON_BLOCK_USE_ESPI select AMD_SOC_CONSOLE_UART