From: "Marek Behún" <kabel@kernel.org>
To: u-boot-board-maintainers@lists.denx.de,
u-boot-custodians@lists.denx.de, Tom Rini <trini@konsulko.com>,
Simon Glass <sjg@chromium.org>,
u-boot@lists.denx.de, Joe Hershberger <joe.hershberger@ni.com>,
Wolfgang Denk <wd@denx.de>
Cc: "Marek Behún" <marek.behun@nic.cz>,
"Ramon Fried" <rfried.dev@gmail.com>,
"Priyanka Jain" <priyanka.jain@nxp.com>,
"Mian Yousaf Kaukab" <ykaukab@suse.de>
Subject: [PATCH 12/14] board: freescale: various boards: Let env subsystem set gd->env_addr
Date: Fri, 22 Oct 2021 15:47:23 +0200 [thread overview]
Message-ID: <20211022134725.26004-13-kabel@kernel.org> (raw)
In-Reply-To: <20211022134725.26004-1-kabel@kernel.org>
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(-)
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);
--
2.32.0
next prev parent reply other threads:[~2021-10-22 13:50 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-22 13:47 [PATCH 00/14] Some more env fixes Marek Behún
2021-10-22 13:47 ` [PATCH 01/14] env: sf: Cosmetic fix in env_sf_init_addr() Marek Behún
2021-10-22 16:08 ` Simon Glass
2021-10-31 12:57 ` Simon Glass
2021-10-22 13:47 ` [PATCH 02/14] env: sf: Use ENV_VALID enum names instead of literals Marek Behún
2021-10-22 16:08 ` Simon Glass
2021-10-31 12:57 ` Simon Glass
2021-10-22 13:47 ` [PATCH 03/14] env: sf: Put ENV_INVALID into gd->env_valid on CRC failure Marek Behún
2021-10-22 16:08 ` Simon Glass
2021-10-22 13:47 ` [PATCH 04/14] env: nand: Put ENV_INVALID into gd->env_valid if default environment Marek Behún
2021-10-22 16:08 ` Simon Glass
2021-10-31 12:57 ` Simon Glass
2021-10-22 13:47 ` [PATCH 05/14] env: nvram: Let generic env_init() assign " Marek Behún
2021-10-22 16:08 ` Simon Glass
2021-10-31 12:57 ` Simon Glass
2021-10-22 13:47 ` [PATCH 06/14] env: nvram: Cosmetic fix in env_nvram_init() Marek Behún
2021-10-22 16:08 ` Simon Glass
2021-10-31 12:57 ` Simon Glass
2021-10-22 13:47 ` [PATCH 07/14] env: nowhere: Let generic env_init() assign default environment Marek Behún
2021-10-22 16:08 ` Simon Glass
2021-10-31 12:57 ` Simon Glass
2021-10-22 13:47 ` [PATCH 08/14] env: nowhere: Cosmetic fix Marek Behún
2021-10-22 16:08 ` Simon Glass
2021-10-31 12:57 ` Simon Glass
2021-10-22 13:47 ` [PATCH 09/14] env: flash: Let generic env_init() assign default environment Marek Behún
2021-10-22 16:08 ` Simon Glass
2021-10-22 13:47 ` [PATCH 10/14] env: flash: Cosmetic fix Marek Behún
2021-10-22 16:08 ` Simon Glass
2021-10-31 12:57 ` Simon Glass
2021-10-22 13:47 ` [PATCH 11/14] board: synquacer: developerbox: Don't set gd->env_addr to default_environment Marek Behún
2021-10-22 16:08 ` Simon Glass
2021-10-31 12:57 ` Simon Glass
2021-11-17 4:58 ` Masami Hiramatsu
2021-11-17 20:36 ` Simon Glass
2021-11-18 5:40 ` Masami Hiramatsu
2021-11-18 5:45 ` [PATCH] Revert "board: synquacer: developerbox: Don't set gd->env_addr to default_environment" Masami Hiramatsu
2021-11-18 13:42 ` Marek Behún
2021-11-18 23:27 ` Tom Rini
2021-10-22 13:47 ` Marek Behún [this message]
2021-10-22 16:08 ` [PATCH 12/14] board: freescale: various boards: Let env subsystem set gd->env_addr Simon Glass
2021-10-31 12:56 ` Simon Glass
2021-10-22 13:47 ` [PATCH 13/14] env: Always use char for default_environment Marek Behún
2021-10-22 16:08 ` Simon Glass
2021-10-31 12:56 ` Simon Glass
2021-10-22 13:47 ` [PATCH 14/14] env: Use static_assert() to check if default_environment is too large Marek Behún
2021-10-22 16:08 ` Simon Glass
2021-10-31 12:56 ` Simon Glass
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211022134725.26004-13-kabel@kernel.org \
--to=kabel@kernel.org \
--cc=joe.hershberger@ni.com \
--cc=marek.behun@nic.cz \
--cc=priyanka.jain@nxp.com \
--cc=rfried.dev@gmail.com \
--cc=sjg@chromium.org \
--cc=trini@konsulko.com \
--cc=u-boot-board-maintainers@lists.denx.de \
--cc=u-boot-custodians@lists.denx.de \
--cc=u-boot@lists.denx.de \
--cc=wd@denx.de \
--cc=ykaukab@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.