From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tom Rini Date: Tue, 14 May 2013 08:37:00 -0400 Subject: [U-Boot] [PATCH v2] common/Makefile: Add new symbol CONFIG_SPL_ENV_SUPPORT to replace CONFIG_SPL_NET_SUPPORT In-Reply-To: References: <1368428877-11723-1-git-send-email-ying.zhang@freescale.com> <20130513221232.GK29196@bill-the-cat> Message-ID: <20130514123700.GL29196@bill-the-cat> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On Tue, May 14, 2013 at 03:52:04AM +0000, Zhang Ying-B40530 wrote: > -----Original Message----- > From: Tom Rini [mailto:tom.rini at gmail.com] On Behalf Of Tom Rini > Sent: Tuesday, May 14, 2013 6:13 AM > To: Zhang Ying-B40530 > Cc: u-boot at lists.denx.de; Wood Scott-B07421; Xie Xiaobo-R63061; Zhang Ying-B40530 > Subject: Re: [U-Boot] [PATCH v2] common/Makefile: Add new symbol CONFIG_SPL_ENV_SUPPORT to replace CONFIG_SPL_NET_SUPPORT > > On Mon, May 13, 2013 at 03:07:57PM +0800, ying.zhang at freescale.com wrote: > > > From: Ying Zhang > > > > There will need the environment in SPL for reasons other than network > > support (in particular, hwconfig contains info for how to set up DDR). > > > > Add a new symbol CONFIG_SPL_ENV_SUPPORT to replace CONFIG_SPL_NET_SUPPORT in > > common/Makefile. > [snip] > > --- a/common/Makefile > > +++ b/common/Makefile > > @@ -44,7 +44,6 @@ COBJS-$(CONFIG_SYS_GENERIC_BOARD) += board_r.o > > COBJS-y += cmd_boot.o > > COBJS-$(CONFIG_CMD_BOOTM) += cmd_bootm.o > > COBJS-y += cmd_help.o > > -COBJS-y += cmd_nvedit.o > > COBJS-y += cmd_version.o > > > > # environment > > @@ -67,7 +66,6 @@ COBJS-$(CONFIG_ENV_IS_IN_ONENAND) += env_onenand.o > > COBJS-$(CONFIG_ENV_IS_IN_SPI_FLASH) += env_sf.o > > COBJS-$(CONFIG_ENV_IS_IN_REMOTE) += env_remote.o > > COBJS-$(CONFIG_ENV_IS_IN_UBI) += env_ubi.o > > -COBJS-$(CONFIG_ENV_IS_NOWHERE) += env_nowhere.o > > > > # command > > COBJS-$(CONFIG_CMD_AMBAPP) += cmd_ambapp.o > > @@ -214,18 +212,16 @@ COBJS-$(CONFIG_CMD_GPT) += cmd_gpt.o > > endif > > > > ifdef CONFIG_SPL_BUILD > > -COBJS-y += cmd_nvedit.o > > -COBJS-y += env_common.o > > COBJS-$(CONFIG_ENV_IS_IN_FLASH) += env_flash.o > > COBJS-$(CONFIG_SPL_YMODEM_SUPPORT) += xyzModem.o > > -COBJS-$(CONFIG_SPL_NET_SUPPORT) += cmd_nvedit.o > > -COBJS-$(CONFIG_SPL_NET_SUPPORT) += env_attr.o > > -COBJS-$(CONFIG_SPL_NET_SUPPORT) += env_callback.o > > -COBJS-$(CONFIG_SPL_NET_SUPPORT) += env_common.o > > -COBJS-$(CONFIG_SPL_NET_SUPPORT) += env_flags.o > > -COBJS-$(CONFIG_SPL_NET_SUPPORT) += env_nowhere.o > > COBJS-$(CONFIG_SPL_NET_SUPPORT) += miiphyutil.o > > +COBJS-$(CONFIG_SPL_ENV_SUPPORT) += env_common.o > > +COBJS-$(CONFIG_SPL_ENV_SUPPORT) += env_attr.o > > +COBJS-$(CONFIG_SPL_ENV_SUPPORT) += env_flags.o > > +COBJS-$(CONFIG_SPL_ENV_SUPPORT) += env_callback.o > > endif > > +COBJS-y += cmd_nvedit.o > > +COBJS-$(CONFIG_ENV_IS_NOWHERE) += env_nowhere.o > > COBJS-$(CONFIG_BOUNCE_BUFFER) += bouncebuf.o > > COBJS-y += console.o > > COBJS-y += dlmalloc.o > > Just move the whole CONFIG_ENV_IS_IN.. section down to where we always > build objects, and update the comments in the Makefile in both spots. > [Zhang Ying] > For common lines(for example: cmd_nvedit.o) that shared by the SPL and non-SPL, > can we move it to public area? So, we can avoid excessive SPL symbols. Right. Re-order things so we're duplicating as little as possible. There's already a bit of needless duplication going on here. > And a3m071 needs to be updated for CONFIG_SPL_ENV_SUPPORT too. Thanks! > [Zhang Ying] > In include/configs/a3m071.h, there was no CONFIG_SPL_NET_SUPPORT to be defined. > Are you sure to add CONFIG_SPL_ENV_SUPPORT for it? Yes, it uses the environment as part of CONFIG_SPL_OS support rather than CONFIG_SPL_NET_SUPPORT. -- Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: