diff options
| -rw-r--r-- | src/soc/amd/common/Kconfig.common | 4 | ||||
| -rw-r--r-- | src/soc/amd/common/Makefile.inc | 1 | ||||
| -rw-r--r-- | src/soc/amd/common/pi/Kconfig (renamed from src/soc/amd/common/block/pi/Kconfig) | 6 | ||||
| -rw-r--r-- | src/soc/amd/common/pi/Makefile.inc (renamed from src/soc/amd/common/block/pi/Makefile.inc) | 4 | ||||
| -rw-r--r-- | src/soc/amd/common/pi/agesawrapper.c (renamed from src/soc/amd/common/block/pi/agesawrapper.c) | 0 | ||||
| -rw-r--r-- | src/soc/amd/common/pi/amd_late_init.c (renamed from src/soc/amd/common/block/pi/amd_late_init.c) | 0 | ||||
| -rw-r--r-- | src/soc/amd/common/pi/amd_resume_final.c (renamed from src/soc/amd/common/block/pi/amd_resume_final.c) | 0 | ||||
| -rw-r--r-- | src/soc/amd/common/pi/def_callouts.c (renamed from src/soc/amd/common/block/pi/def_callouts.c) | 0 | ||||
| -rw-r--r-- | src/soc/amd/common/pi/heapmanager.c (renamed from src/soc/amd/common/block/pi/heapmanager.c) | 0 | ||||
| -rw-r--r-- | src/soc/amd/common/pi/image.c (renamed from src/soc/amd/common/block/pi/image.c) | 0 | ||||
| -rw-r--r-- | src/soc/amd/common/pi/refcode_loader.c (renamed from src/soc/amd/common/block/pi/refcode_loader.c) | 0 | ||||
| -rw-r--r-- | src/soc/amd/common/pi/s3_resume.c (renamed from src/soc/amd/common/block/pi/s3_resume.c) | 0 | ||||
| -rw-r--r-- | src/soc/amd/stoneyridge/Kconfig | 1 |
13 files changed, 7 insertions, 9 deletions
diff --git a/src/soc/amd/common/Kconfig.common b/src/soc/amd/common/Kconfig.common index 06fd8c5f75..6711843832 100644 --- a/src/soc/amd/common/Kconfig.common +++ b/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 diff --git a/src/soc/amd/common/Makefile.inc b/src/soc/amd/common/Makefile.inc index 4f1052dcaf..bc3cb9b2d7 100644 --- a/src/soc/amd/common/Makefile.inc +++ b/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 diff --git a/src/soc/amd/common/block/pi/Kconfig b/src/soc/amd/common/pi/Kconfig index b872c13484..7b95364961 100644 --- a/src/soc/amd/common/block/pi/Kconfig +++ b/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 diff --git a/src/soc/amd/common/block/pi/Makefile.inc b/src/soc/amd/common/pi/Makefile.inc index 59f075ddd7..55fbd95cc8 100644 --- a/src/soc/amd/common/block/pi/Makefile.inc +++ b/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 diff --git a/src/soc/amd/common/block/pi/agesawrapper.c b/src/soc/amd/common/pi/agesawrapper.c index ca576bad99..ca576bad99 100644 --- a/src/soc/amd/common/block/pi/agesawrapper.c +++ b/src/soc/amd/common/pi/agesawrapper.c diff --git a/src/soc/amd/common/block/pi/amd_late_init.c b/src/soc/amd/common/pi/amd_late_init.c index 25aaea37bf..25aaea37bf 100644 --- a/src/soc/amd/common/block/pi/amd_late_init.c +++ b/src/soc/amd/common/pi/amd_late_init.c diff --git a/src/soc/amd/common/block/pi/amd_resume_final.c b/src/soc/amd/common/pi/amd_resume_final.c index 380ffc8b1a..380ffc8b1a 100644 --- a/src/soc/amd/common/block/pi/amd_resume_final.c +++ b/src/soc/amd/common/pi/amd_resume_final.c diff --git a/src/soc/amd/common/block/pi/def_callouts.c b/src/soc/amd/common/pi/def_callouts.c index 2ee7f46056..2ee7f46056 100644 --- a/src/soc/amd/common/block/pi/def_callouts.c +++ b/src/soc/amd/common/pi/def_callouts.c diff --git a/src/soc/amd/common/block/pi/heapmanager.c b/src/soc/amd/common/pi/heapmanager.c index 699bb53431..699bb53431 100644 --- a/src/soc/amd/common/block/pi/heapmanager.c +++ b/src/soc/amd/common/pi/heapmanager.c diff --git a/src/soc/amd/common/block/pi/image.c b/src/soc/amd/common/pi/image.c index 03a2a473a0..03a2a473a0 100644 --- a/src/soc/amd/common/block/pi/image.c +++ b/src/soc/amd/common/pi/image.c diff --git a/src/soc/amd/common/block/pi/refcode_loader.c b/src/soc/amd/common/pi/refcode_loader.c index d9704e0548..d9704e0548 100644 --- a/src/soc/amd/common/block/pi/refcode_loader.c +++ b/src/soc/amd/common/pi/refcode_loader.c diff --git a/src/soc/amd/common/block/pi/s3_resume.c b/src/soc/amd/common/pi/s3_resume.c index 2094931dca..2094931dca 100644 --- a/src/soc/amd/common/block/pi/s3_resume.c +++ b/src/soc/amd/common/pi/s3_resume.c diff --git a/src/soc/amd/stoneyridge/Kconfig b/src/soc/amd/stoneyridge/Kconfig index b07b4c9181..1f1e1a78ba 100644 --- a/src/soc/amd/stoneyridge/Kconfig +++ b/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 |