diff options
| author | Zheng Bao <fishbaozi@gmail.com> | 2023-02-14 13:26:31 +0800 |
|---|---|---|
| committer | Felix Held <felix-coreboot@felixheld.de> | 2023-09-01 11:47:15 +0000 |
| commit | 6bc06983ed1d6c545056b584eabc2f7864cb39cd (patch) | |
| tree | 85e01a12ae0de1e768747bc3760ff9300faf517e /src/mainboard/amd | |
| parent | d0de6c2183af5f6c435e53632fe92793be4d3783 (diff) | |
util/amdfwtool: Deal with psp position in flash offset directly
It is based on work by Arthur Heymans, 69852.
Get rid of the confusing "position index" and use the relative flash
offset as the Kconfig setting instead.
TEST=binary identical on amd/birman amd/majolica amd/gardenia
amd/mayan amd/bilby amd/mandolin amd/chausie amd/pademelon
pcengines/apu2
google/skyrim google/guybrush google/zork google/kahlee google/myst
(The test should be done with INCLUDE_CONFIG_FILE=n)
Change-Id: I26bde0b7c70efe9f5762109f431329ea7f95b7f2
Signed-off-by: Zheng Bao <fishbaozi@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/72939
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
Diffstat (limited to 'src/mainboard/amd')
| -rw-r--r-- | src/mainboard/amd/chausie/Kconfig | 9 | ||||
| -rw-r--r-- | src/mainboard/amd/majolica/Kconfig | 9 | ||||
| -rw-r--r-- | src/mainboard/amd/mandolin/Kconfig | 9 |
3 files changed, 6 insertions, 21 deletions
diff --git a/src/mainboard/amd/chausie/Kconfig b/src/mainboard/amd/chausie/Kconfig index 052d5d7446..86e18f5392 100644 --- a/src/mainboard/amd/chausie/Kconfig +++ b/src/mainboard/amd/chausie/Kconfig @@ -15,6 +15,8 @@ config BOARD_SPECIFIC_OPTIONS select PCIEXP_COMMON_CLOCK select PCIEXP_L1_SUB_STATE select SOC_AMD_COMMON_BLOCK_ESPI_RETAIN_PORT80_EN if !SOC_AMD_COMMON_BLOCK_SIMNOW_BUILD + select AMD_FWM_POSITION_C20000_DEFAULT if CHROMEOS + select AMD_FWM_POSITION_820000_DEFAULT if !CHROMEOS select SOC_AMD_COMMON_BLOCK_SIMNOW_SUPPORTED config FMDFILE @@ -27,13 +29,6 @@ config MAINBOARD_DIR config MAINBOARD_PART_NUMBER default "CHAUSIE" -config AMD_FWM_POSITION_INDEX - int - default 3 if CHROMEOS - default 4 - help - TODO: might need to be adapted for better placement of files in cbfs - config CHAUSIE_HAVE_MCHP_FW bool "Have Microchip EC firmware?" default n diff --git a/src/mainboard/amd/majolica/Kconfig b/src/mainboard/amd/majolica/Kconfig index 937d0bacf0..a167dff35b 100644 --- a/src/mainboard/amd/majolica/Kconfig +++ b/src/mainboard/amd/majolica/Kconfig @@ -10,6 +10,8 @@ config BOARD_SPECIFIC_OPTIONS select AMD_SOC_CONSOLE_UART select PSP_INIT_ESPI select MAINBOARD_HAS_CHROMEOS + select AMD_FWM_POSITION_C20000_DEFAULT if CHROMEOS + select AMD_FWM_POSITION_820000_DEFAULT if !CHROMEOS config FMDFILE default "src/mainboard/amd/majolica/chromeos.fmd" if CHROMEOS @@ -21,13 +23,6 @@ config MAINBOARD_DIR config MAINBOARD_PART_NUMBER default "MAJOLICA" -config AMD_FWM_POSITION_INDEX - int - default 3 if CHROMEOS - default 4 - help - TODO: might need to be adapted for better placement of files in cbfs - config MAJOLICA_HAVE_MCHP_FW bool "Have Microchip EC firmware?" default n diff --git a/src/mainboard/amd/mandolin/Kconfig b/src/mainboard/amd/mandolin/Kconfig index 50b3e5d5bc..20ff1c6d38 100644 --- a/src/mainboard/amd/mandolin/Kconfig +++ b/src/mainboard/amd/mandolin/Kconfig @@ -12,6 +12,8 @@ config BOARD_SPECIFIC_OPTIONS select HAVE_ACPI_RESUME select DRIVERS_UART_ACPI select AMD_SOC_CONSOLE_UART if !AMD_LPC_DEBUG_CARD + select AMD_FWM_POSITION_420000_DEFAULT if BOARD_AMD_MANDOLIN + select AMD_FWM_POSITION_820000_DEFAULT if BOARD_AMD_CEREME config FMDFILE default "src/mainboard/amd/mandolin/variants/\$(CONFIG_VARIANT_DIR)/board.fmd" @@ -67,13 +69,6 @@ config ONBOARD_VGA_IS_PRIMARY bool default y -config AMD_FWM_POSITION_INDEX - int - default 3 if BOARD_AMD_MANDOLIN - default 4 if BOARD_AMD_CEREME - help - TODO: might need to be adapted for better placement of files in cbfs - config MANDOLIN_HAVE_MCHP_FW bool "Have Microchip EC firmware?" default n |