From 4e56f75bb5c5aefd8cde011b6b64e454c42df2ce Mon Sep 17 00:00:00 2001 From: Felix Held Date: Wed, 18 Nov 2020 11:25:37 +0100 Subject: soc/amd: rename common Kconfig and use wildcard for SoC-specific Kconfig By renaming the AMD SOC common Kconfig file the wildcard to source all AMD SoC-specific Kconfig files won't match to it and it can be sourced after all SoC-specific Kconfig files in the sub-directories are sourced. This change allows adding new SoCs without having to edit the soc/amd Kconfig file. Change-Id: Iaaa5aad23eb6364d46b279101f3969db9f182607 Signed-off-by: Felix Held Reviewed-on: https://review.coreboot.org/c/coreboot/+/47701 Tested-by: build bot (Jenkins) Reviewed-by: Nico Huber --- src/soc/amd/Kconfig | 5 ++--- src/soc/amd/common/Kconfig | 14 -------------- src/soc/amd/common/Kconfig.common | 14 ++++++++++++++ 3 files changed, 16 insertions(+), 17 deletions(-) delete mode 100644 src/soc/amd/common/Kconfig create mode 100644 src/soc/amd/common/Kconfig.common (limited to 'src') diff --git a/src/soc/amd/Kconfig b/src/soc/amd/Kconfig index 7c08f031b0..77eac6ba5a 100644 --- a/src/soc/amd/Kconfig +++ b/src/soc/amd/Kconfig @@ -1,6 +1,5 @@ # Load all chipsets before common -source "src/soc/amd/picasso/Kconfig" -source "src/soc/amd/stoneyridge/Kconfig" +source "src/soc/amd/*/Kconfig" # Load common defaults last -source "src/soc/amd/common/Kconfig" +source "src/soc/amd/common/Kconfig.common" diff --git a/src/soc/amd/common/Kconfig b/src/soc/amd/common/Kconfig deleted file mode 100644 index a0836a3372..0000000000 --- a/src/soc/amd/common/Kconfig +++ /dev/null @@ -1,14 +0,0 @@ -config SOC_AMD_COMMON - bool - help - common code blocks for AMD SOCs - -if SOC_AMD_COMMON - -config SOC_AMD_PI - bool - default n - -source "src/soc/amd/common/block/*/Kconfig" - -endif # SOC_AMD_COMMON diff --git a/src/soc/amd/common/Kconfig.common b/src/soc/amd/common/Kconfig.common new file mode 100644 index 0000000000..a0836a3372 --- /dev/null +++ b/src/soc/amd/common/Kconfig.common @@ -0,0 +1,14 @@ +config SOC_AMD_COMMON + bool + help + common code blocks for AMD SOCs + +if SOC_AMD_COMMON + +config SOC_AMD_PI + bool + default n + +source "src/soc/amd/common/block/*/Kconfig" + +endif # SOC_AMD_COMMON -- cgit v1.2.3