summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Roth <gaumless@gmail.com>2015-06-19 22:30:43 -0600
committerStefan Reinauer <stefan.reinauer@coreboot.org>2015-06-21 08:24:55 +0200
commite1523ecaa1da2ee77aad1b08889a07f626c5e8ed (patch)
tree9fae80e2c747834616e4a26da5b82b5e9780800f
parenteb22da0e4d2cc00064c7a95e3ad6b6be9518dd09 (diff)
downloadcoreboot-e1523ecaa1da2ee77aad1b08889a07f626c5e8ed.tar.xz
Reorder arch & vendorcode in Kconfig
Because Kconfig uses the first valid default that it comes across, the 'source' commands to load sub-Kconfigs should be ordered from the most specific (mainboards) to less specific (chipsets) to least specific (architectures). This allows the mainboards to override chipsets and architecture Kconfig files. Because the architecture files were getting loaded ahead of the chipset and cpu Kconfigs, the preferred defaults values for things such as NUM_IPI_STARTS or RISCV_BOOTBLOCK_CUSTOM could not be set. Change-Id: Ic327452833f012ec06dabb5b5ef661aba3aff464 Signed-off-by: Martin Roth <gaumless@gmail.com> Reviewed-on: http://review.coreboot.org/10609 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Duncan Laurie <dlaurie@google.com>
-rw-r--r--src/Kconfig7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/Kconfig b/src/Kconfig
index b7d2e67b7a..c282d21757 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -334,10 +334,6 @@ source "src/acpi/Kconfig"
source "src/mainboard/Kconfig"
-source "src/arch/*/Kconfig"
-
-source "src/vendorcode/*/Kconfig"
-
config SYSTEM_TYPE_LAPTOP
default n
bool
@@ -359,6 +355,9 @@ source "src/ec/acpi/Kconfig"
source "src/ec/*/*/Kconfig"
source "src/drivers/intel/fsp1_0/Kconfig"
+source "src/vendorcode/*/Kconfig"
+source "src/arch/*/Kconfig"
+
endmenu
source "src/device/Kconfig"