Patchwork [U-Boot,v2,4/5] x86: Rename CONFIG_NO_X86_RESET_VECTOR to CONFIG_X86_RESET_VECTOR

login
register
mail settings
Submitter Simon Glass
Date Feb. 14, 2013, 2:18 p.m.
Message ID <1360851535-23805-5-git-send-email-sjg@chromium.org>
Download mbox | patch
Permalink /patch/220450/
State Accepted, archived
Delegated to: Simon Glass
Headers show

Comments

Simon Glass - Feb. 14, 2013, 2:18 p.m.
Invert the polarity of this option to simplify the Makefile logic.

Signed-off-by: Simon Glass <sjg@chromium.org>
---
Changes in v2:
- Add new patch to invert CONFIG_NO_X86_RESET_VECTOR polarity

 README                     | 6 +++---
 arch/x86/cpu/Makefile      | 4 ++--
 arch/x86/cpu/u-boot.lds    | 2 +-
 include/configs/coreboot.h | 1 -
 4 files changed, 6 insertions(+), 7 deletions(-)
Gabe Black - Feb. 15, 2013, 12:02 a.m.
Acked-by: Gabe Black <gabeblack@chromium.org>


On Thu, Feb 14, 2013 at 6:18 AM, Simon Glass <sjg@chromium.org> wrote:

> Invert the polarity of this option to simplify the Makefile logic.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> ---
> Changes in v2:
> - Add new patch to invert CONFIG_NO_X86_RESET_VECTOR polarity
>
>  README                     | 6 +++---
>  arch/x86/cpu/Makefile      | 4 ++--
>  arch/x86/cpu/u-boot.lds    | 2 +-
>  include/configs/coreboot.h | 1 -
>  4 files changed, 6 insertions(+), 7 deletions(-)
>
> diff --git a/README b/README
> index 2352e38..6106e0d 100644
> --- a/README
> +++ b/README
> @@ -3816,9 +3816,9 @@ Low Level (hardware related) configuration options:
>                 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 57324b6..7b520f8 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 0c6f0e3..2313cd7 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
> diff --git a/include/configs/coreboot.h b/include/configs/coreboot.h
> index d8aabd4..c7f36ff 100644
> --- a/include/configs/coreboot.h
> +++ b/include/configs/coreboot.h
> @@ -37,7 +37,6 @@
>  #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
> --
> 1.8.1
>
>
Simon Glass - Feb. 15, 2013, 4:37 a.m.
On Thu, Feb 14, 2013 at 4:02 PM, Gabe Black <gabeblack@google.com> wrote:
> Acked-by: Gabe Black <gabeblack@chromium.org>
>
>
> On Thu, Feb 14, 2013 at 6:18 AM, Simon Glass <sjg@chromium.org> wrote:
>>
>> Invert the polarity of this option to simplify the Makefile logic.
>>
>> Signed-off-by: Simon Glass <sjg@chromium.org>

Applied to x86/master.

>> ---
>> Changes in v2:
>> - Add new patch to invert CONFIG_NO_X86_RESET_VECTOR polarity
>>
>>  README                     | 6 +++---
>>  arch/x86/cpu/Makefile      | 4 ++--
>>  arch/x86/cpu/u-boot.lds    | 2 +-
>>  include/configs/coreboot.h | 1 -
>>  4 files changed, 6 insertions(+), 7 deletions(-)
>>

Patch

diff --git a/README b/README
index 2352e38..6106e0d 100644
--- a/README
+++ b/README
@@ -3816,9 +3816,9 @@  Low Level (hardware related) configuration options:
 		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 57324b6..7b520f8 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 0c6f0e3..2313cd7 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
diff --git a/include/configs/coreboot.h b/include/configs/coreboot.h
index d8aabd4..c7f36ff 100644
--- a/include/configs/coreboot.h
+++ b/include/configs/coreboot.h
@@ -37,7 +37,6 @@ 
 #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