From d2119760a871c6ef40c582c6f1ddfe688e3dbd2d Mon Sep 17 00:00:00 2001 From: Duncan Laurie Date: Mon, 8 Jun 2015 18:11:56 -0700 Subject: kconfig: Reorder config includes The default ordering for the base kconfig entries has the CPU directory coming before the SOC directory, which means that the values in the CPU Kconfig take precedence. The first visible consequence of this is that CONFIG_SMM_TSEG_SIZE will be set to 0 on all SOC implementations. BUG=chrome-os-partner:40635 BRANCH=none TEST=build and boot on glados Change-Id: Ifd56a2ceb73ab335a86126e48d35ff4c749990ac Signed-off-by: Patrick Georgi Original-Commit-Id: 0cddae37d3de1cbf3dd6afcf4a0707b7af9436fa Original-Change-Id: I98e3bf249650b50667dde62b6be9c1bf587ad0b2 Original-Signed-off-by: Duncan Laurie Original-Reviewed-on: https://chromium-review.googlesource.com/276189 Original-Reviewed-by: Aaron Durbin Original-Commit-Queue: Aaron Durbin Original-Tested-by: Aaron Durbin Reviewed-on: http://review.coreboot.org/10478 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel Reviewed-by: Edward O'Callaghan --- src/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/Kconfig') diff --git a/src/Kconfig b/src/Kconfig index f685cc3969..a3a78955b7 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -344,6 +344,8 @@ config SYSTEM_TYPE_LAPTOP menu "Chipset" +comment "SoC" +source "src/soc/*/*/Kconfig" comment "CPU" source "src/cpu/Kconfig" comment "Northbridge" @@ -355,8 +357,6 @@ source "src/superio/*/Kconfig" comment "Embedded Controllers" source "src/ec/acpi/Kconfig" source "src/ec/*/*/Kconfig" -comment "SoC" -source "src/soc/*/*/Kconfig" source "src/drivers/intel/fsp1_0/Kconfig" endmenu -- cgit v1.2.3