summaryrefslogtreecommitdiff
path: root/src/mainboard/amd/majolica
diff options
context:
space:
mode:
authorZheng Bao <fishbaozi@gmail.com>2023-02-14 13:26:31 +0800
committerFelix Held <felix-coreboot@felixheld.de>2023-09-01 11:47:15 +0000
commit6bc06983ed1d6c545056b584eabc2f7864cb39cd (patch)
tree85e01a12ae0de1e768747bc3760ff9300faf517e /src/mainboard/amd/majolica
parentd0de6c2183af5f6c435e53632fe92793be4d3783 (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/majolica')
-rw-r--r--src/mainboard/amd/majolica/Kconfig9
1 files changed, 2 insertions, 7 deletions
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