On Wed, May 15, 2013 at 10:15:28AM +0800, [email protected] wrote: > From: Ying Zhang <[email protected]> > > 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 > for environment in common/Makefile. > > Signed-off-by: Ying Zhang <[email protected]> [snip] > # 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
You need to move all of these options down so that adding them to SPL later, as needed, doesn't have further deltas, and to keep things organized still. > # command > COBJS-$(CONFIG_CMD_AMBAPP) += cmd_ambapp.o > @@ -215,18 +213,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 This CONFIG_ENV_IS_IN_FLASH is now duplicated and needs to be removed, when you move all of the other CONFIG_ENV_IS_... down to the always part of the Makefile. [snip] > diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h > index ef00306..f47d3d1 100644 > --- a/include/configs/am335x_evm.h > +++ b/include/configs/am335x_evm.h > @@ -325,6 +325,7 @@ > #define CONFIG_SPL_GPIO_SUPPORT > #define CONFIG_SPL_YMODEM_SUPPORT > #define CONFIG_SPL_NET_SUPPORT > +#define CONFIG_SPL_ENV_SUPPORT > #define CONFIG_SPL_NET_VCI_STRING "AM335x U-Boot SPL" > #define CONFIG_SPL_ETH_SUPPORT > #define CONFIG_SPL_SPI_SUPPORT > diff --git a/include/configs/pcm051.h b/include/configs/pcm051.h > index d0ea74e..926842f 100644 > --- a/include/configs/pcm051.h > +++ b/include/configs/pcm051.h > @@ -224,6 +224,7 @@ > #define CONFIG_SPL_GPIO_SUPPORT > #define CONFIG_SPL_YMODEM_SUPPORT > #define CONFIG_SPL_NET_SUPPORT > +#define CONFIG_SPL_ENV_SUPPORT > #define CONFIG_SPL_NET_VCI_STRING "pcm051 U-Boot SPL" > #define CONFIG_SPL_ETH_SUPPORT > #define CONFIG_SPL_SPI_SUPPORT Have you made sure these two boards still compile? I bet they don't as they aren't setting CONFIG_ENV_IS_NOWHERE for SPL and CONFIG_ENV_IS_...somewhere-else for non-SPL. -- Tom
signature.asc
Description: Digital signature
_______________________________________________ U-Boot mailing list [email protected] http://lists.denx.de/mailman/listinfo/u-boot
