diff options
| author | Simon Glass <sjg@chromium.org> | 2013-02-14 04:18:54 +0000 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2013-02-14 20:18:58 -0800 |
| commit | 588a13f742b6d63ac7d5631af11baa01f3a9e80f (patch) | |
| tree | 1d1ed84ebb4e22f2e938d05071c412e7419f1ffb /arch | |
| parent | a32e626f92415290b7924930a7e3b80df6884090 (diff) | |
| download | talos-obmc-uboot-588a13f742b6d63ac7d5631af11baa01f3a9e80f.tar.gz talos-obmc-uboot-588a13f742b6d63ac7d5631af11baa01f3a9e80f.zip | |
x86: Rename CONFIG_NO_X86_RESET_VECTOR to CONFIG_X86_RESET_VECTOR
Invert the polarity of this option to simplify the Makefile logic.
Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Gabe Black <gabeblack@chromium.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/cpu/Makefile | 4 | ||||
| -rw-r--r-- | arch/x86/cpu/u-boot.lds | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/cpu/Makefile b/arch/x86/cpu/Makefile index 57324b6174..7b520f8dca 100644 --- a/arch/x86/cpu/Makefile +++ b/arch/x86/cpu/Makefile @@ -29,12 +29,12 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(CPU).o START-y = start.o -RESET_OBJS-$(CONFIG_X86_NO_RESET_VECTOR) += resetvec.o start16.o +START-$(CONFIG_X86_RESET_VECTOR) += resetvec.o start16.o COBJS = interrupts.o cpu.o timer.o SRCS := $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS)) -START := $(addprefix $(obj),$(START-y) $(RESET_OBJS-)) +START := $(addprefix $(obj),$(START-y)) all: $(obj).depend $(START) $(LIB) diff --git a/arch/x86/cpu/u-boot.lds b/arch/x86/cpu/u-boot.lds index 0c6f0e31d8..2313cd793a 100644 --- a/arch/x86/cpu/u-boot.lds +++ b/arch/x86/cpu/u-boot.lds @@ -86,7 +86,7 @@ SECTIONS __bios_start = LOADADDR(.bios); __bios_size = SIZEOF(.bios); -#ifndef CONFIG_X86_NO_RESET_VECTOR +#ifdef CONFIG_X86_RESET_VECTOR /* * The following expressions place the 16-bit Real-Mode code and |
