| Message ID | 20211022134725.26004-13-kabel@kernel.org |
|---|---|
| State | Accepted |
| Commit | b26334824b58150e82a8b202380169a9276cd161 |
| Delegated to: | Simon Glass |
| Headers | show |
| Series | Some more env fixes | expand |
On Fri, 22 Oct 2021 at 07:47, Marek Behún <kabel@kernel.org> wrote: > > From: Marek Behún <marek.behun@nic.cz> > > Various freescale boards set gd->env_addr to default_environment in > board_init(), conditional on CONFIG_ENV_IS_NOWHERE, but this is > redundant, since it is done by env_init() before board_init() is called. > > Let the env subsystem handle this. > > Signed-off-by: Marek Behún <marek.behun@nic.cz> > Cc: Ramon Fried <rfried.dev@gmail.com> > Cc: Priyanka Jain <priyanka.jain@nxp.com> > Cc: Mian Yousaf Kaukab <ykaukab@suse.de> > --- > board/freescale/ls1012afrdm/ls1012afrdm.c | 4 ---- > board/freescale/ls1012aqds/ls1012aqds.c | 4 ---- > board/freescale/ls1012ardb/ls1012ardb.c | 4 ---- > board/freescale/ls1028a/ls1028a.c | 4 ---- > board/freescale/ls1088a/ls1088a.c | 4 ---- > board/freescale/ls2080aqds/ls2080aqds.c | 3 --- > board/freescale/ls2080ardb/ls2080ardb.c | 3 --- > board/freescale/lx2160a/lx2160a.c | 3 --- > 8 files changed, 29 deletions(-) Reviewed-by: Simon Glass <sjg@chromium.org>
On Fri, 22 Oct 2021 at 07:47, Marek Behún <kabel@kernel.org> wrote: > > From: Marek Behún <marek.behun@nic.cz> > > Various freescale boards set gd->env_addr to default_environment in > board_init(), conditional on CONFIG_ENV_IS_NOWHERE, but this is > redundant, since it is done by env_init() before board_init() is called. > > Let the env subsystem handle this. > > Signed-off-by: Marek Behún <marek.behun@nic.cz> > Cc: Ramon Fried <rfried.dev@gmail.com> > Cc: Priyanka Jain <priyanka.jain@nxp.com> > Cc: Mian Yousaf Kaukab <ykaukab@suse.de> > --- > board/freescale/ls1012afrdm/ls1012afrdm.c | 4 ---- > board/freescale/ls1012aqds/ls1012aqds.c | 4 ---- > board/freescale/ls1012ardb/ls1012ardb.c | 4 ---- > board/freescale/ls1028a/ls1028a.c | 4 ---- > board/freescale/ls1088a/ls1088a.c | 4 ---- > board/freescale/ls2080aqds/ls2080aqds.c | 3 --- > board/freescale/ls2080ardb/ls2080ardb.c | 3 --- > board/freescale/lx2160a/lx2160a.c | 3 --- > 8 files changed, 29 deletions(-) Reviewed-by: Simon Glass <sjg@chromium.org> Applied to u-boot-dm, thanks!
diff --git a/board/freescale/ls1012afrdm/ls1012afrdm.c b/board/freescale/ls1012afrdm/ls1012afrdm.c index 6473ee0572..5dd19cfcd9 100644 --- a/board/freescale/ls1012afrdm/ls1012afrdm.c +++ b/board/freescale/ls1012afrdm/ls1012afrdm.c @@ -172,10 +172,6 @@ int board_init(void) if (current_el() == 3) out_le32(&cci->ctrl_ord, CCI400_CTRLORD_EN_BARRIER); -#ifdef CONFIG_ENV_IS_NOWHERE - gd->env_addr = (ulong)&default_environment[0]; -#endif - #ifdef CONFIG_FSL_CAAM sec_init(); #endif diff --git a/board/freescale/ls1012aqds/ls1012aqds.c b/board/freescale/ls1012aqds/ls1012aqds.c index 6e21040601..68578e81a5 100644 --- a/board/freescale/ls1012aqds/ls1012aqds.c +++ b/board/freescale/ls1012aqds/ls1012aqds.c @@ -150,10 +150,6 @@ int board_init(void) erratum_a010315(); #endif -#ifdef CONFIG_ENV_IS_NOWHERE - gd->env_addr = (ulong)&default_environment[0]; -#endif - #ifdef CONFIG_FSL_CAAM sec_init(); #endif diff --git a/board/freescale/ls1012ardb/ls1012ardb.c b/board/freescale/ls1012ardb/ls1012ardb.c index 62e8af48cf..064fb4d39f 100644 --- a/board/freescale/ls1012ardb/ls1012ardb.c +++ b/board/freescale/ls1012ardb/ls1012ardb.c @@ -173,10 +173,6 @@ int board_init(void) erratum_a010315(); #endif -#ifdef CONFIG_ENV_IS_NOWHERE - gd->env_addr = (ulong)&default_environment[0]; -#endif - #ifdef CONFIG_FSL_CAAM sec_init(); #endif diff --git a/board/freescale/ls1028a/ls1028a.c b/board/freescale/ls1028a/ls1028a.c index 461c571b36..486a544d35 100644 --- a/board/freescale/ls1028a/ls1028a.c +++ b/board/freescale/ls1028a/ls1028a.c @@ -73,10 +73,6 @@ u32 get_lpuart_clk(void) int board_init(void) { -#ifdef CONFIG_ENV_IS_NOWHERE - gd->env_addr = (ulong)&default_environment[0]; -#endif - #ifdef CONFIG_FSL_CAAM sec_init(); #endif diff --git a/board/freescale/ls1088a/ls1088a.c b/board/freescale/ls1088a/ls1088a.c index 2f422634d5..7046fbaeb5 100644 --- a/board/freescale/ls1088a/ls1088a.c +++ b/board/freescale/ls1088a/ls1088a.c @@ -810,10 +810,6 @@ int board_init(void) select_i2c_ch_pca9547(I2C_MUX_CH_DEFAULT, 0); board_retimer_init(); -#ifdef CONFIG_ENV_IS_NOWHERE - gd->env_addr = (ulong)&default_environment[0]; -#endif - #if defined(CONFIG_TARGET_LS1088ARDB) && defined(CONFIG_FSL_MC_ENET) /* invert AQR105 IRQ pins polarity */ out_le32(irq_ccsr + IRQCR_OFFSET / 4, AQR105_IRQ_MASK); diff --git a/board/freescale/ls2080aqds/ls2080aqds.c b/board/freescale/ls2080aqds/ls2080aqds.c index 62658c4702..2f0139edef 100644 --- a/board/freescale/ls2080aqds/ls2080aqds.c +++ b/board/freescale/ls2080aqds/ls2080aqds.c @@ -211,9 +211,6 @@ int board_init(void) FSL_QIXIS_BRDCFG9_QSPI); #endif -#ifdef CONFIG_ENV_IS_NOWHERE - gd->env_addr = (ulong)&default_environment[0]; -#endif select_i2c_ch_pca9547(I2C_MUX_CH_DEFAULT, 0); #ifdef CONFIG_RTC_ENABLE_32KHZ_OUTPUT diff --git a/board/freescale/ls2080ardb/ls2080ardb.c b/board/freescale/ls2080ardb/ls2080ardb.c index 58b852383e..bf660a8e65 100644 --- a/board/freescale/ls2080ardb/ls2080ardb.c +++ b/board/freescale/ls2080ardb/ls2080ardb.c @@ -281,9 +281,6 @@ int board_init(void) init_final_memctl_regs(); -#ifdef CONFIG_ENV_IS_NOWHERE - gd->env_addr = (ulong)&default_environment[0]; -#endif select_i2c_ch_pca9547(I2C_MUX_CH_DEFAULT, 0); #ifdef CONFIG_FSL_QIXIS diff --git a/board/freescale/lx2160a/lx2160a.c b/board/freescale/lx2160a/lx2160a.c index e61289d228..bd5abb677a 100644 --- a/board/freescale/lx2160a/lx2160a.c +++ b/board/freescale/lx2160a/lx2160a.c @@ -588,9 +588,6 @@ int board_init(void) #if defined(CONFIG_FSL_MC_ENET) && defined(CONFIG_TARGET_LX2160ARDB) u32 __iomem *irq_ccsr = (u32 __iomem *)ISC_BASE; #endif -#ifdef CONFIG_ENV_IS_NOWHERE - gd->env_addr = (ulong)&default_environment[0]; -#endif select_i2c_ch_pca9547(I2C_MUX_CH_DEFAULT, 0);