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>
This commit is contained in:
Bin Meng 2015-01-06 22:14:15 +08:00 committed by Simon Glass
parent 3ba6a0f4f6
commit 8cb20ccc34
5 changed files with 11 additions and 4 deletions

View file

@ -66,6 +66,15 @@ config SMM_TSEG
config SMM_TSEG_SIZE config SMM_TSEG_SIZE
hex 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 config BOARD_ROMSIZE_KB_512
bool bool
config BOARD_ROMSIZE_KB_1024 config BOARD_ROMSIZE_KB_1024

View file

@ -14,6 +14,7 @@ config SYS_CONFIG_NAME
config BOARD_SPECIFIC_OPTIONS # dummy config BOARD_SPECIFIC_OPTIONS # dummy
def_bool y def_bool y
select X86_RESET_VECTOR
select CPU_INTEL_SOCKET_RPGA989 select CPU_INTEL_SOCKET_RPGA989
select NORTHBRIDGE_INTEL_IVYBRIDGE select NORTHBRIDGE_INTEL_IVYBRIDGE
select SOUTHBRIDGE_INTEL_C216 select SOUTHBRIDGE_INTEL_C216

View file

@ -14,6 +14,7 @@ config SYS_CONFIG_NAME
config BOARD_SPECIFIC_OPTIONS # dummy config BOARD_SPECIFIC_OPTIONS # dummy
def_bool y def_bool y
select X86_RESET_VECTOR
select INTEL_QUEENSBAY select INTEL_QUEENSBAY
select BOARD_ROMSIZE_KB_1024 select BOARD_ROMSIZE_KB_1024

View file

@ -19,11 +19,9 @@
#define CONFIG_SYS_CAR_SIZE (128 * 1024) #define CONFIG_SYS_CAR_SIZE (128 * 1024)
#define CONFIG_SYS_MONITOR_LEN (1 << 20) #define CONFIG_SYS_MONITOR_LEN (1 << 20)
#define CONFIG_DCACHE_RAM_MRC_VAR_SIZE 0x4000 #define CONFIG_DCACHE_RAM_MRC_VAR_SIZE 0x4000
#define CONFIG_SYS_X86_START16 0xfffff800
#define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_CPUINFO
#define CONFIG_X86_RESET_VECTOR
#define CONFIG_NR_DRAM_BANKS 8 #define CONFIG_NR_DRAM_BANKS 8
#define CONFIG_X86_MRC_ADDR 0xfffa0000 #define CONFIG_X86_MRC_ADDR 0xfffa0000
#define CONFIG_CACHE_MRC_SIZE_KB 512 #define CONFIG_CACHE_MRC_SIZE_KB 512

View file

@ -14,10 +14,8 @@
#include <configs/x86-common.h> #include <configs/x86-common.h>
#define CONFIG_SYS_MONITOR_LEN (1 << 20) #define CONFIG_SYS_MONITOR_LEN (1 << 20)
#define CONFIG_SYS_X86_START16 0xfffff800
#define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_X86_RESET_VECTOR
#define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_NR_DRAM_BANKS 1
#define CONFIG_X86_SERIAL #define CONFIG_X86_SERIAL