soc/amd/common: move block/pi out of the block folder

Since the binaryPI glue code is specific to a binary interface, but not
for a hardware block, move it out of the common blocks directory. This
also brings the binaryPI support in line with the FSP support which is
used on the newer generations. This also drops the
SOC_AMD_COMMON_BLOCK_PI Kconfig option and makes use of the already
existing SOC_AMD_PI Kconfig option instead.

Signed-off-by: Felix Held <felix-coreboot@felixheld.de>
Change-Id: I014e538f2772938031950475e456cc40dd05d74c
Reviewed-on: https://review.coreboot.org/c/coreboot/+/57884
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Raul Rangel <rrangel@chromium.org>

src/soc/amd/common/Kconfig.common

@@ -5,10 +5,8 @@ config SOC_AMD_COMMON
 
 if SOC_AMD_COMMON
 
-config SOC_AMD_PI
-	bool
-
 source "src/soc/amd/common/block/*/Kconfig"
+source "src/soc/amd/common/pi/Kconfig"
 
 if PLATFORM_USES_FSP2_0
 

src/soc/amd/common/Makefile.inc

@@ -1,5 +1,6 @@
 ifeq ($(CONFIG_SOC_AMD_COMMON),y)
 subdirs-y += block
 subdirs-y += fsp
+subdirs-y += pi
 subdirs-y += vboot
 endif

src/soc/amd/common/pi/Kconfig

@@ -1,4 +1,4 @@
-config SOC_AMD_COMMON_BLOCK_PI
+config SOC_AMD_PI
 	bool
 	depends on SOC_AMD_COMMON_BLOCK_ACPI
 	select CACHE_MRC_SETTINGS
@@ -8,7 +8,7 @@ config SOC_AMD_COMMON_BLOCK_PI
 	  This option builds functions that interface AMD's AGESA reference
 	  code packaged in the binaryPI form and S3-related functionality.
 
-if SOC_AMD_COMMON_BLOCK_PI
+if SOC_AMD_PI
 
 config PI_AGESA_CAR_HEAP_BASE
 	hex
@@ -34,4 +34,4 @@ config PI_AGESA_HEAP_SIZE
 	  This option determines the amount of space allowed for AGESA heap
 	  prior to DRAM availability.
 
-endif
+endif # SOC_AMD_PI

src/soc/amd/common/pi/Makefile.inc

@@ -1,4 +1,4 @@
-ifeq ($(CONFIG_SOC_AMD_COMMON_BLOCK_PI),y)
+ifeq ($(CONFIG_SOC_AMD_PI),y)
 
 romstage-y += agesawrapper.c
 romstage-y += def_callouts.c
@@ -16,4 +16,4 @@ ramstage-y += image.c
 ramstage-y += refcode_loader.c
 ramstage-y += s3_resume.c
 
-endif # CONFIG_SOC_AMD_COMMON_BLOCK_PI
+endif # CONFIG_SOC_AMD_PI

src/soc/amd/stoneyridge/Kconfig

@@ -36,7 +36,6 @@ config CPU_SPECIFIC_OPTIONS
 	select SOC_AMD_COMMON_BLOCK_LPC
 	select SOC_AMD_COMMON_BLOCK_MCA
 	select SOC_AMD_COMMON_BLOCK_PCI
-	select SOC_AMD_COMMON_BLOCK_PI
 	select SOC_AMD_COMMON_BLOCK_PM
 	select SOC_AMD_COMMON_BLOCK_PSP_GEN1
 	select SOC_AMD_COMMON_BLOCK_SATA