Re: [PATCH v2 5/8] arm: bcmbca: Move BCM63138 ARCH_BCM_63XX to ARCH_BCMBCA

[Florian Fainelli]

On 7/13/22 08:35, Rafał Miłecki wrote:
> On 7.07.2022 09:00, William Zhang wrote:
> > Remove ARCH_BCM_63XX Kconfig for BCM63138 and merge its selections to
> > ARCH_BCMBCA. Delete bcm63xx.c as it is no longer needed.
> >
> > Signed-off-by: William Zhang <william.zhang@xxxxxxxxxxxx>
> > ---
> >
> > (no changes since v1)
> >
> >   arch/arm/mach-bcm/Kconfig   | 26 +++++++++-----------------
> >   arch/arm/mach-bcm/Makefile  |  7 +------
> >   arch/arm/mach-bcm/bcm63xx.c | 17 -----------------
> >   3 files changed, 10 insertions(+), 40 deletions(-)
> >   delete mode 100644 arch/arm/mach-bcm/bcm63xx.c
> >
> > diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig
> > index f73a056bf560..25aa4ef4db07 100644
> > --- a/arch/arm/mach-bcm/Kconfig
> > +++ b/arch/arm/mach-bcm/Kconfig
> > @@ -182,23 +182,6 @@ config ARCH_BCM_53573
> >         The base chip is BCM53573 and there are some packaging 
> > modifications
> >         like BCM47189 and BCM47452.
> > -config ARCH_BCM_63XX
> > -    bool "Broadcom BCM63xx DSL SoC"
> > -    depends on ARCH_MULTI_V7
> > -    select ARCH_HAS_RESET_CONTROLLER
> > -    select ARM_ERRATA_754322
> > -    select ARM_ERRATA_764369 if SMP
> > -    select ARM_GIC
> > -    select ARM_GLOBAL_TIMER
> > -    select CACHE_L2X0
> > -    select HAVE_ARM_ARCH_TIMER
> > -    select HAVE_ARM_TWD if SMP
> > -    select HAVE_ARM_SCU if SMP
> > -    help
> > -      This enables support for systems based on Broadcom DSL SoCs.
> > -      It currently supports the 'BCM63XX' ARM-based family, which 
> > includes
> > -      the BCM63138 variant.
>
> Oh, wait a second. This is actually going to totally break builds for
> people because there are a lot of Kconfig-s that depend on it!
>
> I don't believe it can't be handled this way.
>
> You need to first introduce a replacement / parent symbol.
> Then (in another release if needed) update all Kconfig-s.
> Then eventually you can get rid of ARCH_BCM_63XX.

This works because ARCH_BCMBCA was introdcuced in v5.19-rc1 with 
b32c613b3fda3 and in patch 8 the defconfig is updated to select ARCH_BCMBCA.
--
Florian