commit 44dddc7b6ab035174499ac1b57cbb94f30e40a86
author Felix Held <felix-coreboot@felixheld.de> Thu Feb 01 17:15:14 2024 +0100
committer Felix Held <felix-coreboot@felixheld.de> Fri Feb 02 20:36:02 2024 +0000
tree 49624fde7320b274aedbb806a9b1d52592943367
parent aadef715683585560d0edc83c4b826fc32793378

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
Reviewed-on: https://review.coreboot.org/c/coreboot/+/80290
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Matt DeVillier <matt.devillier@amd.corp-partner.google.com>

src/mainboard/amd/birman/Kconfig

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

src/mainboard/amd/birman/Kconfig.name

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"

src/mainboard/amd/birman/Makefile.mk

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),)