From: Arnd Bergmann Date: Thu, 15 Sep 2022 19:57:56 +0000 (+0200) Subject: Merge tag 'arm-soc/for-6.1/defconfig-arm64' of https://github.com/Broadcom/stblinux... X-Git-Tag: v6.1-rc5~305^2~7 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=79774742bde749af0a0ef09663709b739aa07e67;p=platform%2Fkernel%2Flinux-starfive.git Merge tag 'arm-soc/for-6.1/defconfig-arm64' of https://github.com/Broadcom/stblinux into arm/defconfig This pull request contains Broadcom ARM64 defconfig changes for 6.1, please pull the following: - William completes the removal of ARCH_BCM4908 by removing that Kconfig entry from the defconfig since it is being deleted after having been transitional through 6.0 * tag 'arm-soc/for-6.1/defconfig-arm64' of https://github.com/Broadcom/stblinux: arm64: defconfig: remove BCM4908 Link: https://lore.kernel.org/r/20220915023044.2350782-1-f.fainelli@gmail.com Signed-off-by: Arnd Bergmann --- 79774742bde749af0a0ef09663709b739aa07e67 diff --cc arch/arm64/configs/defconfig index 2719b96,f1b16d5..48aa433 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@@ -33,9 -33,7 +33,8 @@@ CONFIG_ARCH_ACTIONS= CONFIG_ARCH_SUNXI=y CONFIG_ARCH_ALPINE=y CONFIG_ARCH_APPLE=y +CONFIG_ARCH_BCM=y CONFIG_ARCH_BCM2835=y - CONFIG_ARCH_BCM4908=y CONFIG_ARCH_BCMBCA=y CONFIG_ARCH_BCM_IPROC=y CONFIG_ARCH_BERLIN=y