From aa8e5d36b1b8a5ce1574c3562416e8488ebbb8cc Mon Sep 17 00:00:00 2001 From: Chris Ching Date: Fri, 20 Oct 2017 10:43:39 -0600 Subject: soc: Add Kconfig for each soc vendor Allows explicit ordering for vendors that share a common configuration that must be sourced last. The issue is that chips in soc/{amd,intel}/[ab].* will be able to override defaults set in this file, but Kconfig files that get sourced later (soc/amd/[d-z].*) will NOT be able to override these defaults. Note: intel and amd soc chips now need to be added manually to the new Kconfig file BUG=b:62235314 TEST=make lint-stable Change-Id: Ida82ef184712e092aec1381a47aa1b54b74ed6b6 Signed-off-by: Chris Ching Reviewed-on: https://review.coreboot.org/22123 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin --- src/Kconfig | 2 +- src/soc/amd/Kconfig | 5 +++++ src/soc/broadcom/Kconfig | 2 ++ src/soc/dmp/Kconfig | 2 ++ src/soc/imgtec/Kconfig | 2 ++ src/soc/intel/Kconfig | 15 +++++++++++++++ src/soc/lowrisc/Kconfig | 2 ++ src/soc/marvell/Kconfig | 2 ++ src/soc/mediatek/Kconfig | 2 ++ src/soc/nvidia/Kconfig | 2 ++ src/soc/qualcomm/Kconfig | 2 ++ src/soc/rockchip/Kconfig | 2 ++ src/soc/samsung/Kconfig | 2 ++ src/soc/ucb/Kconfig | 2 ++ 14 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 src/soc/amd/Kconfig create mode 100644 src/soc/broadcom/Kconfig create mode 100644 src/soc/dmp/Kconfig create mode 100644 src/soc/imgtec/Kconfig create mode 100644 src/soc/intel/Kconfig create mode 100644 src/soc/lowrisc/Kconfig create mode 100644 src/soc/marvell/Kconfig create mode 100644 src/soc/mediatek/Kconfig create mode 100644 src/soc/nvidia/Kconfig create mode 100644 src/soc/qualcomm/Kconfig create mode 100644 src/soc/rockchip/Kconfig create mode 100644 src/soc/samsung/Kconfig create mode 100644 src/soc/ucb/Kconfig (limited to 'src') 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" -- cgit v1.2.3