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

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

[Christophe Leroy]

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(-)

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;
-- 
2.39.2

[PATCH 2/2] mpc83xx: Remove CONFIG_SYS_GPIO{1/2}_PRELIM and related

[Christophe Leroy]

Last use of CONFIG_SYS_GPIO1_PRELIM was removed by
commit fae2ea5951 ("ppc: Remove MPC8349EMDS board and ARCH_MPC8349
support").

Last use of CONFIG_SYS_GPIO2_PRELIM was removed even before by
commit 6843862342 ("ppc: Remove caddy2 / vme8349 boards")

Those two items were removed from whitelist by
commit 8cca60a2cb ("Kconfig: Remove some symbols from the whitelist")

Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Fixes: fae2ea5951 ("ppc: Remove MPC8349EMDS board and ARCH_MPC8349 support")
---
 arch/powerpc/cpu/mpc83xx/cpu_init.c | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/arch/powerpc/cpu/mpc83xx/cpu_init.c b/arch/powerpc/cpu/mpc83xx/cpu_init.c
index 14df59bb8e..f5cb000de6 100644
--- a/arch/powerpc/cpu/mpc83xx/cpu_init.c
+++ b/arch/powerpc/cpu/mpc83xx/cpu_init.c
@@ -227,14 +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
-#ifdef CONFIG_SYS_GPIO1_PRELIM
-	im->gpio[0].dat = CONFIG_SYS_GPIO1_DAT;
-	im->gpio[0].dir = CONFIG_SYS_GPIO1_DIR;
-#endif
-#ifdef CONFIG_SYS_GPIO2_PRELIM
-	im->gpio[1].dat = CONFIG_SYS_GPIO2_DAT;
-	im->gpio[1].dir = CONFIG_SYS_GPIO2_DIR;
-#endif
 }
 
 int cpu_init_r (void)
-- 
2.39.2

Re: [PATCH 2/2] mpc83xx: Remove CONFIG_SYS_GPIO{1/2}_PRELIM and related

[Tom Rini]

[-- Attachment #1: Type: text/plain, Size: 661 bytes --]

On Tue, Mar 14, 2023 at 11:24:45PM +0100, Christophe Leroy wrote:

> Last use of CONFIG_SYS_GPIO1_PRELIM was removed by
> commit fae2ea5951 ("ppc: Remove MPC8349EMDS board and ARCH_MPC8349
> support").
> 
> Last use of CONFIG_SYS_GPIO2_PRELIM was removed even before by
> commit 6843862342 ("ppc: Remove caddy2 / vme8349 boards")
> 
> Those two items were removed from whitelist by
> commit 8cca60a2cb ("Kconfig: Remove some symbols from the whitelist")
> 
> Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
> Fixes: fae2ea5951 ("ppc: Remove MPC8349EMDS board and ARCH_MPC8349 support")

Applied to u-boot/next, thanks!

-- 
Tom

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]

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

[Tom Rini]

[-- Attachment #1: Type: text/plain, Size: 621 bytes --]

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!

-- 
Tom

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]