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>

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>
Bin Meng · Simon Glass
1 parent 3ba6a0f4f6
Showing 5 changed files with 11 additions and 4 deletions Side-by-side Diff
arch/x86/Kconfig
board/google/chromebook_link/Kconfig
board/intel/crownbay/Kconfig
include/configs/chromebook_link.h
include/configs/crownbay.h
@@ -66,6 +66,15 @@
 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
@@ -14,6 +14,7 @@
  
 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
@@ -14,6 +14,7 @@
  
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
+	select X86_RESET_VECTOR
 	select INTEL_QUEENSBAY
 	select BOARD_ROMSIZE_KB_1024
  
@@ -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
@@ -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
...	...	@@ -66,6 +66,15 @@
66	66	config SMM_TSEG_SIZE
67	67	hex
68	68
	69	+config X86_RESET_VECTOR
	70	+ bool
	71	+ default n
	72	+
	73	+config SYS_X86_START16
	74	+ hex
	75	+ depends on X86_RESET_VECTOR
	76	+ default 0xfffff800
	77	+
69	78	config BOARD_ROMSIZE_KB_512
70	79	bool
71	80	config BOARD_ROMSIZE_KB_1024
...	...	@@ -14,6 +14,7 @@
14	14
15	15	config BOARD_SPECIFIC_OPTIONS # dummy
16	16	def_bool y
	17	+ select X86_RESET_VECTOR
17	18	select CPU_INTEL_SOCKET_RPGA989
18	19	select NORTHBRIDGE_INTEL_IVYBRIDGE
19	20	select SOUTHBRIDGE_INTEL_C216
...	...	@@ -19,11 +19,9 @@
19	19	#define CONFIG_SYS_CAR_SIZE (128 * 1024)
20	20	#define CONFIG_SYS_MONITOR_LEN (1 << 20)
21	21	#define CONFIG_DCACHE_RAM_MRC_VAR_SIZE 0x4000
22		-#define CONFIG_SYS_X86_START16 0xfffff800
23	22	#define CONFIG_BOARD_EARLY_INIT_F
24	23	#define CONFIG_DISPLAY_CPUINFO
25	24
26		-#define CONFIG_X86_RESET_VECTOR
27	25	#define CONFIG_NR_DRAM_BANKS 8
28	26	#define CONFIG_X86_MRC_ADDR 0xfffa0000
29	27	#define CONFIG_CACHE_MRC_SIZE_KB 512
...	...	@@ -14,10 +14,8 @@
14	14	#include <configs/x86-common.h>
15	15
16	16	#define CONFIG_SYS_MONITOR_LEN (1 << 20)
17		-#define CONFIG_SYS_X86_START16 0xfffff800
18	17	#define CONFIG_BOARD_EARLY_INIT_F
19	18
20		-#define CONFIG_X86_RESET_VECTOR
21	19	#define CONFIG_NR_DRAM_BANKS 1
22	20
23	21	#define CONFIG_X86_SERIAL