Skip to contentSkip to conversation

config.mk: Delete unnecessary code

PATCH New Masahiro Yamada 2 participants 4 messages Jul 31, 2013 – Sep 1, 2013

lore
Share & tools
lore

Masahiro Yamada

author
#0 lore raw

PATCH 1/1 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 <[email protected]>
---
 config.mk | 12 ------------
 1 file changed, 12 deletions(-)
config.mk +0 -12
index b16fad8..240b6df 100644
@@ -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
Signature · 1 line
1.8.1.2
author
#1 lore raw

PATCH 1/1 config.mk: Delete unnecessary code

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

Quoted 51 lines · On Wed, 31 Jul 2013 13:16:11 +0900 Masahiro Yamada <[email protected]>…

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 <[email protected]>
---
 config.mk | 12 ------------
 1 file changed, 12 deletions(-)
config.mk +0 -12
index b16fad8..240b6df 100644
@@ -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
Signature · 1 line
1.8.1.2
#2 lore raw

PATCH 1/1 config.mk: Delete unnecessary code

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Quoted 6 lines · Masahiro Yamada

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.)

Quoted 6 lines

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
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iQIcBAEBAgAGBQJSIQoNAAoJENk4IS6UOR1W7UoP/R6Mywm9L5vBv3KRlbJNKtSI N8/xZ4KyrrQ8qocnw6iEAX2y1YFGTLZ7zpunuwoZwZr/R/RLGaVbgcXobuEu977X /WI+5gUY1W8mlA0YyjRqf2f1ILZqkYmbWIBMrym6aArbqWpeEZ8+tkFYvBmq7GmJ Cok3cCV/t0wJ8wCFCyg2K+s627OMR01ReLrVKM4LsoRLF3MUdx3aPIGUdDBQEdi/ UubHk0vjW8BA/Mte7aFzm8CVuPfBtGom9i30p5xUw/M74+b+moJyPkWX/xM+V+8N dvY2zS5nYU1vxqbwlpQRouPEB8z8XcRIawayYWWUI3HPxS4iBkEzrSM6jiPCspSR I9HKxoiYUN1H/rh/Gw9z45vondlCSSxOj99EraP8pnjbEAoZnSqDceftXtmZN4NW scxEKYE20Cv7C8kuVnN5jtiksYypLJEoQM5TBImSijc2zPA9zEOHQiT35Q3RSAAh hjw6X8WrFpLpLIidfIqlGWghrwxm7QB1UrvYSjnVmzjd+/sYwszYYSQbR/aAw52w ib+d6qWLr8sfX6naT3bXD6BV2QBrnpUGTV+OvygE6cgmozg6Cu5roOQyr41E/2s9 oAstyv5FoI5zd6UO050VHqns06sXZTJ2Og8TQ9scThElYT7JPFPQABLcKc6DBian arXgTZrKOdIW0YoPkOCe
=32gD
-----END PGP SIGNATURE-----

author
#3 lore raw

PATCH 1/1 config.mk: Delete unnecessary code

Hello, Tom.

Quoted 3 lines

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