| Message ID | 1461646303-19435-1-git-send-email-Qianyu.Gong@nxp.com |
|---|---|
| State | Accepted |
| Commit | ec93abe6f722e6e0103f96ee01bcd376e246f111 |
| Delegated to: | York Sun |
| Headers | show |
On 04/25/2016 10:01 PM, Gong Qianyu wrote: > gd->env_addr will be initialized in env_init() in > common/env_nowhere.c if CONFIG_ENV_IS_NOWHERE is defined. > So no need to do it again. > > Signed-off-by: Gong Qianyu <Qianyu.Gong@nxp.com> > --- > board/freescale/ls1043aqds/ls1043aqds.c | 4 ---- > board/freescale/ls1043ardb/ls1043ardb.c | 5 ----- > 2 files changed, 9 deletions(-) > Applied to u-boot-fsl-qoriq master, awaiting upstream. Thanks. York
diff --git a/board/freescale/ls1043aqds/ls1043aqds.c b/board/freescale/ls1043aqds/ls1043aqds.c index fba6b88..a59b8f4 100644 --- a/board/freescale/ls1043aqds/ls1043aqds.c +++ b/board/freescale/ls1043aqds/ls1043aqds.c @@ -325,10 +325,6 @@ int board_init(void) #ifdef CONFIG_LAYERSCAPE_NS_ACCESS enable_layerscape_ns_access(); #endif - -#ifdef CONFIG_ENV_IS_NOWHERE - gd->env_addr = (ulong)&default_environment[0]; -#endif return 0; } diff --git a/board/freescale/ls1043ardb/ls1043ardb.c b/board/freescale/ls1043ardb/ls1043ardb.c index ec5fdbf..f1d4c39 100644 --- a/board/freescale/ls1043ardb/ls1043ardb.c +++ b/board/freescale/ls1043ardb/ls1043ardb.c @@ -19,7 +19,6 @@ #include <fsl_csu.h> #include <fsl_esdhc.h> #include <fsl_ifc.h> -#include <environment.h> #include <fsl_sec.h> #include "cpld.h" #ifdef CONFIG_U_QE @@ -95,10 +94,6 @@ int board_init(void) init_final_memctl_regs(); #endif -#ifdef CONFIG_ENV_IS_NOWHERE - gd->env_addr = (ulong)&default_environment[0]; -#endif - #ifdef CONFIG_LAYERSCAPE_NS_ACCESS enable_layerscape_ns_access(); #endif
gd->env_addr will be initialized in env_init() in common/env_nowhere.c if CONFIG_ENV_IS_NOWHERE is defined. So no need to do it again. Signed-off-by: Gong Qianyu <Qianyu.Gong@nxp.com> --- board/freescale/ls1043aqds/ls1043aqds.c | 4 ---- board/freescale/ls1043ardb/ls1043ardb.c | 5 ----- 2 files changed, 9 deletions(-)