src/soc: Get rid of most src/soc/Kconfig files

Most of the src/soc/Kconfig files are only there for AMD and Intel to
load the main SoC Kconfig files before any common files.  That can be
done in src/Kconfig instead.  Moving the loads to the lower level allows
the removal of all but the Intel soc/Kconfig file, which can be removed
in a follow-on patch.

Signed-off-by: Martin Roth <gaumless@gmail.com>
Change-Id: I5061191fe23e0b7c745e90874bd7b390806bbcfa
Reviewed-on: https://review.coreboot.org/c/coreboot/+/65327
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Felix Singer <felixsinger@posteo.net>
Reviewed-by: Elyes Haouas <ehaouas@noos.fr>

13 files changed, 3 insertions, 28 deletions

diff --git a/src/Kconfig b/src/Kconfig
index e04639e86f..52d6a75efc 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -560,6 +560,8 @@ menu "Chipset"
 
 comment "SoC"
 source "src/soc/*/Kconfig"
+source "src/soc/*/*/Kconfig"
+source "src/soc/*/*/Kconfig.common"
 comment "CPU"
 source "src/cpu/Kconfig"
 comment "Northbridge"
diff --git a/src/soc/amd/Kconfig b/src/soc/amd/Kconfig
deleted file mode 100644
index 77eac6ba5a..0000000000
--- a/src/soc/amd/Kconfig
+++ /dev/null
@@ -1,5 +0,0 @@
-# Load all chipsets before common
-source "src/soc/amd/*/Kconfig"
-
-# Load common defaults last
-source "src/soc/amd/common/Kconfig.common"
diff --git a/src/soc/cavium/Kconfig b/src/soc/cavium/Kconfig
deleted file mode 100644
index 49070cfbf2..0000000000
--- a/src/soc/cavium/Kconfig
+++ /dev/null
@@ -1,2 +0,0 @@
-# Load all chipsets
-source "src/soc/cavium/*/Kconfig"
diff --git a/src/soc/example/Kconfig b/src/soc/example/Kconfig
deleted file mode 100644
index 5bc004aadb..0000000000
--- a/src/soc/example/Kconfig
+++ /dev/null
@@ -1 +0,0 @@
-source "src/soc/example/*/Kconfig"
diff --git a/src/soc/intel/Kconfig b/src/soc/intel/Kconfig
index d5190683ae..c4ce3216e5 100644
--- a/src/soc/intel/Kconfig
+++ b/src/soc/intel/Kconfig
@@ -1,8 +1,4 @@
-# Load all chipsets
-source "src/soc/intel/*/Kconfig"
-
-# Load common config
-source "src/soc/intel/common/Kconfig.common"
+# should all probably be moved to soc/intel/common/Kconfig
 
 config INTEL_HAS_TOP_SWAP
 	bool
diff --git a/src/soc/mediatek/Kconfig b/src/soc/mediatek/Kconfig
deleted file mode 100644
index d0d19c9cd4..0000000000
--- a/src/soc/mediatek/Kconfig
+++ /dev/null
@@ -1,2 +0,0 @@
-# Load all chipsets
-source "src/soc/mediatek/*/Kconfig"
diff --git a/src/soc/nvidia/Kconfig b/src/soc/nvidia/Kconfig
deleted file mode 100644
index 99436bf67a..0000000000
--- a/src/soc/nvidia/Kconfig
+++ /dev/null
@@ -1,2 +0,0 @@
-# Load all chipsets
-source "src/soc/nvidia/*/Kconfig"
diff --git a/src/soc/qualcomm/Kconfig b/src/soc/qualcomm/Kconfig
deleted file mode 100644
index 44063ad9e1..0000000000
--- a/src/soc/qualcomm/Kconfig
+++ /dev/null
@@ -1,2 +0,0 @@
-# Load all chipsets
-source "src/soc/qualcomm/*/Kconfig"
diff --git a/src/soc/rockchip/Kconfig b/src/soc/rockchip/Kconfig
deleted file mode 100644
index c2e91a736a..0000000000
--- a/src/soc/rockchip/Kconfig
+++ /dev/null
@@ -1,2 +0,0 @@
-# Load all chipsets
-source "src/soc/rockchip/*/Kconfig"
diff --git a/src/soc/samsung/Kconfig b/src/soc/samsung/Kconfig
deleted file mode 100644
index ae803b4af1..0000000000
--- a/src/soc/samsung/Kconfig
+++ /dev/null
@@ -1,2 +0,0 @@
-# Load all chipsets
-source "src/soc/samsung/*/Kconfig"
diff --git a/src/soc/sifive/Kconfig b/src/soc/sifive/Kconfig
deleted file mode 100644
index 14900be4ba..0000000000
--- a/src/soc/sifive/Kconfig
+++ /dev/null
@@ -1,2 +0,0 @@
-# Load all chipsets
-source "src/soc/sifive/*/Kconfig"
diff --git a/src/soc/ti/Kconfig b/src/soc/ti/Kconfig
deleted file mode 100644
index eb66519f2e..0000000000
--- a/src/soc/ti/Kconfig
+++ /dev/null
@@ -1 +0,0 @@
-source "src/soc/ti/am335x/Kconfig"
diff --git a/src/soc/ucb/Kconfig b/src/soc/ucb/Kconfig
deleted file mode 100644
index e5221df61e..0000000000
--- a/src/soc/ucb/Kconfig
+++ /dev/null
@@ -1,2 +0,0 @@
-# Load all chipsets
-source "src/soc/ucb/*/Kconfig"