Attention is currently required from: Fred Reitberger, Jason Glenesk.
Felix Held has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/80290?usp=email )
Change subject: mb/amd/birman: add _FSP postfix to BOARD_AMD_BIRMAN_PHOENIX ......................................................................
mb/amd/birman: add _FSP postfix to BOARD_AMD_BIRMAN_PHOENIX
Rename the BOARD_AMD_BIRMAN_PHOENIX option to BOARD_AMD_BIRMAN_PHOENIX_FSP to distinguish between the FSP-based SoC initialization and the non-FSP based one. Also change the MAINBOARD_PART_NUMBER string to 'Birman_Phoenix_FSP'.
Signed-off-by: Felix Held felix-coreboot@felixheld.de Change-Id: Id3293a07cd1b1833df15ee0a40cad3127e19b7df --- M src/mainboard/amd/birman/Kconfig M src/mainboard/amd/birman/Kconfig.name M src/mainboard/amd/birman/Makefile.mk 3 files changed, 7 insertions(+), 7 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/90/80290/1
diff --git a/src/mainboard/amd/birman/Kconfig b/src/mainboard/amd/birman/Kconfig index 3b9d607..cd7e938 100644 --- a/src/mainboard/amd/birman/Kconfig +++ b/src/mainboard/amd/birman/Kconfig @@ -15,7 +15,7 @@ select SOC_AMD_COMMON_BLOCK_SIMNOW_SUPPORTED select SPI_FLASH_EXIT_4_BYTE_ADDR_MODE
-config BOARD_AMD_BIRMAN_PHOENIX +config BOARD_AMD_BIRMAN_PHOENIX_FSP select BOARD_AMD_BIRMAN_COMMON select SOC_AMD_PHOENIX_FSP
@@ -27,7 +27,7 @@
config FMDFILE default "src/mainboard/amd/birman/chromeos_glinda.fmd" if CHROMEOS && BOARD_AMD_BIRMAN_GLINDA - default "src/mainboard/amd/birman/chromeos_phoenix.fmd" if CHROMEOS && BOARD_AMD_BIRMAN_PHOENIX + default "src/mainboard/amd/birman/chromeos_phoenix.fmd" if CHROMEOS && BOARD_AMD_BIRMAN_PHOENIX_FSP default "src/mainboard/amd/birman/board_glinda.fmd" if BOARD_AMD_BIRMAN_GLINDA default "src/mainboard/amd/birman/board_phoenix.fmd"
@@ -36,7 +36,7 @@
config MAINBOARD_PART_NUMBER default "Birman_Glinda" if BOARD_AMD_BIRMAN_GLINDA - default "Birman_Phoenix" + default "Birman_Phoenix_FSP" if BOARD_AMD_BIRMAN_PHOENIX_FSP
config DEVICETREE default "devicetree_glinda.cb" if BOARD_AMD_BIRMAN_GLINDA diff --git a/src/mainboard/amd/birman/Kconfig.name b/src/mainboard/amd/birman/Kconfig.name index c02173c..9eee171 100644 --- a/src/mainboard/amd/birman/Kconfig.name +++ b/src/mainboard/amd/birman/Kconfig.name @@ -1,7 +1,7 @@ comment "Birman"
-config BOARD_AMD_BIRMAN_PHOENIX - bool "-> Birman for Phoenix SoC" +config BOARD_AMD_BIRMAN_PHOENIX_FSP + bool "-> Birman for Phoenix SoC using FSP"
config BOARD_AMD_BIRMAN_GLINDA bool "-> Birman for Glinda SoC" diff --git a/src/mainboard/amd/birman/Makefile.mk b/src/mainboard/amd/birman/Makefile.mk index 4dba53e..6c417ce 100644 --- a/src/mainboard/amd/birman/Makefile.mk +++ b/src/mainboard/amd/birman/Makefile.mk @@ -4,12 +4,12 @@ bootblock-y += early_gpio.c bootblock-y += ec.c
-romstage-$(CONFIG_BOARD_AMD_BIRMAN_PHOENIX) += port_descriptors_phoenix.c +romstage-$(CONFIG_BOARD_AMD_BIRMAN_PHOENIX_FSP) += port_descriptors_phoenix.c romstage-$(CONFIG_BOARD_AMD_BIRMAN_GLINDA) += port_descriptors_glinda.c
ramstage-y += chromeos.c ramstage-y += gpio.c -ramstage-$(CONFIG_BOARD_AMD_BIRMAN_PHOENIX) += port_descriptors_phoenix.c +ramstage-$(CONFIG_BOARD_AMD_BIRMAN_PHOENIX_FSP) += port_descriptors_phoenix.c ramstage-$(CONFIG_BOARD_AMD_BIRMAN_GLINDA) += port_descriptors_glinda.c
ifneq ($(wildcard $(MAINBOARD_BLOBS_DIR)/APCB_FP8_LPDDR5.bin),)