summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBin Meng <bmeng.cn@gmail.com>2015-04-27 15:22:25 (GMT)
committerSimon Glass <sjg@chromium.org>2015-04-30 00:51:50 (GMT)
commit029194a3c46a0bf82fcc706daa2933d969249a0f (patch)
treec7b63730449186587ba98213da72c6831d8b2efe
parent65c4ac0a831d1a8640602ae966f913ec811843eb (diff)
downloadu-boot-fsl-qoriq-029194a3c46a0bf82fcc706daa2933d969249a0f.tar.xz
x86: Kconfig: Move platform options forward
Move platform-specific options under in arch/x86/Kconfig forward right after the board-specific options but before any architecture-specific options. When it comes to the same Kconfig option, board-specific one takes take the highest precedence, then platform-specific one, and finally architecture-specific one. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Acked-by: Simon Glass <sjg@chromium.org>
-rw-r--r--arch/x86/Kconfig19
1 files changed, 9 insertions, 10 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index c3cc144..43062cd 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -30,6 +30,15 @@ source "board/coreboot/Kconfig"
source "board/google/Kconfig"
source "board/intel/Kconfig"
+# platform-specific options below
+source "arch/x86/cpu/baytrail/Kconfig"
+source "arch/x86/cpu/coreboot/Kconfig"
+source "arch/x86/cpu/ivybridge/Kconfig"
+source "arch/x86/cpu/quark/Kconfig"
+source "arch/x86/cpu/queensbay/Kconfig"
+
+# architecture-specific options below
+
config DM_SPI
default y
@@ -358,16 +367,6 @@ config FSP_TEMP_RAM_ADDR
Stack top address which is used in FspInit after DRAM is ready and
CAR is disabled.
-source "arch/x86/cpu/baytrail/Kconfig"
-
-source "arch/x86/cpu/coreboot/Kconfig"
-
-source "arch/x86/cpu/ivybridge/Kconfig"
-
-source "arch/x86/cpu/quark/Kconfig"
-
-source "arch/x86/cpu/queensbay/Kconfig"
-
config TSC_CALIBRATION_BYPASS
bool "Bypass Time-Stamp Counter (TSC) calibration"
default n