From e1523ecaa1da2ee77aad1b08889a07f626c5e8ed Mon Sep 17 00:00:00 2001 From: Martin Roth Date: Fri, 19 Jun 2015 22:30:43 -0600 Subject: 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 Reviewed-on: http://review.coreboot.org/10609 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel Reviewed-by: Duncan Laurie --- src/Kconfig | 7 +++---- 1 file 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" -- cgit v1.2.3