| Message ID | 7ab513546148ebe33ddd4b0ea92c7bfd3cce3ad7.1694705016.git.christophe.leroy@csgroup.eu (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 6901a9f9ef1561111283a0d8c8d1cea634d089ef |
| Headers | show |
| Series | powerpc/82xx: Select FSL_SOC | expand |
On 9/14/23 08:23, Christophe Leroy wrote: > It used to be impossible to select CONFIG_CPM2 without selecting > CONFIG_FSL_SOC at the same time because CONFIG_CPM2 was dependent > on CONFIG_8260 and CONFIG_8260 was selecting CONFIG_FSL_SOC. > > But after commit eb5aa2137275 ("powerpc/82xx: Remove CONFIG_8260 > and CONFIG_8272") CONFIG_CPM2 depends on CONFIG_MPC82xx instead > but CONFIG_MPC82xx doesn't directly selects CONFIG_FSL_SOC. > > Fix it by forcing CONFIG_MPC82xx to select CONFIG_FSL_SOC just > like already done by MPC8xx, MPC512x, MPC83xx, PPC_86xx. > > Reported-by: Randy Dunlap <rdunlap@infradead.org> > Fixes: eb5aa2137275 ("powerpc/82xx: Remove CONFIG_8260 and CONFIG_8272") > Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu> Acked-by: Randy Dunlap <rdunlap@infradead.org> Tested-by: Randy Dunlap <rdunlap@infradead.org> Thanks for tracking this down. > --- > arch/powerpc/platforms/82xx/Kconfig | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/arch/powerpc/platforms/82xx/Kconfig b/arch/powerpc/platforms/82xx/Kconfig > index d9f1a2a83158..1824536cf6f2 100644 > --- a/arch/powerpc/platforms/82xx/Kconfig > +++ b/arch/powerpc/platforms/82xx/Kconfig > @@ -2,6 +2,7 @@ > menuconfig PPC_82xx > bool "82xx-based boards (PQ II)" > depends on PPC_BOOK3S_32 > + select FSL_SOC > > if PPC_82xx > > @@ -9,7 +10,6 @@ config EP8248E > bool "Embedded Planet EP8248E (a.k.a. CWH-PPC-8248N-VE)" > select CPM2 > select PPC_INDIRECT_PCI if PCI > - select FSL_SOC > select PHYLIB if NETDEVICES > select MDIO_BITBANG if PHYLIB > help > @@ -22,7 +22,6 @@ config MGCOGE > bool "Keymile MGCOGE" > select CPM2 > select PPC_INDIRECT_PCI if PCI > - select FSL_SOC > help > This enables support for the Keymile MGCOGE board. >
Christophe Leroy <christophe.leroy@csgroup.eu> writes: > It used to be impossible to select CONFIG_CPM2 without selecting > CONFIG_FSL_SOC at the same time because CONFIG_CPM2 was dependent > on CONFIG_8260 and CONFIG_8260 was selecting CONFIG_FSL_SOC. > > But after commit eb5aa2137275 ("powerpc/82xx: Remove CONFIG_8260 > and CONFIG_8272") CONFIG_CPM2 depends on CONFIG_MPC82xx instead ^ CONFIG_PPC_82xx All the references to CONFIG_MPC82xx should be CONFIG_PPC_82xx right? I can update when applying. cheers > but CONFIG_MPC82xx doesn't directly selects CONFIG_FSL_SOC. > > Fix it by forcing CONFIG_MPC82xx to select CONFIG_FSL_SOC just > like already done by MPC8xx, MPC512x, MPC83xx, PPC_86xx. > > Reported-by: Randy Dunlap <rdunlap@infradead.org> > Fixes: eb5aa2137275 ("powerpc/82xx: Remove CONFIG_8260 and CONFIG_8272") > Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu> > --- > arch/powerpc/platforms/82xx/Kconfig | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/arch/powerpc/platforms/82xx/Kconfig b/arch/powerpc/platforms/82xx/Kconfig > index d9f1a2a83158..1824536cf6f2 100644 > --- a/arch/powerpc/platforms/82xx/Kconfig > +++ b/arch/powerpc/platforms/82xx/Kconfig > @@ -2,6 +2,7 @@ > menuconfig PPC_82xx > bool "82xx-based boards (PQ II)" > depends on PPC_BOOK3S_32 > + select FSL_SOC > > if PPC_82xx > > @@ -9,7 +10,6 @@ config EP8248E > bool "Embedded Planet EP8248E (a.k.a. CWH-PPC-8248N-VE)" > select CPM2 > select PPC_INDIRECT_PCI if PCI > - select FSL_SOC > select PHYLIB if NETDEVICES > select MDIO_BITBANG if PHYLIB > help > @@ -22,7 +22,6 @@ config MGCOGE > bool "Keymile MGCOGE" > select CPM2 > select PPC_INDIRECT_PCI if PCI > - select FSL_SOC > help > This enables support for the Keymile MGCOGE board. > > -- > 2.41.0
Le 15/09/2023 à 02:43, Michael Ellerman a écrit : > Christophe Leroy <christophe.leroy@csgroup.eu> writes: >> It used to be impossible to select CONFIG_CPM2 without selecting >> CONFIG_FSL_SOC at the same time because CONFIG_CPM2 was dependent >> on CONFIG_8260 and CONFIG_8260 was selecting CONFIG_FSL_SOC. >> >> But after commit eb5aa2137275 ("powerpc/82xx: Remove CONFIG_8260 >> and CONFIG_8272") CONFIG_CPM2 depends on CONFIG_MPC82xx instead > ^ > CONFIG_PPC_82xx > > All the references to CONFIG_MPC82xx should be CONFIG_PPC_82xx right? > I can update when applying. Ah right, I mixed things up. This is CONFIG_PPC_82xx, CONFIG_PPC_8xx, CONFIG_PPC_83xx and CONFIG_PPC_MPC512x > > cheers > > >> but CONFIG_MPC82xx doesn't directly selects CONFIG_FSL_SOC. >> >> Fix it by forcing CONFIG_MPC82xx to select CONFIG_FSL_SOC just >> like already done by MPC8xx, MPC512x, MPC83xx, PPC_86xx. >> >> Reported-by: Randy Dunlap <rdunlap@infradead.org> >> Fixes: eb5aa2137275 ("powerpc/82xx: Remove CONFIG_8260 and CONFIG_8272") >> Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu> >> --- >> arch/powerpc/platforms/82xx/Kconfig | 3 +-- >> 1 file changed, 1 insertion(+), 2 deletions(-) >> >> diff --git a/arch/powerpc/platforms/82xx/Kconfig b/arch/powerpc/platforms/82xx/Kconfig >> index d9f1a2a83158..1824536cf6f2 100644 >> --- a/arch/powerpc/platforms/82xx/Kconfig >> +++ b/arch/powerpc/platforms/82xx/Kconfig >> @@ -2,6 +2,7 @@ >> menuconfig PPC_82xx >> bool "82xx-based boards (PQ II)" >> depends on PPC_BOOK3S_32 >> + select FSL_SOC >> >> if PPC_82xx >> >> @@ -9,7 +10,6 @@ config EP8248E >> bool "Embedded Planet EP8248E (a.k.a. CWH-PPC-8248N-VE)" >> select CPM2 >> select PPC_INDIRECT_PCI if PCI >> - select FSL_SOC >> select PHYLIB if NETDEVICES >> select MDIO_BITBANG if PHYLIB >> help >> @@ -22,7 +22,6 @@ config MGCOGE >> bool "Keymile MGCOGE" >> select CPM2 >> select PPC_INDIRECT_PCI if PCI >> - select FSL_SOC >> help >> This enables support for the Keymile MGCOGE board. >> >> -- >> 2.41.0
Christophe Leroy <christophe.leroy@csgroup.eu> writes: > Le 15/09/2023 à 02:43, Michael Ellerman a écrit : >> Christophe Leroy <christophe.leroy@csgroup.eu> writes: >>> It used to be impossible to select CONFIG_CPM2 without selecting >>> CONFIG_FSL_SOC at the same time because CONFIG_CPM2 was dependent >>> on CONFIG_8260 and CONFIG_8260 was selecting CONFIG_FSL_SOC. >>> >>> But after commit eb5aa2137275 ("powerpc/82xx: Remove CONFIG_8260 >>> and CONFIG_8272") CONFIG_CPM2 depends on CONFIG_MPC82xx instead >> ^ >> CONFIG_PPC_82xx >> >> All the references to CONFIG_MPC82xx should be CONFIG_PPC_82xx right? >> I can update when applying. > > Ah right, I mixed things up. This is CONFIG_PPC_82xx, CONFIG_PPC_8xx, > CONFIG_PPC_83xx and CONFIG_PPC_MPC512x Thanks. cheers
On Thu, 14 Sep 2023 17:23:45 +0200, Christophe Leroy wrote: > It used to be impossible to select CONFIG_CPM2 without selecting > CONFIG_FSL_SOC at the same time because CONFIG_CPM2 was dependent > on CONFIG_8260 and CONFIG_8260 was selecting CONFIG_FSL_SOC. > > But after commit eb5aa2137275 ("powerpc/82xx: Remove CONFIG_8260 > and CONFIG_8272") CONFIG_CPM2 depends on CONFIG_MPC82xx instead > but CONFIG_MPC82xx doesn't directly selects CONFIG_FSL_SOC. > > [...] Applied to powerpc/fixes. [1/1] powerpc/82xx: Select FSL_SOC https://git.kernel.org/powerpc/c/6901a9f9ef1561111283a0d8c8d1cea634d089ef cheers
diff --git a/arch/powerpc/platforms/82xx/Kconfig b/arch/powerpc/platforms/82xx/Kconfig index d9f1a2a83158..1824536cf6f2 100644 --- a/arch/powerpc/platforms/82xx/Kconfig +++ b/arch/powerpc/platforms/82xx/Kconfig @@ -2,6 +2,7 @@ menuconfig PPC_82xx bool "82xx-based boards (PQ II)" depends on PPC_BOOK3S_32 + select FSL_SOC if PPC_82xx @@ -9,7 +10,6 @@ config EP8248E bool "Embedded Planet EP8248E (a.k.a. CWH-PPC-8248N-VE)" select CPM2 select PPC_INDIRECT_PCI if PCI - select FSL_SOC select PHYLIB if NETDEVICES select MDIO_BITBANG if PHYLIB help @@ -22,7 +22,6 @@ config MGCOGE bool "Keymile MGCOGE" select CPM2 select PPC_INDIRECT_PCI if PCI - select FSL_SOC help This enables support for the Keymile MGCOGE board.
It used to be impossible to select CONFIG_CPM2 without selecting CONFIG_FSL_SOC at the same time because CONFIG_CPM2 was dependent on CONFIG_8260 and CONFIG_8260 was selecting CONFIG_FSL_SOC. But after commit eb5aa2137275 ("powerpc/82xx: Remove CONFIG_8260 and CONFIG_8272") CONFIG_CPM2 depends on CONFIG_MPC82xx instead but CONFIG_MPC82xx doesn't directly selects CONFIG_FSL_SOC. Fix it by forcing CONFIG_MPC82xx to select CONFIG_FSL_SOC just like already done by MPC8xx, MPC512x, MPC83xx, PPC_86xx. Reported-by: Randy Dunlap <rdunlap@infradead.org> Fixes: eb5aa2137275 ("powerpc/82xx: Remove CONFIG_8260 and CONFIG_8272") Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu> --- arch/powerpc/platforms/82xx/Kconfig | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)