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 /Makefile | |
parent | 8a487a4417221412d1cd23d4e08253fc9413be51 (diff) | |
download | u-boot-imx-b16f521a5e87208cebbd17964452e11704416c3f.zip u-boot-imx-b16f521a5e87208cebbd17964452e11704416c3f.tar.gz u-boot-imx-b16f521a5e87208cebbd17964452e11704416c3f.tar.bz2 |
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 'Makefile')
-rw-r--r-- | Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -231,8 +231,8 @@ endif OBJS = $(CPUDIR)/start.o ifeq ($(CPU),x86) -OBJS += $(CPUDIR)/start16.o -OBJS += $(CPUDIR)/resetvec.o +RESET_OBJS-$(CONFIG_X86_NO_RESET_VECTOR) += $(CPUDIR)/start16.o +RESET_OBJS-$(CONFIG_X86_NO_RESET_VECTOR) += $(CPUDIR)/resetvec.o endif ifeq ($(CPU),ppc4xx) OBJS += $(CPUDIR)/resetvec.o @@ -241,7 +241,7 @@ ifeq ($(CPU),mpc85xx) OBJS += $(CPUDIR)/resetvec.o endif -OBJS := $(addprefix $(obj),$(OBJS)) +OBJS := $(addprefix $(obj),$(OBJS) $(RESET_OBJS-)) HAVE_VENDOR_COMMON_LIB = $(if $(wildcard board/$(VENDOR)/common/Makefile),y,n) |