[U-Boot] [PATCH] common/Makefile: Add new symbol CONFIG_SPL_ENV_SUPPORT to replace CONFIG_SPL_NET_SUPPORT
From: Ying Zhang b40530@freescale.com
Add a new symbol CONFIG_SPL_ENV_SUPPORT to replace CONFIG_SPL_NET_SUPPORT.
In common/Makefile, the environment-related files in SPL is difined by CONFIG_SPL_NET_SUPPORT, it is wrong.
Signed-off-by: Ying Zhang b40530@freescale.com --- common/Makefile | 12 +++++------- include/configs/am335x_evm.h | 1 + include/configs/pcm051.h | 1 + 3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/common/Makefile b/common/Makefile index 0e0fff1..1bd742a 100644 --- a/common/Makefile +++ b/common/Makefile @@ -215,15 +215,13 @@ 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_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 +COBJS-$(CONFIG_ENV_IS_NOWHERE) += env_nowhere.o COBJS-$(CONFIG_SPL_NET_SUPPORT) += miiphyutil.o endif COBJS-$(CONFIG_BOUNCE_BUFFER) += bouncebuf.o 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
Dear ying.zhang@freescale.com,
In message 1368182421-859-1-git-send-email-ying.zhang@freescale.com you wrote:
From: Ying Zhang b40530@freescale.com
Add a new symbol CONFIG_SPL_ENV_SUPPORT to replace CONFIG_SPL_NET_SUPPORT.
Any CONFIG_* stuff must be documented in the README. Please add this documentation.
In common/Makefile, the environment-related files in SPL is difined by CONFIG_SPL_NET_SUPPORT, it is wrong.
s/difined/defined/
Could you please also explain, what exactly is wrong, and how your new code fixes this?
--- 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
Are you sure these are the only locations that need this?
Best regards,
Wolfgang Denk
On 05/10/2013 07:03:07 PM, Wolfgang Denk wrote:
Dear ying.zhang@freescale.com,
In message 1368182421-859-1-git-send-email-ying.zhang@freescale.com you wrote:
From: Ying Zhang b40530@freescale.com
Add a new symbol CONFIG_SPL_ENV_SUPPORT to replace
CONFIG_SPL_NET_SUPPORT.
Any CONFIG_* stuff must be documented in the README. Please add this documentation.
In common/Makefile, the environment-related files in SPL is difined
by
CONFIG_SPL_NET_SUPPORT, it is wrong.
s/difined/defined/
Could you please also explain, what exactly is wrong, and how your new code fixes this?
We will need the environment in SPL for reasons other than network support (in particular, hwconfig contains info for how to set up DDR). Yes, this information should go in the changelog.
-Scott
-----Original Message----- From: Wood Scott-B07421 Sent: Saturday, May 11, 2013 8:29 AM To: Wolfgang Denk Cc: Zhang Ying-B40530; u-boot@lists.denx.de; Xie Xiaobo-R63061; Zhang Ying-B40530 Subject: Re: [U-Boot] [PATCH] common/Makefile: Add new symbol CONFIG_SPL_ENV_SUPPORT to replace CONFIG_SPL_NET_SUPPORT
On 05/10/2013 07:03:07 PM, Wolfgang Denk wrote:
Dear ying.zhang@freescale.com,
In message 1368182421-859-1-git-send-email-ying.zhang@freescale.com you wrote:
From: Ying Zhang b40530@freescale.com
Add a new symbol CONFIG_SPL_ENV_SUPPORT to replace
CONFIG_SPL_NET_SUPPORT.
Any CONFIG_* stuff must be documented in the README. Please add this documentation.
In common/Makefile, the environment-related files in SPL is difined
by
CONFIG_SPL_NET_SUPPORT, it is wrong.
s/difined/defined/
Could you please also explain, what exactly is wrong, and how your new code fixes this?
We will need the environment in SPL for reasons other than network support (in particular, hwconfig contains info for how to set up DDR). Yes, this information should go in the changelog. [Zhang Ying] OK, I will update this patch and CONFIG_SPL_ENV_SUPPORT will be added in README.
--- 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
Are you sure these are the only locations that need this? [Zhang Ying] I've searched for the symbol "CONFIG_SPL_NET_SUPPORT" all of the code, there is only the two files to define.
On Fri, May 10, 2013 at 07:28:46PM -0500, Scott Wood wrote:
On 05/10/2013 07:03:07 PM, Wolfgang Denk wrote:
Dear ying.zhang@freescale.com,
In message 1368182421-859-1-git-send-email-ying.zhang@freescale.com you wrote:
From: Ying Zhang b40530@freescale.com
Add a new symbol CONFIG_SPL_ENV_SUPPORT to replace
CONFIG_SPL_NET_SUPPORT.
Any CONFIG_* stuff must be documented in the README. Please add this documentation.
In common/Makefile, the environment-related files in SPL is
difined by
CONFIG_SPL_NET_SUPPORT, it is wrong.
s/difined/defined/
Could you please also explain, what exactly is wrong, and how your new code fixes this?
We will need the environment in SPL for reasons other than network support (in particular, hwconfig contains info for how to set up DDR). Yes, this information should go in the changelog.
Note that a3m071 already does SPL + Environment and should be updated, CONFIG-symbol wise here. It currently gets away with env_common/cmd_nvedit being pulled in always on LIBCOMMON and then discarded when not needed.
participants (5)
-
Scott Wood -
Tom Rini -
Wolfgang Denk -
ying.zhang＠freescale.com -
Zhang Ying-B40530