[U-Boot] [PATCH] config.mk: Delete unnecessary code
Currently no makefiles set the following variables:
CONFIG_SPL_TEXT_BASE CONFIG_UBOOT_PAD_TO CONFIG_RESET_VECTOR_ADDRESS
For all targets which use above macros they are set in header files (include/configs/*.h), so we do not need to set them as CPPFLAGS.
Signed-off-by: Masahiro Yamada yamada.m@jp.panasonic.com --- config.mk | 12 ------------ 1 file changed, 12 deletions(-)
diff --git a/config.mk b/config.mk index b16fad8..240b6df 100644 --- a/config.mk +++ b/config.mk @@ -206,18 +206,10 @@ ifneq ($(CONFIG_SYS_TEXT_BASE),) CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) endif
-ifneq ($(CONFIG_SPL_TEXT_BASE),) -CPPFLAGS += -DCONFIG_SPL_TEXT_BASE=$(CONFIG_SPL_TEXT_BASE) -endif - ifneq ($(CONFIG_SPL_PAD_TO),) CPPFLAGS += -DCONFIG_SPL_PAD_TO=$(CONFIG_SPL_PAD_TO) endif
-ifneq ($(CONFIG_UBOOT_PAD_TO),) -CPPFLAGS += -DCONFIG_UBOOT_PAD_TO=$(CONFIG_UBOOT_PAD_TO) -endif - ifeq ($(CONFIG_SPL_BUILD),y) CPPFLAGS += -DCONFIG_SPL_BUILD endif @@ -230,10 +222,6 @@ Please undefined CONFIG_SYS_GENERIC_BOARD in your board config file) endif endif
-ifneq ($(RESET_VECTOR_ADDRESS),) -CPPFLAGS += -DRESET_VECTOR_ADDRESS=$(RESET_VECTOR_ADDRESS) -endif - ifneq ($(OBJTREE),$(SRCTREE)) CPPFLAGS += -I$(OBJTREE)/include2 -I$(OBJTREE)/include endif
Hello, Tom.
I noticed this patch does not apply to the current u-boot/master because commit 3aa29de0 modified the same part. (BTW, I think CONFIG_TPL_PAD_TO is not necessary either and should be deleted.)
Should I need to post version 2 which is rebased on the current master? (if my patch deserves that, of course.)
Or are you going to resolve the conflict?
The conflict dons not seem so comprecated.
Best Regards Masahiro Yamada
On Wed, 31 Jul 2013 13:16:11 +0900 Masahiro Yamada yamada.m@jp.panasonic.com wrote:
Currently no makefiles set the following variables:
CONFIG_SPL_TEXT_BASE CONFIG_UBOOT_PAD_TO CONFIG_RESET_VECTOR_ADDRESS
For all targets which use above macros they are set in header files (include/configs/*.h), so we do not need to set them as CPPFLAGS.
Signed-off-by: Masahiro Yamada yamada.m@jp.panasonic.com
config.mk | 12 ------------ 1 file changed, 12 deletions(-)
diff --git a/config.mk b/config.mk index b16fad8..240b6df 100644 --- a/config.mk +++ b/config.mk @@ -206,18 +206,10 @@ ifneq ($(CONFIG_SYS_TEXT_BASE),) CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) endif
-ifneq ($(CONFIG_SPL_TEXT_BASE),) -CPPFLAGS += -DCONFIG_SPL_TEXT_BASE=$(CONFIG_SPL_TEXT_BASE) -endif
ifneq ($(CONFIG_SPL_PAD_TO),) CPPFLAGS += -DCONFIG_SPL_PAD_TO=$(CONFIG_SPL_PAD_TO) endif
-ifneq ($(CONFIG_UBOOT_PAD_TO),) -CPPFLAGS += -DCONFIG_UBOOT_PAD_TO=$(CONFIG_UBOOT_PAD_TO) -endif
ifeq ($(CONFIG_SPL_BUILD),y) CPPFLAGS += -DCONFIG_SPL_BUILD endif @@ -230,10 +222,6 @@ Please undefined CONFIG_SYS_GENERIC_BOARD in your board config file) endif endif
-ifneq ($(RESET_VECTOR_ADDRESS),) -CPPFLAGS += -DRESET_VECTOR_ADDRESS=$(RESET_VECTOR_ADDRESS) -endif
ifneq ($(OBJTREE),$(SRCTREE)) CPPFLAGS += -I$(OBJTREE)/include2 -I$(OBJTREE)/include endif -- 1.8.1.2
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1
On 08/28/2013 02:19 AM, Masahiro Yamada wrote:
Hello, Tom.
I noticed this patch does not apply to the current u-boot/master because commit 3aa29de0 modified the same part. (BTW, I think CONFIG_TPL_PAD_TO is not necessary either and should be deleted.)
Should I need to post version 2 which is rebased on the current master? (if my patch deserves that, of course.)
Or are you going to resolve the conflict?
The conflict dons not seem so comprecated.
I could fix it up, but yes, if you can submit a v2 that would make life easier. Thanks! And you can whack CONFIG_TPL_PAD_TO if not needed really while at it.
- -- Tom
Hello, Tom.
I could fix it up, but yes, if you can submit a v2 that would make life easier. Thanks! And you can whack CONFIG_TPL_PAD_TO if not needed really while at it.
I posted v2 which also whacks CONFIG_TPL_PAD_TO.
I wanted to refactor CONFIG_SPL_PAD_TO too, so patches were sent as series.
Best Regards, Masahiro
participants (2)
-
Masahiro Yamada -
Tom Rini