x86: Move CONFIG_X86_RESET_VECTOR and CONFIG_SYS_X86_START16 to Kconfig

Convert CONFIG_X86_RESET_VECTOR and CONFIG_SYS_X86_START16 to Kconfig
options so that we can remove them from board configuration file.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Acked-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index ffcb4cb665968463746073f5c353702be42f55c5..ba0c1aace00c2f7221f72196b19bce83d1efe190 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -66,6 +66,15 @@ config SMM_TSEG
 config SMM_TSEG_SIZE
        hex
 
+config X86_RESET_VECTOR
+       bool
+       default n
+
+config SYS_X86_START16
+       hex
+       depends on X86_RESET_VECTOR
+       default 0xfffff800
+
 config BOARD_ROMSIZE_KB_512
        bool
 config BOARD_ROMSIZE_KB_1024

diff --git a/board/google/chromebook_link/Kconfig b/board/google/chromebook_link/Kconfig
index 7f79fd206f9653bcb9d950721eba99ac21041186..a9a55e8d8308de478a0189a96859c31cf03a1e3a 100644 (file)
--- a/board/google/chromebook_link/Kconfig
+++ b/board/google/chromebook_link/Kconfig
@@ -14,6 +14,7 @@ config SYS_CONFIG_NAME
 
 config BOARD_SPECIFIC_OPTIONS # dummy
        def_bool y
+       select X86_RESET_VECTOR
        select CPU_INTEL_SOCKET_RPGA989
        select NORTHBRIDGE_INTEL_IVYBRIDGE
        select SOUTHBRIDGE_INTEL_C216

diff --git a/board/intel/crownbay/Kconfig b/board/intel/crownbay/Kconfig
index 4709f9b55d574610541c476c638af5b9e51bc683..762663a001aaae75a3975e9b36ef81233f5c5482 100644 (file)
--- a/board/intel/crownbay/Kconfig
+++ b/board/intel/crownbay/Kconfig
@@ -14,6 +14,7 @@ config SYS_CONFIG_NAME
 
 config BOARD_SPECIFIC_OPTIONS # dummy
        def_bool y
+       select X86_RESET_VECTOR
        select INTEL_QUEENSBAY
        select BOARD_ROMSIZE_KB_1024
 

diff --git a/include/configs/chromebook_link.h b/include/configs/chromebook_link.h
index 8930210908f648170dd6b97a14172f7280f48546..449f0c2ce37a93b820fe470478cd37b090d62477 100644 (file)
--- a/include/configs/chromebook_link.h
+++ b/include/configs/chromebook_link.h
@@ -19,11 +19,9 @@
 #define CONFIG_SYS_CAR_SIZE                    (128 * 1024)
 #define CONFIG_SYS_MONITOR_LEN                 (1 << 20)
 #define CONFIG_DCACHE_RAM_MRC_VAR_SIZE         0x4000
-#define CONFIG_SYS_X86_START16                 0xfffff800
 #define CONFIG_BOARD_EARLY_INIT_F
 #define CONFIG_DISPLAY_CPUINFO
 
-#define CONFIG_X86_RESET_VECTOR
 #define CONFIG_NR_DRAM_BANKS                   8
 #define CONFIG_X86_MRC_ADDR                    0xfffa0000
 #define CONFIG_CACHE_MRC_SIZE_KB               512

diff --git a/include/configs/crownbay.h b/include/configs/crownbay.h
index eadb339a0f0473750a163b76d5a4157d5c181857..b927b1c9f54837e2897067fcd33c6549886898cf 100644 (file)
--- a/include/configs/crownbay.h
+++ b/include/configs/crownbay.h
@@ -14,10 +14,8 @@
 #include <configs/x86-common.h>
 
 #define CONFIG_SYS_MONITOR_LEN         (1 << 20)
-#define CONFIG_SYS_X86_START16         0xfffff800
 #define CONFIG_BOARD_EARLY_INIT_F
 
-#define CONFIG_X86_RESET_VECTOR
 #define CONFIG_NR_DRAM_BANKS           1
 
 #define CONFIG_X86_SERIAL