| Message ID | 1369030048-26130-4-git-send-email-ying.zhang@freescale.com |
|---|---|
| State | Accepted |
| Delegated to: | Andy Fleming |
| Headers | show |
On Mon, May 20, 2013 at 02:07:26PM +0800, ying.zhang@freescale.com wrote: > From: Ying Zhang <b40530@freescale.com> > > 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> Provided that you've at least build-tested MAKEALL -a arm: Acked-by: Tom Rini <trini@ti.com>
Hi, Tom, this patch has not merged to upstream? -----Original Message----- From: Tom Rini [mailto:tom.rini@gmail.com] On Behalf Of Tom Rini Sent: Saturday, May 25, 2013 12:05 AM To: Zhang Ying-B40530 Cc: u-boot@lists.denx.de; Wood Scott-B07421; afleming@gmail.com; Xie Xiaobo-R63061; Zhang Ying-B40530 Subject: Re: [U-Boot] [PATCH 4/6] Makefile: move the common makefile line to public area On Mon, May 20, 2013 at 02:07:26PM +0800, ying.zhang@freescale.com wrote: > From: Ying Zhang <b40530@freescale.com> > > 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> Provided that you've at least build-tested MAKEALL -a arm: Acked-by: Tom Rini <trini@ti.com> -- Tom
On Thu, Jun 06, 2013 at 08:51:34AM +0000, Zhang Ying-B40530 wrote: > Hi, Tom, > this patch has not merged to upstream? I assume that, so long as ARM has been build tested, it will come via one of the powerpc trees along with the rest of the series.
On Mon, May 20, 2013 at 02:07:26PM +0800, ying.zhang@freescale.com wrote: > From: Ying Zhang <b40530@freescale.com> > > 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> Applied, thanks! Andy
diff --git a/common/Makefile b/common/Makefile index 26b8495..0d72da5 100644 --- a/common/Makefile +++ b/common/Makefile @@ -188,14 +188,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 @@ -234,6 +226,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 diff --git a/lib/Makefile b/lib/Makefile index 8f81862..dad057f 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -26,7 +26,6 @@ include $(TOPDIR)/config.mk LIB = $(obj)libgeneric.o ifndef CONFIG_SPL_BUILD -COBJS-$(CONFIG_ADDR_MAP) += addr_map.o COBJS-$(CONFIG_AES) += aes.o COBJS-$(CONFIG_BZIP2) += bzlib.o COBJS-$(CONFIG_BZIP2) += bzlib_crctable.o @@ -36,13 +35,10 @@ COBJS-$(CONFIG_BZIP2) += bzlib_huffman.o COBJS-$(CONFIG_USB_TTY) += circbuf.o COBJS-y += crc7.o COBJS-y += crc16.o -COBJS-y += display_options.o -COBJS-y += errno.o COBJS-$(CONFIG_OF_CONTROL) += fdtdec.o COBJS-$(CONFIG_TEST_FDTDEC) += fdtdec_test.o COBJS-$(CONFIG_GZIP) += gunzip.o COBJS-$(CONFIG_GZIP_COMPRESSED) += gzip.o -COBJS-y += hashtable.o COBJS-y += initcall.o COBJS-$(CONFIG_LMB) += lmb.o COBJS-y += ldiv.o @@ -59,14 +55,12 @@ endif ifdef CONFIG_SPL_BUILD COBJS-$(CONFIG_SPL_YMODEM_SUPPORT) += crc16.o -COBJS-$(CONFIG_SPL_NET_SUPPORT) += crc32.o -ifneq ($(CONFIG_SPL_SPI_FLASH_SUPPORT)$(CONFIG_SPL_NET_SUPPORT),) -COBJS-y += display_options.o -endif -COBJS-$(CONFIG_SPL_NET_SUPPORT) += errno.o -COBJS-$(CONFIG_SPL_NET_SUPPORT) += hashtable.o COBJS-$(CONFIG_SPL_NET_SUPPORT) += net_utils.o endif +COBJS-$(CONFIG_ADDR_MAP) += addr_map.o +COBJS-y += hashtable.o +COBJS-y += errno.o +COBJS-y += display_options.o COBJS-$(CONFIG_BCH) += bch.o COBJS-y += crc32.o COBJS-y += ctype.o