cam_enc_4xx: Move CONFIG_SPL_PAD_TO to a config header
authorMasahiro Yamada <yamada.m@jp.panasonic.com>
Sun, 1 Sep 2013 06:04:27 +0000 (15:04 +0900)
committerTom Rini <trini@ti.com>
Fri, 6 Sep 2013 17:09:08 +0000 (13:09 -0400)
For most boards which define CONFIG_SPL_PAD_TO,
it is defined in config header files.
Currently, there exists only one exception, cam_enc_4xx board.

This patch moves CONFIG_SPL_PAD_TO definition
from board/ait/cam_enc_4xx/config.mk
to include/configs/cam_enc_4xx.h.

With this modification, we can delete a glue code
in the top level config.mk:

ifneq ($(CONFIG_SPL_PAD_TO),)
CPPFLAGS += -DCONFIG_SPL_PAD_TO=$(CONFIG_SPL_PAD_TO)
endif

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Heiko Schocher <hs@denx.de>
board/ait/cam_enc_4xx/config.mk
config.mk
include/configs/cam_enc_4xx.h

index c280029a36fee47c35aaa02f559457b746c1956e..d7e7894831d090d2f78de734c1f4a7c4eb1041e1 100644 (file)
@@ -7,8 +7,6 @@
 # (mem base + reserved)
 #
 
-#Provide at least 16MB spacing between us and the Linux Kernel image
-CONFIG_SPL_PAD_TO := 12320
 UBL_CONFIG = $(SRCTREE)/board/$(BOARDDIR)/ublimage.cfg
 ifndef CONFIG_SPL_BUILD
 ALL-y += $(obj)u-boot.ubl
index 5dfbad7d4b99f1e316fd1ad38c7dcd176b077173..b55ed563a5e0307edc26c5369cb74c4a424c8d27 100644 (file)
--- a/config.mk
+++ b/config.mk
@@ -232,10 +232,6 @@ ifneq ($(CONFIG_SYS_TEXT_BASE),)
 CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE)
 endif
 
-ifneq ($(CONFIG_SPL_PAD_TO),)
-CPPFLAGS += -DCONFIG_SPL_PAD_TO=$(CONFIG_SPL_PAD_TO)
-endif
-
 ifeq ($(CONFIG_SPL_BUILD),y)
 CPPFLAGS += -DCONFIG_SPL_BUILD
 ifeq ($(CONFIG_TPL_BUILD),y)
index ac7ed812d68b6cd3118948633f56e4c22a2a65fe..db9eb0f159fbd17dcb99676b4526fca24179d007 100644 (file)
 #define CONFIG_SPL_STACK               (0x00010000 + 0x7f00)
 
 #define CONFIG_SPL_TEXT_BASE           0x00000020 /*CONFIG_SYS_SRAM_START*/
+/* Provide at least 16MB spacing between us and the Linux Kernel image */
+#define CONFIG_SPL_PAD_TO              12320
 #define CONFIG_SPL_MAX_FOOTPRINT       12288
 
 #ifndef CONFIG_SPL_BUILD