diff mbox series

[1/2] mpc83xx: Remove stale CONFIG_SYS_LBLAWBAR{4/5/6/7}_PRELIM

Message ID c3f7e4a13f4d9ba00f46b9d15c8b43dac4cba09c.1678832669.git.christophe.leroy@csgroup.eu
State Accepted
Commit 9695a7cde620247ac7b36a6076cdd735f421edc0
Delegated to: Tom Rini
Headers show
Series [1/2] mpc83xx: Remove stale CONFIG_SYS_LBLAWBAR{4/5/6/7}_PRELIM | expand

Commit Message

Christophe Leroy March 14, 2023, 10:24 p.m. UTC 
Last (incorrect) use of those CONFIG items was removed by
commit 9fd9abedcc ("TQM834x: remove defines causing gcc4.4 warnings")

Those items are invalid and should have been removed at the
same time because lblaw[] has only 4 elements.

And they were removed from the whitelist by
commit 9c5df7a2a9 ("mpc83xx: Migrate LBLAW_* to Kconfig")

Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Fixes: 9fd9abedcc ("TQM834x: remove defines causing gcc4.4 warnings")
---
 arch/powerpc/cpu/mpc83xx/cpu_init.c | 16 ----------------
 1 file changed, 16 deletions(-)

Comments

Tom Rini March 30, 2023, 1:54 a.m. UTC | #1 
On Tue, Mar 14, 2023 at 11:24:44PM +0100, Christophe Leroy wrote:

> Last (incorrect) use of those CONFIG items was removed by
> commit 9fd9abedcc ("TQM834x: remove defines causing gcc4.4 warnings")
> 
> Those items are invalid and should have been removed at the
> same time because lblaw[] has only 4 elements.
> 
> And they were removed from the whitelist by
> commit 9c5df7a2a9 ("mpc83xx: Migrate LBLAW_* to Kconfig")
> 
> Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
> Fixes: 9fd9abedcc ("TQM834x: remove defines causing gcc4.4 warnings")

Applied to u-boot/next, thanks!
diff mbox series

Patch

diff --git a/arch/powerpc/cpu/mpc83xx/cpu_init.c b/arch/powerpc/cpu/mpc83xx/cpu_init.c
index 2af5c89ae5..14df59bb8e 100644
--- a/arch/powerpc/cpu/mpc83xx/cpu_init.c
+++ b/arch/powerpc/cpu/mpc83xx/cpu_init.c
@@ -227,22 +227,6 @@  void cpu_init_f (volatile immap_t * im)
 	im->sysconf.lblaw[3].bar = CFG_SYS_LBLAWBAR3_PRELIM;
 	im->sysconf.lblaw[3].ar = CFG_SYS_LBLAWAR3_PRELIM;
 #endif
-#if defined(CONFIG_SYS_LBLAWBAR4_PRELIM) && defined(CONFIG_SYS_LBLAWAR4_PRELIM)
-	im->sysconf.lblaw[4].bar = CONFIG_SYS_LBLAWBAR4_PRELIM;
-	im->sysconf.lblaw[4].ar = CONFIG_SYS_LBLAWAR4_PRELIM;
-#endif
-#if defined(CONFIG_SYS_LBLAWBAR5_PRELIM) && defined(CONFIG_SYS_LBLAWAR5_PRELIM)
-	im->sysconf.lblaw[5].bar = CONFIG_SYS_LBLAWBAR5_PRELIM;
-	im->sysconf.lblaw[5].ar = CONFIG_SYS_LBLAWAR5_PRELIM;
-#endif
-#if defined(CONFIG_SYS_LBLAWBAR6_PRELIM) && defined(CONFIG_SYS_LBLAWAR6_PRELIM)
-	im->sysconf.lblaw[6].bar = CONFIG_SYS_LBLAWBAR6_PRELIM;
-	im->sysconf.lblaw[6].ar = CONFIG_SYS_LBLAWAR6_PRELIM;
-#endif
-#if defined(CONFIG_SYS_LBLAWBAR7_PRELIM) && defined(CONFIG_SYS_LBLAWAR7_PRELIM)
-	im->sysconf.lblaw[7].bar = CONFIG_SYS_LBLAWBAR7_PRELIM;
-	im->sysconf.lblaw[7].ar = CONFIG_SYS_LBLAWAR7_PRELIM;
-#endif
 #ifdef CONFIG_SYS_GPIO1_PRELIM
 	im->gpio[0].dat = CONFIG_SYS_GPIO1_DAT;
 	im->gpio[0].dir = CONFIG_SYS_GPIO1_DIR;