| Message ID | BLU436-SMTP20809F760C6BA0D3F201CADBFB00@phx.gbl |
|---|---|
| State | Accepted |
| Delegated to: | Simon Glass |
| Headers | show |
On 6 June 2015 at 21:33, Bin Meng <bmeng.cn@gmail.com> wrote: > Add RESET_SEG_START, RESET_SEG_SIZE and RESET_VEC_LOC Kconfig options > and make arch/x86/cpu/config.mk use these options. > > Signed-off-by: Bin Meng <bmeng.cn@gmail.com> > Acked-by: Simon Glass <sjg@chromium.org> > Tested-by: Andrew Bradford <andrew.bradford@kodakalaris.com> > Tested-by: Simon Glass <sjg@chromium.org> > > --- > > Changes in v3: None > Changes in v2: > - New patch to add Kconfig options to be used by arch/x86/cpu/config.mk > > arch/x86/Kconfig | 15 +++++++++++++++ > arch/x86/cpu/config.mk | 6 +++--- > 2 files changed, 18 insertions(+), 3 deletions(-) I'd like to get this change in right away as I think it makes the FSP start-up much saner. Applied to u-boot-x86, thanks!
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 3506ba2..78996d0 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -75,6 +75,21 @@ config X86_RESET_VECTOR bool default n +config RESET_SEG_START + hex + depends on X86_RESET_VECTOR + default 0xffff0000 + +config RESET_SEG_SIZE + hex + depends on X86_RESET_VECTOR + default 0x10000 + +config RESET_VEC_LOC + hex + depends on X86_RESET_VECTOR + default 0xfffffff0 + config SYS_X86_START16 hex depends on X86_RESET_VECTOR diff --git a/arch/x86/cpu/config.mk b/arch/x86/cpu/config.mk index 4c4d0c7..1263221 100644 --- a/arch/x86/cpu/config.mk +++ b/arch/x86/cpu/config.mk @@ -10,8 +10,8 @@ CROSS_COMPILE ?= i386-linux- PLATFORM_CPPFLAGS += -D__I386__ # DO NOT MODIFY THE FOLLOWING UNLESS YOU REALLY KNOW WHAT YOU ARE DOING! -LDPPFLAGS += -DRESET_SEG_START=0xffff0000 -LDPPFLAGS += -DRESET_SEG_SIZE=0x10000 -LDPPFLAGS += -DRESET_VEC_LOC=0xfffffff0 +LDPPFLAGS += -DRESET_SEG_START=$(CONFIG_RESET_SEG_START) +LDPPFLAGS += -DRESET_SEG_SIZE=$(CONFIG_RESET_SEG_SIZE) +LDPPFLAGS += -DRESET_VEC_LOC=$(CONFIG_RESET_VEC_LOC) LDPPFLAGS += -DSTART_16=$(CONFIG_SYS_X86_START16) LDPPFLAGS += -DRESET_BASE="CONFIG_SYS_TEXT_BASE + (CONFIG_SYS_MONITOR_LEN - RESET_SEG_SIZE)"