soc/amd/stoneyridge|mbs: Deprecate SOC_AMD_NAME_PKG and others

Add package and APU selections to mainboards and remove symbols no
longer used in soc//stoneyridge.

Change-Id: I60214b6557bef50358f9ec8f9fcdb7265e04663b
Signed-off-by: Marshall Dawson <marshalldawson3rd@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/37225
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Richard Spiegel <richard.spiegel@silverbackltd.com>

7 files changed, 14 insertions, 39 deletions

diff --git a/src/mainboard/amd/gardenia/Kconfig b/src/mainboard/amd/gardenia/Kconfig
index 2d3f2646c1..e97a3bad78 100644
--- a/src/mainboard/amd/gardenia/Kconfig
+++ b/src/mainboard/amd/gardenia/Kconfig
@@ -18,7 +18,8 @@ if BOARD_AMD_GARDENIA
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
 	select SOC_AMD_STONEYRIDGE
-	select SOC_AMD_STONEYRIDGE_FP4
+	select AMD_APU_STONEYRIDGE
+	select AMD_APU_PKG_FP4
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE
 	select HAVE_ACPI_TABLES
diff --git a/src/mainboard/amd/padmelon/Kconfig b/src/mainboard/amd/padmelon/Kconfig
index f5d4b6d20e..1be3a62cee 100644
--- a/src/mainboard/amd/padmelon/Kconfig
+++ b/src/mainboard/amd/padmelon/Kconfig
@@ -18,7 +18,8 @@ if BOARD_AMD_PADMELON
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select SOC_AMD_STONEYRIDGE
-	select SOC_AMD_MERLINFALCON
+	select AMD_APU_MERLINFALCON
+	select AMD_APU_PKG_FP4
 	select BOARD_ROMSIZE_KB_8192
 	select DRIVERS_I2C_GENERIC
 	select DRIVERS_PS2_KEYBOARD
diff --git a/src/mainboard/google/kahlee/Kconfig b/src/mainboard/google/kahlee/Kconfig
index 20b5273efb..7d98d89f13 100644
--- a/src/mainboard/google/kahlee/Kconfig
+++ b/src/mainboard/google/kahlee/Kconfig
@@ -16,7 +16,8 @@
 config BOARD_GOOGLE_BASEBOARD_KAHLEE
 	bool
 	select SOC_AMD_STONEYRIDGE
-	select SOC_AMD_STONEYRIDGE_FT4
+	select AMD_APU_STONEYRIDGE
+	select AMD_APU_PKG_FT4
 	select ALWAYS_LOAD_OPROM
 	select ALWAYS_RUN_OPROM
 	select BOARD_ROMSIZE_KB_16384
diff --git a/src/soc/amd/stoneyridge/Kconfig b/src/soc/amd/stoneyridge/Kconfig
index 4b39ec756b..a03b8f3e84 100644
--- a/src/soc/amd/stoneyridge/Kconfig
+++ b/src/soc/amd/stoneyridge/Kconfig
@@ -20,34 +20,6 @@ config SOC_AMD_STONEYRIDGE
 
 if SOC_AMD_STONEYRIDGE
 
-config SOC_AMD_STONEYRIDGE_FP4
-	bool
-	select AMD_APU_STONEYRIDGE
-	select AMD_APU_PKG_FP4
-	help
-	  AMD Stoney Ridge FP4 support
-
-config SOC_AMD_STONEYRIDGE_FT4
-	bool
-	select AMD_APU_STONEYRIDGE
-	select AMD_APU_PKG_FT4
-	help
-	  AMD Stoney Ridge FT4 support
-
-config SOC_AMD_MERLINFALCON
-	bool
-	select AMD_APU_MERLINFALCON
-	select AMD_APU_PKG_FP4
-	help
-	  AMD Merlin Falcon FP4 support
-
-config SOC_AMD_PRAIRIEFALCON
-	bool
-	select AMD_APU_PRAIRIEFALCON
-	select AMD_APU_PKG_FP4
-	help
-	  AMD Prairie Falcon FP4 support
-
 config CPU_SPECIFIC_OPTIONS
 	def_bool y
 	select ARCH_BOOTBLOCK_X86_32
diff --git a/src/soc/amd/stoneyridge/Makefile.inc b/src/soc/amd/stoneyridge/Makefile.inc
index ee4560d085..15216b7934 100644
--- a/src/soc/amd/stoneyridge/Makefile.inc
+++ b/src/soc/amd/stoneyridge/Makefile.inc
@@ -27,7 +27,7 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 #*****************************************************************************
-ifeq ($(CONFIG_SOC_AMD_MERLINFALCON)$(CONFIG_SOC_AMD_STONEYRIDGE_FP4)$(CONFIG_SOC_AMD_STONEYRIDGE_FT4),y)
+ifeq ($(CONFIG_SOC_AMD_STONEYRIDGE),y)
 
 subdirs-y += ../../../cpu/amd/mtrr/
 subdirs-y += ../../../cpu/x86/tsc
