diff options
| author | Tom Rini <trini@konsulko.com> | 2019-10-12 10:52:48 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-10-12 10:52:48 -0400 |
| commit | 9189d6f1e9c4ae40a14558636ed7b59b53c4c885 (patch) | |
| tree | 88cf3ab7d7c967e2de9cdfd9cc9a3e8c99cb64c0 /arch/x86/cpu | |
| parent | 0c9cc5155cb5027ae17ace986f349e2f0d1fb9a3 (diff) | |
| parent | c443f56cc699f25feb4618791730d11a0eb6280a (diff) | |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-x86
- Remember the device being emulated for Sandbox PCI
- Update Kconfig options for FSP 1.0
- Drop RESET_BASE and RESET_SEG_SIZE that are no longer used
Diffstat (limited to 'arch/x86/cpu')
| -rw-r--r-- | arch/x86/cpu/config.mk | 2 | ||||
| -rw-r--r-- | arch/x86/cpu/resetvec.S | 3 |
2 files changed, 0 insertions, 5 deletions
diff --git a/arch/x86/cpu/config.mk b/arch/x86/cpu/config.mk index 22416f39b6..8f9814c0ae 100644 --- a/arch/x86/cpu/config.mk +++ b/arch/x86/cpu/config.mk @@ -7,10 +7,8 @@ CROSS_COMPILE ?= i386-linux- # DO NOT MODIFY THE FOLLOWING UNLESS YOU REALLY KNOW WHAT YOU ARE DOING! 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)" ifdef CONFIG_X86_64 ifndef CONFIG_SPL_BUILD diff --git a/arch/x86/cpu/resetvec.S b/arch/x86/cpu/resetvec.S index a52225d5ee..cf972738b3 100644 --- a/arch/x86/cpu/resetvec.S +++ b/arch/x86/cpu/resetvec.S @@ -16,6 +16,3 @@ reset_vector: cli cld jmp start16 - - .org 0xf - nop |