On 7/6/22 23:57, William Zhang wrote:
> Prepare for the BCM63138 ARCH_BCM_63XX migration to ARCH_BCMBCA. Make
> DEBUG_BCM63XX_UART depending on ARCH_BCMBCA.
>
> Signed-off-by: William Zhang <[email protected]>
This patch belonged in your v2 series:
https://lore.kernel.org/linux-arm-kernel/[email protected]/
but that is fine, I will pick it up from there.
--
Florian
On Wed, 6 Jul 2022 23:57:52 -0700, William Zhang <[email protected]> wrote:
> Prepare for the BCM63138 ARCH_BCM_63XX migration to ARCH_BCMBCA. Make
> DEBUG_BCM63XX_UART depending on ARCH_BCMBCA.
>
> Signed-off-by: William Zhang <[email protected]>
> ---
Applied to https://github.com/Broadcom/stblinux/commits/soc/next, thanks!
--
Florian
On 7.07.2022 08:57, William Zhang wrote:
> Prepare for the BCM63138 ARCH_BCM_63XX migration to ARCH_BCMBCA. Make
> DEBUG_BCM63XX_UART depending on ARCH_BCMBCA.
>
> Signed-off-by: William Zhang <[email protected]>
> ---
>
> arch/arm/Kconfig.debug | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
> index 9b0aa4822d69..792796a348c3 100644
> --- a/arch/arm/Kconfig.debug
> +++ b/arch/arm/Kconfig.debug
> @@ -271,7 +271,7 @@ choice
>
> config DEBUG_BCM63XX_UART
> bool "Kernel low-level debugging on BCM63XX UART"
> - depends on ARCH_BCM_63XX
> + depends on ARCH_BCMBCA
>
> config DEBUG_BERLIN_UART
> bool "Marvell Berlin SoC Debug UART"
There is no such config symbol (ARCH_BCMBCA) in Linus's tree.
This patchset is going to break builds until code it depends on hits Linus's tree.
All those patches should be hold until that.
On 7/13/22 08:39, Rafał Miłecki wrote:
> On 7.07.2022 08:57, William Zhang wrote:
>> Prepare for the BCM63138 ARCH_BCM_63XX migration to ARCH_BCMBCA. Make
>> DEBUG_BCM63XX_UART depending on ARCH_BCMBCA.
>>
>> Signed-off-by: William Zhang <[email protected]>
>> ---
>>
>> arch/arm/Kconfig.debug | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
>> index 9b0aa4822d69..792796a348c3 100644
>> --- a/arch/arm/Kconfig.debug
>> +++ b/arch/arm/Kconfig.debug
>> @@ -271,7 +271,7 @@ choice
>> config DEBUG_BCM63XX_UART
>> bool "Kernel low-level debugging on BCM63XX UART"
>> - depends on ARCH_BCM_63XX
>> + depends on ARCH_BCMBCA
>> config DEBUG_BERLIN_UART
>> bool "Marvell Berlin SoC Debug UART"
>
> There is no such config symbol (ARCH_BCMBCA) in Linus's tree.
>
> This patchset is going to break builds until code it depends on hits
> Linus's tree.
>
> All those patches should be hold until that.
There is, ARCH_BCMBCA was added to arch/arm/mach-bcm/Kconfig with
b32c613b3fda3 ("arm: bcmbca: add arch bcmbca machine entry") which is in
v5.19-rc1 and newer:
git tag --contains b32c613b3fda3
arm-soc/for-5.19/devicetree-arm64-fixes
arm-soc/for-5.19/devicetree-fixes
arm-soc/for-5.19/drivers-fixes
arm-soc/for-5.19/maintainers-fixes
arm-soc/for-5.19/soc
arm-soc/for-5.20/defconfig
arm-soc/for-5.20/defconfig-arm64
arm-soc/for-5.20/devicetree
arm-soc/for-5.20/devicetree-arm64
arm-soc/for-5.20/drivers
arm-soc/for-5.20/maintainers
arm-soc/for-5.20/soc
ib-mfd-soc-bcm-v5.20
mips-fixes_5.19_1
mips-fixes_5.19_2
next-20220511
next-20220512
next-20220523
next-20220524
next-20220610
next-20220627
next-20220628
next-20220706
next-20220708
next-20220711
next-20220712
v5.19-rc1
v5.19-rc2
v5.19-rc3
v5.19-rc4
v5.19-rc5
v5.19-rc6
otherwise we would not have done it that way. Am I missing something?
--
Florian
On 13.07.2022 18:10, Florian Fainelli wrote:
> On 7/13/22 08:39, Rafał Miłecki wrote:
>> On 7.07.2022 08:57, William Zhang wrote:
>>> Prepare for the BCM63138 ARCH_BCM_63XX migration to ARCH_BCMBCA. Make
>>> DEBUG_BCM63XX_UART depending on ARCH_BCMBCA.
>>>
>>> Signed-off-by: William Zhang <[email protected]>
>>> ---
>>>
>>> arch/arm/Kconfig.debug | 2 +-
>>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
>>> index 9b0aa4822d69..792796a348c3 100644
>>> --- a/arch/arm/Kconfig.debug
>>> +++ b/arch/arm/Kconfig.debug
>>> @@ -271,7 +271,7 @@ choice
>>> config DEBUG_BCM63XX_UART
>>> bool "Kernel low-level debugging on BCM63XX UART"
>>> - depends on ARCH_BCM_63XX
>>> + depends on ARCH_BCMBCA
>>> config DEBUG_BERLIN_UART
>>> bool "Marvell Berlin SoC Debug UART"
>>
>> There is no such config symbol (ARCH_BCMBCA) in Linus's tree.
>>
>> This patchset is going to break builds until code it depends on hits Linus's tree.
>>
>> All those patches should be hold until that.
>
> There is, ARCH_BCMBCA was added to arch/arm/mach-bcm/Kconfig with b32c613b3fda3 ("arm: bcmbca: add arch bcmbca machine entry") which is in v5.19-rc1 and newer:
Oops, my tree updating script failed me. Sorry!
OK then, maybe this migration wasn't handled flawlessly but it's half
done now and remaining things should be fixed with all pending work.
Looks OK!