soc/amd/stoneyridge|mbs: Define SOC_AMD_STONEYRIDGE symbol

Make a new Kconfig symbol for using soc//stoneyridge.  This code also
supports Prairie Falcon is backward-compatible with Carrizo and Merlin
Falcon.

Although Bettong uses Carrizo, it does not currently rely on stoneyridge
source, so it is unaffected by this change.

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

5 files changed, 17 insertions, 11 deletions

diff --git a/src/mainboard/amd/gardenia/Kconfig b/src/mainboard/amd/gardenia/Kconfig
index 02e3e95953..2d3f2646c1 100644
--- a/src/mainboard/amd/gardenia/Kconfig
+++ b/src/mainboard/amd/gardenia/Kconfig
@@ -17,6 +17,7 @@ if BOARD_AMD_GARDENIA
 
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
+	select SOC_AMD_STONEYRIDGE
 	select SOC_AMD_STONEYRIDGE_FP4
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE
diff --git a/src/mainboard/amd/padmelon/Kconfig b/src/mainboard/amd/padmelon/Kconfig
index e4dd90c8b3..f5d4b6d20e 100644
--- a/src/mainboard/amd/padmelon/Kconfig
+++ b/src/mainboard/amd/padmelon/Kconfig
@@ -17,6 +17,7 @@ if BOARD_AMD_PADMELON
 
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
+	select SOC_AMD_STONEYRIDGE
 	select SOC_AMD_MERLINFALCON
 	select BOARD_ROMSIZE_KB_8192
 	select DRIVERS_I2C_GENERIC
diff --git a/src/mainboard/google/kahlee/Kconfig b/src/mainboard/google/kahlee/Kconfig
index 8632553256..20b5273efb 100644
--- a/src/mainboard/google/kahlee/Kconfig
+++ b/src/mainboard/google/kahlee/Kconfig
@@ -15,6 +15,7 @@
 
 config BOARD_GOOGLE_BASEBOARD_KAHLEE
 	bool
+	select SOC_AMD_STONEYRIDGE
 	select SOC_AMD_STONEYRIDGE_FT4
 	select ALWAYS_LOAD_OPROM
 	select ALWAYS_RUN_OPROM
diff --git a/src/soc/amd/stoneyridge/Kconfig b/src/soc/amd/stoneyridge/Kconfig
index d1dd4334de..4b39ec756b 100644
--- a/src/soc/amd/stoneyridge/Kconfig
+++ b/src/soc/amd/stoneyridge/Kconfig
@@ -13,6 +13,13 @@
 ## GNU General Public License for more details.
 ##
 
+config SOC_AMD_STONEYRIDGE
+	bool
+	help
+	  AMD support for SOCs in Family 15h Models 60h-6Fh and Models 70h-7Fh.
+
+if SOC_AMD_STONEYRIDGE
+
 config SOC_AMD_STONEYRIDGE_FP4
 	bool
 	select AMD_APU_STONEYRIDGE
@@ -41,8 +48,6 @@ config SOC_AMD_PRAIRIEFALCON
 	help
 	  AMD Prairie Falcon FP4 support
 
-if SOC_AMD_STONEYRIDGE_FP4 || SOC_AMD_STONEYRIDGE_FT4 || SOC_AMD_MERLINFALCON || SOC_AMD_PRAIRIEFALCON
-
 config CPU_SPECIFIC_OPTIONS
 	def_bool y
 	select ARCH_BOOTBLOCK_X86_32
@@ -439,4 +444,4 @@ config MAINBOARD_POWER_RESTORE
 	  return to S0.  Otherwise the system will remain in S5 once power
 	  is restored.
 
-endif # SOC_AMD_STONEYRIDGE_FP4 || SOC_AMD_STONEYRIDGE_FT4 || SOC_AMD_MERLINFALCON || SOC_AMD_PRAIRIEFALCON
+endif # SOC_AMD_STONEYRIDGE
diff --git a/src/vendorcode/amd/pi/Kconfig b/src/vendorcode/amd/pi/Kconfig
index 9ac391386f..c72180a57e 100644
--- a/src/vendorcode/amd/pi/Kconfig
+++ b/src/vendorcode/amd/pi/Kconfig
@@ -26,15 +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_FP4 || SOC_AMD_STONEYRIDGE_FT4 || SOC_AMD_MERLINFALCON
+if CPU_AMD_PI_00630F01 || CPU_AMD_PI_00730F01 || CPU_AMD_PI_00660F01 || SOC_AMD_STONEYRIDGE || SOC_AMD_MERLINFALCON
 
 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_FP4
-	default "src/vendorcode/amd/pi/00670F00" if SOC_AMD_STONEYRIDGE_FT4
+	default "src/vendorcode/amd/pi/00670F00" if SOC_AMD_STONEYRIDGE
 	default "src/vendorcode/amd/pi/00660F01" if CPU_AMD_PI_00660F01
 	help
 	  Specify where to find the AGESA header files
@@ -46,15 +45,14 @@ config AGESA_BINARY_PI_FILE
 	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/ST/$(CONFIG_AMD_SOC_PACKAGE)/AGESA.bin" if SOC_AMD_STONEYRIDGE_FP4 && USE_AMD_BLOBS
-	default "3rdparty/amd_blobs/stoneyridge/pi/ST/$(CONFIG_AMD_SOC_PACKAGE)/AGESA.bin" if SOC_AMD_STONEYRIDGE_FT4 && 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
 	  Specify the binary file to use for AMD platform initialization.
 
 config AGESA_BINARY_PI_AS_STAGE
 	bool "AGESA Binary PI is added as stage to CBFS."
-	depends on SOC_AMD_STONEYRIDGE_FT4 || SOC_AMD_STONEYRIDGE_FP4
+	depends on SOC_AMD_STONEYRIDGE
 	help
 	  AGESA will be added as a stage utilizing --xip cbfstool options
 	  as needed relocating the image to the proper location in memory-mapped
@@ -72,7 +70,7 @@ config AGESA_SPLIT_MEMORY_FILES
 config AGESA_PRE_MEMORY_BINARY_PI_FILE
 	string
 	depends on AGESA_SPLIT_MEMORY_FILES
-	default "3rdparty/blobs/pi/amd/00670F00/FT4/AGESA_premem.elf" if SOC_AMD_STONEYRIDGE_FT4 && USE_AMD_BLOBS
+	default "3rdparty/blobs/pi/amd/00670F00/FT4/AGESA_premem.elf" if SOC_AMD_STONEYRIDGE && USE_AMD_BLOBS
 	help
 	  Specify the binary file to use for pre-memory AMD platform
 	  initialization.
@@ -80,7 +78,7 @@ config AGESA_PRE_MEMORY_BINARY_PI_FILE
 config AGESA_POST_MEMORY_BINARY_PI_FILE
 	string
 	depends on AGESA_SPLIT_MEMORY_FILES
-	default "3rdparty/blobs/pi/amd/00670F00/FT4/AGESA_postmem.elf" if SOC_AMD_STONEYRIDGE_FT4 && USE_AMD_BLOBS
+	default "3rdparty/blobs/pi/amd/00670F00/FT4/AGESA_postmem.elf" if SOC_AMD_STONEYRIDGE && USE_AMD_BLOBS
 	help
 	  Specify the binary file to use for post-memory AMD platform
 	  initialization.