@@ -338,4 +338,4 @@ files_added:: warn_no_amdfw
 
 endif # ifneq ($(FIRMWARE_LOCATE),)
 
-endif # ($(CONFIG_SOC_AMD_MERLINFALCON)$(CONFIG_SOC_AMD_STONEYRIDGE_FP4)$(CONFIG_SOC_AMD_STONEYRIDGE_FT4),y)
+endif # ($(CONFIG_SOC_AMD_STONEYRIDGE),y)
diff --git a/src/vendorcode/amd/pi/00670F00/Makefile.inc b/src/vendorcode/amd/pi/00670F00/Makefile.inc
index 947134f1d9..a019f0540e 100644
--- a/src/vendorcode/amd/pi/00670F00/Makefile.inc
+++ b/src/vendorcode/amd/pi/00670F00/Makefile.inc
@@ -28,7 +28,7 @@
 #
 #*****************************************************************************
 
-ifeq ($(CONFIG_SOC_AMD_MERLINFALCON)$(CONFIG_SOC_AMD_STONEYRIDGE_FP4)$(CONFIG_SOC_AMD_STONEYRIDGE_FT4),y)
+ifeq ($(CONFIG_SOC_AMD_STONEYRIDGE),y)
 # AGESA V5 Files
 
 AGESA_ROOT = $(call strip_quotes,$(CONFIG_AGESA_BINARY_PI_VENDORCODE_PATH))
diff --git a/src/vendorcode/amd/pi/Kconfig b/src/vendorcode/amd/pi/Kconfig
index c72180a57e..265a381eb6 100644
--- a/src/vendorcode/amd/pi/Kconfig
+++ b/src/vendorcode/amd/pi/Kconfig
@@ -26,14 +26,14 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-if CPU_AMD_PI_00630F01 || CPU_AMD_PI_00730F01 || CPU_AMD_PI_00660F01 || SOC_AMD_STONEYRIDGE || SOC_AMD_MERLINFALCON
+if CPU_AMD_PI_00630F01 || CPU_AMD_PI_00730F01 || CPU_AMD_PI_00660F01 || SOC_AMD_STONEYRIDGE
 
 config AGESA_BINARY_PI_VENDORCODE_PATH
 	string "AGESA PI directory path"
 	default "src/vendorcode/amd/pi/00630F01" if CPU_AMD_PI_00630F01
 	default "src/vendorcode/amd/pi/00730F01" if CPU_AMD_PI_00730F01
-	default "src/vendorcode/amd/pi/00670F00" if SOC_AMD_MERLINFALCON
-	default "src/vendorcode/amd/pi/00670F00" if SOC_AMD_STONEYRIDGE
+	default "src/vendorcode/amd/pi/00670F00" if AMD_APU_MERLINFALCON
+	default "src/vendorcode/amd/pi/00670F00" if AMD_APU_STONEYRIDGE || AMD_APU_PRAIRIEFALCON
 	default "src/vendorcode/amd/pi/00660F01" if CPU_AMD_PI_00660F01
 	help
 	  Specify where to find the AGESA header files
@@ -43,8 +43,8 @@ config AGESA_BINARY_PI_FILE
 	string "AGESA PI binary file name"
 	default "3rdparty/blobs/pi/amd/00630F01/FP3/AGESA.bin" if CPU_AMD_PI_00630F01
 	default "3rdparty/blobs/pi/amd/00730F01/FT3b/AGESA.bin" if CPU_AMD_PI_00730F01
-	default "3rdparty/amd_blobs/stoneyridge/pi/CZ/$(CONFIG_AMD_SOC_PACKAGE)/AGESA.bin" if SOC_AMD_MERLINFALCON && USE_AMD_BLOBS
-	default "3rdparty/amd_blobs/stoneyridge/pi/ST/$(CONFIG_AMD_SOC_PACKAGE)/AGESA.bin" if SOC_AMD_PRAIRIEFALCON && USE_AMD_BLOBS
+	default "3rdparty/amd_blobs/stoneyridge/pi/CZ/$(CONFIG_AMD_SOC_PACKAGE)/AGESA.bin" if AMD_APU_MERLINFALCON && USE_AMD_BLOBS
+	default "3rdparty/amd_blobs/stoneyridge/pi/ST/$(CONFIG_AMD_SOC_PACKAGE)/AGESA.bin" if AMD_APU_PRAIRIEFALCON && USE_AMD_BLOBS
 	default "3rdparty/amd_blobs/stoneyridge/pi/ST/$(CONFIG_AMD_SOC_PACKAGE)/AGESA.bin" if AMD_APU_STONEYRIDGE && USE_AMD_BLOBS
 	default "3rdparty/blobs/pi/amd/00660F01/FP4/AGESA.bin" if CPU_AMD_PI_00660F01
 	help