summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a32e626)
raw | patch | inline | side by side (parent: a32e626)
author | Simon Glass <sjg@chromium.org> | |
Thu, 14 Feb 2013 04:18:54 +0000 (04:18 +0000) | ||
committer | Simon Glass <sjg@chromium.org> | |
Fri, 15 Feb 2013 04:18:58 +0000 (20:18 -0800) |
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>
Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Gabe Black <gabeblack@chromium.org>
README | patch | blob | history | |
arch/x86/cpu/Makefile | patch | blob | history | |
arch/x86/cpu/u-boot.lds | patch | blob | history | |
include/configs/coreboot.h | patch | blob | history |
index 2352e3862bfa81f4ad2bca262cc26529ac008fd7..6106e0d2aaec77ea3f36f613dde691e25f9f6bfa 100644 (file)
--- a/README
+++ b/README
be used if available. These functions may be faster under some
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
If defined, x86 real mode code is omitted. This assumes a
diff --git a/arch/x86/cpu/Makefile b/arch/x86/cpu/Makefile
index 57324b61749edbeb3fadfe045252d3fd7a8560a5..7b520f8dca165a8c7dcaea387cf6da5f97e6f535 100644 (file)
--- a/arch/x86/cpu/Makefile
+++ b/arch/x86/cpu/Makefile
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)
index 0c6f0e31d8365309f0c6e19bb5cb04a9a423fdee..2313cd793a281fc2a1ac57b0794e63b70de94665 100644 (file)
--- a/arch/x86/cpu/u-boot.lds
+++ b/arch/x86/cpu/u-boot.lds
__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
index d8aabd4cc8890166b931c569ca91fe8c71730b7c..c7f36ff148fe93fa25f3adbde6d5f82fa768cc5f 100644 (file)
#define CONFIG_SYS_COREBOOT
#define CONFIG_SHOW_BOOT_PROGRESS
#define CONFIG_LAST_STAGE_INIT
-#define CONFIG_X86_NO_RESET_VECTOR
#define CONFIG_SYS_VSNPRINTF
#define CONFIG_INTEL_CORE_ARCH /* Sandy bridge and ivy bridge chipsets. */
#define CONFIG_ZBOOT_32