diff options
| author | Gabe Black <gabeblack@chromium.org> | 2012-11-27 21:08:06 +0000 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2012-11-28 11:40:03 -0800 |
| commit | b16f521a5e87208cebbd17964452e11704416c3f (patch) | |
| tree | f3a37b94139b202e67fcebd905a91e2ff6eb07da /arch | |
| parent | 8a487a4417221412d1cd23d4e08253fc9413be51 (diff) | |
| download | talos-obmc-uboot-b16f521a5e87208cebbd17964452e11704416c3f.tar.gz talos-obmc-uboot-b16f521a5e87208cebbd17964452e11704416c3f.zip | |
x86: Allow excluding reset vector code from u-boot
When running from coreboot we don't want this code.
This version works by ifdef-ing out all of the code that would go
into those sections and all the code that refers to it. The sections are
then empty, and the linker will either leave them empty for the loader
to ignore or remove them entirely.
Signed-off-by: Gabe Black <gabeblack@chromium.org>
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/cpu/Makefile | 5 | ||||
| -rw-r--r-- | arch/x86/cpu/u-boot.lds | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/arch/x86/cpu/Makefile b/arch/x86/cpu/Makefile index 7f1fc188cb..be27dd9e2b 100644 --- a/arch/x86/cpu/Makefile +++ b/arch/x86/cpu/Makefile @@ -28,12 +28,13 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(CPU).o -START = start.o start16.o resetvec.o +START-y = start.o +RESET_OBJS-$(CONFIG_X86_NO_RESET_VECTOR) += resetvec.o start16.o COBJS = interrupts.o cpu.o SRCS := $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS)) -START := $(addprefix $(obj),$(START)) +START := $(addprefix $(obj),$(START-y) $(RESET_OBJS-)) all: $(obj).depend $(START) $(LIB) diff --git a/arch/x86/cpu/u-boot.lds b/arch/x86/cpu/u-boot.lds index a1ecefafc6..0c6f0e31d8 100644 --- a/arch/x86/cpu/u-boot.lds +++ b/arch/x86/cpu/u-boot.lds @@ -86,6 +86,8 @@ SECTIONS __bios_start = LOADADDR(.bios); __bios_size = SIZEOF(.bios); +#ifndef CONFIG_X86_NO_RESET_VECTOR + /* * The following expressions place the 16-bit Real-Mode code and * Reset Vector at the end of the Flash ROM @@ -95,4 +97,5 @@ SECTIONS . = RESET_VEC_LOC; .resetvec : AT (CONFIG_SYS_TEXT_BASE + (CONFIG_SYS_MONITOR_LEN - RESET_SEG_SIZE + RESET_VEC_LOC)) { KEEP(*(.resetvec)); } +#endif } |
