summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorYing Zhang <b40530@freescale.com>2013-05-20 06:07:26 (GMT)
committerAndy Fleming <afleming@freescale.com>2013-06-20 22:08:51 (GMT)
commitf90572d91bfca3cfa1cdf5b5728bddd63e9bed55 (patch)
tree78f8caa4b07c24b5ca8696d7d0826bc9e01e2fbe /common
parentba1bee43ec3fd314e3216cecdafd45747e46e223 (diff)
downloadu-boot-f90572d91bfca3cfa1cdf5b5728bddd63e9bed55.tar.xz
Makefile: move the common makefile line to public area
Move the common makefile line shared by the SPL and non-SPL to the public area, so that we can avoid excessive SPL symbols. Some of them will be used by the SPL later. This patch is on top of the patch "common/Makefile: Add new symbol CONFIG_SPL_ENV_SUPPORT for environment in SPL". Signed-off-by: Ying Zhang <b40530@freescale.com> Acked-by: Tom Rini <trini@ti.com> Acked-by: Tom Rini <trini@ti.com> Signed-off-by: Andy Fleming <afleming@freescale.com>
Diffstat (limited to 'common')
-rw-r--r--common/Makefile17
1 files changed, 9 insertions, 8 deletions
diff --git a/common/Makefile b/common/Makefile
index 6c44a23..3581603 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -189,14 +189,6 @@ COBJS-$(CONFIG_CMD_ZIP) += cmd_zip.o
COBJS-$(CONFIG_CMD_ZFS) += cmd_zfs.o
# others
-ifdef CONFIG_DDR_SPD
-SPD := y
-endif
-ifdef CONFIG_SPD_EEPROM
-SPD := y
-endif
-COBJS-$(SPD) += ddr_spd.o
-COBJS-$(CONFIG_HWCONFIG) += hwconfig.o
COBJS-$(CONFIG_BOOTSTAGE) += bootstage.o
COBJS-$(CONFIG_CONSOLE_MUX) += iomux.o
COBJS-y += flash.o
@@ -235,6 +227,15 @@ endif
COBJS-y += cmd_nvedit.o
#environment
COBJS-y += env_common.o
+#others
+ifdef CONFIG_DDR_SPD
+SPD := y
+endif
+ifdef CONFIG_SPD_EEPROM
+SPD := y
+endif
+COBJS-$(SPD) += ddr_spd.o
+COBJS-$(CONFIG_HWCONFIG) += hwconfig.o
COBJS-$(CONFIG_BOUNCE_BUFFER) += bouncebuf.o
COBJS-y += console.o
COBJS-y += dlmalloc.o