diff options
author | Arnd Bergmann <arnd@arndb.de> | 2022-07-20 14:47:57 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2022-07-22 12:33:30 +0200 |
commit | 2002f3968714e5426fa97399b24fac3db66a7f06 (patch) | |
tree | 76ce9ebf334b230050a137aee1b9ba683338d2a9 /arch/arm/configs/shannon_defconfig | |
parent | Merge tag 'qcom-arm64-defconfig-for-5.20-2' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into arm/defconfig (diff) | |
download | linux-dev-2002f3968714e5426fa97399b24fac3db66a7f06.tar.xz linux-dev-2002f3968714e5426fa97399b24fac3db66a7f06.zip |
ARM: refresh defconfig files
A lot of Kconfig options have changed over the years, and we tend
to not do a blind 'make defconfig' to refresh the files, to ensure
we catch options that should not have gone away.
I used some a bit of scripting to only rework the bits where an
option moved around in any of the defconfig files, without also
dropping any of the other lines, to make it clearer which options
we no longer have.
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Acked-by: Nicolas Ferre <nicolas.ferre@microchip.com>
Acked-by: Neil Armstrong <narmstrong@baylibre.com>
Acked-by: Sudeep Holla <sudeep.holla@arm.com>
Acked-by: Gregory CLEMENT <gregory.clement@bootlin.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/configs/shannon_defconfig')
-rw-r--r-- | arch/arm/configs/shannon_defconfig | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/configs/shannon_defconfig b/arch/arm/configs/shannon_defconfig index de33abdeb6fa..9c1de40132b2 100644 --- a/arch/arm/configs/shannon_defconfig +++ b/arch/arm/configs/shannon_defconfig @@ -1,20 +1,21 @@ CONFIG_SYSVIPC=y CONFIG_LOG_BUF_SHIFT=14 CONFIG_BLK_DEV_INITRD=y -CONFIG_MODULES=y CONFIG_ARCH_SA1100=y CONFIG_SA1100_SHANNON=y -CONFIG_PCCARD=y -CONFIG_PCMCIA_SA1100=y CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_CMDLINE="console=ttySA0,9600 console=tty1 root=/dev/mtdblock2 init=/linuxrc" CONFIG_FPE_NWFPE=y +CONFIG_MODULES=y +CONFIG_PARTITION_ADVANCED=y CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y CONFIG_INET=y # CONFIG_IPV6 is not set +CONFIG_PCCARD=y +CONFIG_PCMCIA_SA1100=y CONFIG_MTD=y CONFIG_MTD_BLOCK=y CONFIG_MTD_CFI=y @@ -40,5 +41,4 @@ CONFIG_VFAT_FS=y CONFIG_JFFS2_FS=y CONFIG_MINIX_FS=y CONFIG_NFS_FS=y -CONFIG_PARTITION_ADVANCED=y CONFIG_DEBUG_USER=y |