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/cns3420vb_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/cns3420vb_defconfig')
-rw-r--r-- | arch/arm/configs/cns3420vb_defconfig | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/arch/arm/configs/cns3420vb_defconfig b/arch/arm/configs/cns3420vb_defconfig index 63fa2eb21b75..416728cffadb 100644 --- a/arch/arm/configs/cns3420vb_defconfig +++ b/arch/arm/configs/cns3420vb_defconfig @@ -1,5 +1,4 @@ # CONFIG_LOCALVERSION_AUTO is not set -# CONFIG_SWAP is not set CONFIG_SYSVIPC=y CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y @@ -9,23 +8,23 @@ CONFIG_SYSFS_DEPRECATED_V2=y CONFIG_RELAY=y CONFIG_BLK_DEV_INITRD=y # CONFIG_PERF_EVENTS is not set -CONFIG_SLAB=y CONFIG_PROFILING=y +CONFIG_ARCH_MULTI_V6=y +CONFIG_ARCH_CNS3XXX=y +CONFIG_MACH_CNS3420VB=y +CONFIG_CMDLINE="console=ttyS0,38400 mem=128M root=/dev/mmcblk0p1 ro rootwait" CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_FORCE_UNLOAD=y CONFIG_MODVERSIONS=y -# CONFIG_BLK_DEV_BSG is not set CONFIG_IOSCHED_BFQ=m -CONFIG_ARCH_MULTI_V6=y #CONFIG_ARCH_MULTI_V7 is not set -CONFIG_ARCH_CNS3XXX=y -CONFIG_MACH_CNS3420VB=y CONFIG_DEBUG_CNS3XXX=y CONFIG_AEABI=y CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="console=ttyS0,38400 mem=128M root=/dev/mmcblk0p1 ro rootwait" +# CONFIG_SWAP is not set +CONFIG_SLAB=y CONFIG_MTD=y CONFIG_MTD_CMDLINE_PARTS=y CONFIG_MTD_BLOCK=y @@ -36,6 +35,7 @@ CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_SIZE=20000 CONFIG_BLK_DEV_SD=y +# CONFIG_BLK_DEV_BSG is not set CONFIG_ATA=y # CONFIG_SATA_PMP is not set # CONFIG_ATA_SFF is not set @@ -43,9 +43,9 @@ CONFIG_ATA=y # CONFIG_INPUT_KEYBOARD is not set # CONFIG_INPUT_MOUSE is not set # CONFIG_SERIO is not set +CONFIG_LEGACY_PTY_COUNT=16 CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_LEGACY_PTY_COUNT=16 # CONFIG_HW_RANDOM is not set # CONFIG_HWMON is not set # CONFIG_VGA_CONSOLE is not set @@ -59,6 +59,6 @@ CONFIG_AUTOFS4_FS=y CONFIG_FSCACHE=y CONFIG_TMPFS=y # CONFIG_ENABLE_MUST_CHECK is not set -CONFIG_DEBUG_FS=y # CONFIG_ARM_UNWIND is not set CONFIG_CRC_CCITT=y +CONFIG_DEBUG_FS=y |