14 files changed, 43 insertions, 1 deletions
diff --git a/src/Kconfig b/src/Kconfig
index e3323ba5c4..f853c66ed6 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -333,7 +333,7 @@ config CBFS_AUTOGEN_ATTRIBUTES
 menu "Chipset"
 
 comment "SoC"
-source "src/soc/*/*/Kconfig"
+source "src/soc/*/Kconfig"
 comment "CPU"
 source "src/cpu/Kconfig"
 comment "Northbridge"
diff --git a/src/soc/amd/Kconfig b/src/soc/amd/Kconfig
new file mode 100644
index 0000000000..0c33b54cb2
--- /dev/null
+++ b/src/soc/amd/Kconfig
@@ -0,0 +1,5 @@
+# Load all chipsets before common
+source "src/soc/amd/stoneyridge/Kconfig"
+
+# Load common defaults last
+source "src/soc/amd/common/Kconfig"
diff --git a/src/soc/broadcom/Kconfig b/src/soc/broadcom/Kconfig
new file mode 100644
index 0000000000..18c46c1e7c
--- /dev/null
+++ b/src/soc/broadcom/Kconfig
@@ -0,0 +1,2 @@
+# Load all chipsets
+source "src/soc/broadcom/*/Kconfig"
diff --git a/src/soc/dmp/Kconfig b/src/soc/dmp/Kconfig
new file mode 100644
index 0000000000..46e5c6dfe4
--- /dev/null
+++ b/src/soc/dmp/Kconfig
@@ -0,0 +1,2 @@
+# Load all chipsets
+source "src/soc/dmp/*/Kconfig"
diff --git a/src/soc/imgtec/Kconfig b/src/soc/imgtec/Kconfig
new file mode 100644
index 0000000000..18c6ba1dfd
--- /dev/null
+++ b/src/soc/imgtec/Kconfig
@@ -0,0 +1,2 @@
+# Load all chipsets
+source "src/soc/imgtec/*/Kconfig"
diff --git a/src/soc/intel/Kconfig b/src/soc/intel/Kconfig
new file mode 100644
index 0000000000..72ad3e0bd5
--- /dev/null
+++ b/src/soc/intel/Kconfig
@@ -0,0 +1,15 @@
+# Load all chipsets
+source "src/soc/intel/apollolake/Kconfig"
+source "src/soc/intel/baytrail/Kconfig"
+source "src/soc/intel/braswell/Kconfig"
+source "src/soc/intel/broadwell/Kconfig"
+source "src/soc/intel/cannonlake/Kconfig"
+source "src/soc/intel/denverton_ns/Kconfig"
+source "src/soc/intel/fsp_baytrail/Kconfig"
+source "src/soc/intel/fsp_broadwell_de/Kconfig"
+source "src/soc/intel/quark/Kconfig"
+source "src/soc/intel/sch/Kconfig"
+source "src/soc/intel/skylake/Kconfig"
+
+# Load common config
+source "src/soc/intel/common/Kconfig"
diff --git a/src/soc/lowrisc/Kconfig b/src/soc/lowrisc/Kconfig
new file mode 100644
index 0000000000..a514135297
--- /dev/null
+++ b/src/soc/lowrisc/Kconfig
@@ -0,0 +1,2 @@
+# Load all chipsets
+source "src/soc/lowrisc/*/Kconfig"
diff --git a/src/soc/marvell/Kconfig b/src/soc/marvell/Kconfig
new file mode 100644
index 0000000000..e9f5478eb6
--- /dev/null
+++ b/src/soc/marvell/Kconfig
@@ -0,0 +1,2 @@
+# Load all chipsets
+source "src/soc/marvell/*/Kconfig"
diff --git a/src/soc/mediatek/Kconfig b/src/soc/mediatek/Kconfig
new file mode 100644
index 0000000000..d0d19c9cd4
--- /dev/null
+++ b/src/soc/mediatek/Kconfig
@@ -0,0 +1,2 @@
+# Load all chipsets
+source "src/soc/mediatek/*/Kconfig"
diff --git a/src/soc/nvidia/Kconfig b/src/soc/nvidia/Kconfig
new file mode 100644
index 0000000000..99436bf67a
--- /dev/null
+++ b/src/soc/nvidia/Kconfig
@@ -0,0 +1,2 @@
+# Load all chipsets
+source "src/soc/nvidia/*/Kconfig"
diff --git a/src/soc/qualcomm/Kconfig b/src/soc/qualcomm/Kconfig
new file mode 100644
index 0000000000..44063ad9e1
--- /dev/null
+++ b/src/soc/qualcomm/Kconfig
@@ -0,0 +1,2 @@
+# Load all chipsets
+source "src/soc/qualcomm/*/Kconfig"
diff --git a/src/soc/rockchip/Kconfig b/src/soc/rockchip/Kconfig
new file mode 100644
index 0000000000..c2e91a736a
--- /dev/null
+++ b/src/soc/rockchip/Kconfig
@@ -0,0 +1,2 @@
+# Load all chipsets
+source "src/soc/rockchip/*/Kconfig"
diff --git a/src/soc/samsung/Kconfig b/src/soc/samsung/Kconfig
new file mode 100644
index 0000000000..ae803b4af1
--- /dev/null
+++ b/src/soc/samsung/Kconfig
@@ -0,0 +1,2 @@
+# Load all chipsets
+source "src/soc/samsung/*/Kconfig"
diff --git a/src/soc/ucb/Kconfig b/src/soc/ucb/Kconfig
new file mode 100644
index 0000000000..e5221df61e
--- /dev/null
+++ b/src/soc/ucb/Kconfig
@@ -0,0 +1,2 @@
+# Load all chipsets
+source "src/soc/ucb/*/Kconfig"