From 6bc06983ed1d6c545056b584eabc2f7864cb39cd Mon Sep 17 00:00:00 2001 From: Zheng Bao Date: Tue, 14 Feb 2023 13:26:31 +0800 Subject: 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 Reviewed-on: https://review.coreboot.org/c/coreboot/+/72939 Tested-by: build bot (Jenkins) Reviewed-by: Felix Held --- src/mainboard/amd/mandolin/Kconfig | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'src/mainboard/amd/mandolin') 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 -- cgit v1.2.3