Browse Source

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>
Simon Glass 12 years ago
parent
commit
588a13f742
4 changed files with 6 additions and 7 deletions
  1. 3 3
      README
  2. 2 2
      arch/x86/cpu/Makefile
  3. 1 1
      arch/x86/cpu/u-boot.lds
  4. 0 1
      include/configs/coreboot.h

+ 3 - 3
README

@@ -3816,9 +3816,9 @@ Low Level (hardware related) configuration options:
 		be used if available. These functions may be faster under some
 		be used if available. These functions may be faster under some
 		conditions but may increase the binary size.
 		conditions but may increase the binary size.
 
 
-- CONFIG_X86_NO_RESET_VECTOR
-		If defined, the x86 reset vector code is excluded. You will need
-		to do this when U-Boot is running from Coreboot.
+- CONFIG_X86_RESET_VECTOR
+		If defined, the x86 reset vector code is included. This is not
+		needed when U-Boot is running from Coreboot.
 
 
 - CONFIG_X86_NO_REAL_MODE
 - CONFIG_X86_NO_REAL_MODE
 		If defined, x86 real mode code is omitted. This assumes a
 		If defined, x86 real mode code is omitted. This assumes a

+ 2 - 2
arch/x86/cpu/Makefile

@@ -29,12 +29,12 @@ include $(TOPDIR)/config.mk
 LIB	= $(obj)lib$(CPU).o
 LIB	= $(obj)lib$(CPU).o
 
 
 START-y	= start.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
 COBJS	= interrupts.o cpu.o timer.o
 
 
 SRCS	:= $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c)
 SRCS	:= $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c)
 OBJS	:= $(addprefix $(obj),$(SOBJS) $(COBJS))
 OBJS	:= $(addprefix $(obj),$(SOBJS) $(COBJS))
-START	:= $(addprefix $(obj),$(START-y) $(RESET_OBJS-))
+START	:= $(addprefix $(obj),$(START-y))
 
 
 all:	$(obj).depend $(START) $(LIB)
 all:	$(obj).depend $(START) $(LIB)
 
 

+ 1 - 1
arch/x86/cpu/u-boot.lds

@@ -86,7 +86,7 @@ SECTIONS
 	__bios_start = LOADADDR(.bios);
 	__bios_start = LOADADDR(.bios);
 	__bios_size = SIZEOF(.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
 	 * The following expressions place the 16-bit Real-Mode code and

+ 0 - 1
include/configs/coreboot.h

@@ -37,7 +37,6 @@
 #define CONFIG_SYS_COREBOOT
 #define CONFIG_SYS_COREBOOT
 #define CONFIG_SHOW_BOOT_PROGRESS
 #define CONFIG_SHOW_BOOT_PROGRESS
 #define CONFIG_LAST_STAGE_INIT
 #define CONFIG_LAST_STAGE_INIT
-#define CONFIG_X86_NO_RESET_VECTOR
 #define CONFIG_SYS_VSNPRINTF
 #define CONFIG_SYS_VSNPRINTF
 #define CONFIG_INTEL_CORE_ARCH	/* Sandy bridge and ivy bridge chipsets. */
 #define CONFIG_INTEL_CORE_ARCH	/* Sandy bridge and ivy bridge chipsets. */
 #define CONFIG_ZBOOT_32
 #define CONFIG_ZBOOT_32