Commit 2002f396 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Acked-by: default avatarNicolas Ferre <nicolas.ferre@microchip.com>
Acked-by: default avatarNeil Armstrong <narmstrong@baylibre.com>
Acked-by: default avatarSudeep Holla <sudeep.holla@arm.com>
Acked-by: default avatarGregory CLEMENT <gregory.clement@bootlin.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent e4866a0d

arch/arm/configs/am200epdkit_defconfig

+13 −13
Original line number Diff line number Diff line 
CONFIG_LOCALVERSION="gum"

# CONFIG_SWAP is not set

CONFIG_SYSVIPC=y

CONFIG_SYSFS_DEPRECATED_V2=y

CONFIG_PREEMPT=y

CONFIG_EXPERT=y

# CONFIG_EPOLL is not set

# CONFIG_SHMEM is not set

# CONFIG_VM_EVENT_COUNTERS is not set

CONFIG_SLAB=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

# CONFIG_BLK_DEV_BSG is not set

# CONFIG_ARCH_MULTI_V7 is not set

CONFIG_ARCH_PXA=y

CONFIG_ARCH_GUMSTIX=y

CONFIG_PCCARD=y

CONFIG_PREEMPT=y

CONFIG_AEABI=y

# CONFIG_OABI_COMPAT is not set

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_CMDLINE="console=ttyS0,115200n8 root=1f01 rootfstype=jffs2"

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

CONFIG_PARTITION_ADVANCED=y

# CONFIG_SWAP is not set

CONFIG_SLAB=y

# CONFIG_VM_EVENT_COUNTERS is not set

CONFIG_NET=y

CONFIG_PACKET=m

CONFIG_UNIX=y
@@ -35,6 +34,7 @@ CONFIG_BT_RFCOMM_TTY=y 
CONFIG_BT_BNEP=m

CONFIG_BT_HCIUART=m

CONFIG_BT_HCIUART_H4=y

CONFIG_PCCARD=y

CONFIG_MTD=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_CFI=y
@@ -48,14 +48,15 @@ CONFIG_MTD_COMPLEX_MAPPINGS=y 
CONFIG_MTD_PXA2XX=y

CONFIG_BLK_DEV_LOOP=m

CONFIG_BLK_DEV_SD=m

# CONFIG_BLK_DEV_BSG is not set

CONFIG_ATA=m

CONFIG_PATA_PCMCIA=m

CONFIG_NETDEVICES=y

CONFIG_NET_ETHERNET=y

CONFIG_SMC91X=m

# CONFIG_LEGACY_PTYS is not set

CONFIG_SERIAL_PXA=y

CONFIG_SERIAL_PXA_CONSOLE=y

# CONFIG_LEGACY_PTYS is not set

# CONFIG_HW_RANDOM is not set

# CONFIG_HWMON is not set

CONFIG_WATCHDOG=y
@@ -84,16 +85,15 @@ CONFIG_VFAT_FS=y 
CONFIG_JFFS2_FS=y

CONFIG_JFFS2_COMPRESSION_OPTIONS=y

CONFIG_JFFS2_RUBIN=y

CONFIG_PARTITION_ADVANCED=y

CONFIG_NLS_CODEPAGE_437=y

CONFIG_NLS_ISO8859_1=y

CONFIG_DEBUG_KERNEL=y

# CONFIG_DETECT_SOFTLOCKUP is not set

# CONFIG_DEBUG_PREEMPT is not set

# CONFIG_DEBUG_BUGVERBOSE is not set

CONFIG_DEBUG_USER=y

CONFIG_CRYPTO=y

CONFIG_CRYPTO_CBC=m

CONFIG_CRYPTO_ECB=m

CONFIG_CRYPTO_PCBC=m

CONFIG_CRYPTO_ARC4=m

# CONFIG_DEBUG_BUGVERBOSE is not set

# CONFIG_DEBUG_PREEMPT is not set

CONFIG_DEBUG_USER=y

arch/arm/configs/aspeed_g4_defconfig

+8 −8
Original line number Diff line number Diff line 
CONFIG_KERNEL_XZ=y

# CONFIG_SWAP is not set

CONFIG_SYSVIPC=y

CONFIG_NO_HZ_IDLE=y

CONFIG_HIGH_RES_TIMERS=y
@@ -17,9 +16,6 @@ CONFIG_BLK_DEV_INITRD=y 
# CONFIG_AIO is not set

CONFIG_EMBEDDED=y

CONFIG_PERF_EVENTS=y

# CONFIG_COMPAT_BRK is not set

CONFIG_SLAB_FREELIST_RANDOM=y

CONFIG_SLAB_FREELIST_HARDENED=y

# CONFIG_ARCH_MULTI_V7 is not set

CONFIG_ARCH_ASPEED=y

CONFIG_MACH_ASPEED_G4=y
@@ -30,7 +26,6 @@ CONFIG_UACCESS_WITH_MEMCPY=y 
CONFIG_ARM_APPENDED_DTB=y

CONFIG_ARM_ATAG_DTB_COMPAT=y

CONFIG_KEXEC=y

CONFIG_FIRMWARE_MEMMAP=y

CONFIG_JUMP_LABEL=y

CONFIG_STRICT_KERNEL_RWX=y

# CONFIG_BLK_DEV_BSG is not set
@@ -38,6 +33,10 @@ CONFIG_STRICT_KERNEL_RWX=y 
# CONFIG_MQ_IOSCHED_DEADLINE is not set

# CONFIG_MQ_IOSCHED_KYBER is not set

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

# CONFIG_SWAP is not set

CONFIG_SLAB_FREELIST_RANDOM=y

CONFIG_SLAB_FREELIST_HARDENED=y

# CONFIG_COMPAT_BRK is not set

# CONFIG_COMPACTION is not set

CONFIG_NET=y

CONFIG_PACKET=y
@@ -57,12 +56,12 @@ CONFIG_NET_NCSI=y 
CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y

# CONFIG_PREVENT_FIRMWARE_BUILD is not set

CONFIG_FIRMWARE_MEMMAP=y

CONFIG_MTD=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_PARTITIONED_MASTER=y

CONFIG_MTD_SPI_NOR=y

# CONFIG_MTD_SPI_NOR_USE_4K_SECTORS is not set

CONFIG_SPI_ASPEED_SMC=y

CONFIG_MTD_UBI=y

CONFIG_MTD_UBI_FASTMAP=y

CONFIG_MTD_UBI_BLOCK=y
@@ -88,9 +87,9 @@ CONFIG_FTGMAC100=y 
# CONFIG_NET_VENDOR_MELLANOX is not set

# CONFIG_NET_VENDOR_MICREL is not set

# CONFIG_NET_VENDOR_MICROSEMI is not set

# CONFIG_NET_VENDOR_NI is not set

# CONFIG_NET_VENDOR_NATSEMI is not set

# CONFIG_NET_VENDOR_NETRONOME is not set

# CONFIG_NET_VENDOR_NI is not set

# CONFIG_NET_VENDOR_QUALCOMM is not set

# CONFIG_NET_VENDOR_RENESAS is not set

# CONFIG_NET_VENDOR_ROCKER is not set
@@ -134,6 +133,7 @@ CONFIG_I2C_MUX_PCA954x=y 
CONFIG_I2C_ASPEED=y

CONFIG_I2C_FSI=y

CONFIG_SPI=y

CONFIG_SPI_ASPEED_SMC=y

CONFIG_GPIOLIB=y

CONFIG_GPIO_SYSFS=y

CONFIG_GPIO_ASPEED=y
@@ -245,8 +245,8 @@ CONFIG_CRYPTO_USER_API_HASH=y 
CONFIG_PRINTK_TIME=y

CONFIG_DYNAMIC_DEBUG=y

CONFIG_DEBUG_INFO=y

CONFIG_DEBUG_INFO_REDUCED=y

CONFIG_DEBUG_INFO_DWARF4=y

CONFIG_DEBUG_INFO_REDUCED=y

CONFIG_GDB_SCRIPTS=y

CONFIG_STRIP_ASM_SYMS=y

CONFIG_DEBUG_FS=y

arch/arm/configs/aspeed_g5_defconfig

+8 −8
Original line number Diff line number Diff line 
CONFIG_KERNEL_XZ=y

# CONFIG_SWAP is not set

CONFIG_SYSVIPC=y

CONFIG_NO_HZ_IDLE=y

CONFIG_HIGH_RES_TIMERS=y
@@ -17,9 +16,6 @@ CONFIG_BLK_DEV_INITRD=y 
# CONFIG_AIO is not set

CONFIG_EMBEDDED=y

CONFIG_PERF_EVENTS=y

# CONFIG_COMPAT_BRK is not set

CONFIG_SLAB_FREELIST_RANDOM=y

CONFIG_SLAB_FREELIST_HARDENED=y

CONFIG_ARCH_MULTI_V6=y

CONFIG_ARCH_ASPEED=y

CONFIG_MACH_ASPEED_G5=y
@@ -36,13 +32,16 @@ CONFIG_KEXEC=y 
CONFIG_VFP=y

CONFIG_NEON=y

CONFIG_KERNEL_MODE_NEON=y

CONFIG_FIRMWARE_MEMMAP=y

CONFIG_JUMP_LABEL=y

# CONFIG_BLK_DEV_BSG is not set

# CONFIG_BLK_DEBUG_FS is not set

# CONFIG_MQ_IOSCHED_DEADLINE is not set

# CONFIG_MQ_IOSCHED_KYBER is not set

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

# CONFIG_SWAP is not set

CONFIG_SLAB_FREELIST_RANDOM=y

CONFIG_SLAB_FREELIST_HARDENED=y

# CONFIG_COMPAT_BRK is not set

# CONFIG_COMPACTION is not set

CONFIG_NET=y

CONFIG_PACKET=y
@@ -70,12 +69,12 @@ CONFIG_NET_NCSI=y 
CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y

# CONFIG_PREVENT_FIRMWARE_BUILD is not set

CONFIG_FIRMWARE_MEMMAP=y

CONFIG_MTD=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_PARTITIONED_MASTER=y

CONFIG_MTD_SPI_NOR=y

# CONFIG_MTD_SPI_NOR_USE_4K_SECTORS is not set

CONFIG_SPI_ASPEED_SMC=y

CONFIG_MTD_UBI=y

CONFIG_MTD_UBI_FASTMAP=y

CONFIG_MTD_UBI_BLOCK=y
@@ -103,9 +102,9 @@ CONFIG_FTGMAC100=y 
# CONFIG_NET_VENDOR_MELLANOX is not set

# CONFIG_NET_VENDOR_MICREL is not set

# CONFIG_NET_VENDOR_MICROSEMI is not set

# CONFIG_NET_VENDOR_NI is not set

# CONFIG_NET_VENDOR_NATSEMI is not set

# CONFIG_NET_VENDOR_NETRONOME is not set

# CONFIG_NET_VENDOR_NI is not set

# CONFIG_NET_VENDOR_QUALCOMM is not set

# CONFIG_NET_VENDOR_RENESAS is not set

# CONFIG_NET_VENDOR_ROCKER is not set
@@ -156,6 +155,7 @@ CONFIG_I2C_ASPEED=y 
CONFIG_I2C_FSI=y

CONFIG_I2C_SLAVE=y

CONFIG_SPI=y

CONFIG_SPI_ASPEED_SMC=y

CONFIG_SPI_FSI=y

CONFIG_GPIOLIB=y

CONFIG_GPIO_SYSFS=y
@@ -274,8 +274,8 @@ CONFIG_CRYPTO_USER_API_HASH=y 
CONFIG_PRINTK_TIME=y

CONFIG_DYNAMIC_DEBUG=y

CONFIG_DEBUG_INFO=y

CONFIG_DEBUG_INFO_REDUCED=y

CONFIG_DEBUG_INFO_DWARF4=y

CONFIG_DEBUG_INFO_REDUCED=y

CONFIG_GDB_SCRIPTS=y

CONFIG_STRIP_ASM_SYMS=y

CONFIG_DEBUG_FS=y

arch/arm/configs/assabet_defconfig

+4 −4
Original line number Diff line number Diff line 
CONFIG_SYSVIPC=y

CONFIG_LOG_BUF_SHIFT=14

CONFIG_BLK_DEV_INITRD=y

CONFIG_MODULES=y

CONFIG_ARCH_SA1100=y

CONFIG_SA1100_ASSABET=y

CONFIG_PCCARD=y

CONFIG_PCMCIA_SA1100=y

CONFIG_LEDS=y

CONFIG_LEDS_CPU=y

CONFIG_ZBOOT_ROM_TEXT=0x0
@@ -13,6 +10,8 @@ CONFIG_ZBOOT_ROM_BSS=0x0 
CONFIG_CMDLINE="mem=32M console=ttySA0,38400n8 initrd=0xc0800000,3M root=/dev/ram"

CONFIG_FPE_NWFPE=y

CONFIG_PM=y

CONFIG_MODULES=y

CONFIG_PARTITION_ADVANCED=y

CONFIG_NET=y

CONFIG_UNIX=y

CONFIG_INET=y
@@ -20,6 +19,8 @@ CONFIG_INET=y 
CONFIG_IRDA=m

CONFIG_IRLAN=m

CONFIG_SA1100_FIR=m

CONFIG_PCCARD=y

CONFIG_PCMCIA_SA1100=y

CONFIG_MTD=y

CONFIG_MTD_REDBOOT_PARTS=y

CONFIG_MTD_BLOCK=y
@@ -51,6 +52,5 @@ CONFIG_MSDOS_FS=y 
CONFIG_TMPFS=y

CONFIG_JFFS2_FS=y

CONFIG_NFS_FS=y

CONFIG_PARTITION_ADVANCED=y

CONFIG_NLS_CODEPAGE_437=y

CONFIG_DEBUG_USER=y

arch/arm/configs/at91_dt_defconfig

+5 −5
Original line number Diff line number Diff line 
# CONFIG_LOCALVERSION_AUTO is not set

# CONFIG_SWAP is not set

CONFIG_SYSVIPC=y

CONFIG_NO_HZ_IDLE=y

CONFIG_HIGH_RES_TIMERS=y
@@ -9,7 +8,6 @@ CONFIG_BLK_DEV_INITRD=y 
CONFIG_CC_OPTIMIZE_FOR_SIZE=y

CONFIG_KALLSYMS_ALL=y

CONFIG_EMBEDDED=y

CONFIG_SLAB=y

CONFIG_ARCH_MULTI_V4T=y

CONFIG_ARCH_MULTI_V5=y

# CONFIG_ARCH_MULTI_V7 is not set
@@ -27,8 +25,9 @@ CONFIG_CMDLINE="console=ttyS0,115200 initrd=0x21100000,25165824 root=/dev/ram0 r 
CONFIG_KEXEC=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

# CONFIG_BLK_DEV_BSG is not set

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

# CONFIG_SWAP is not set

CONFIG_SLAB=y

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y
@@ -66,6 +65,7 @@ CONFIG_ATMEL_SSC=y 
CONFIG_EEPROM_AT24=m

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

# CONFIG_BLK_DEV_BSG is not set

# CONFIG_SCSI_LOWLEVEL is not set

CONFIG_NETDEVICES=y

# CONFIG_NET_VENDOR_BROADCOM is not set
@@ -139,9 +139,9 @@ CONFIG_MEDIA_USB_SUPPORT=y 
CONFIG_USB_VIDEO_CLASS=m

CONFIG_V4L_PLATFORM_DRIVERS=y

CONFIG_VIDEO_ATMEL_ISI=y

CONFIG_VIDEO_MT9V032=m

CONFIG_VIDEO_OV2640=m

CONFIG_VIDEO_OV7740=m

CONFIG_VIDEO_MT9V032=m

CONFIG_DRM=y

CONFIG_DRM_ATMEL_HLCDC=y

CONFIG_DRM_PANEL_SIMPLE=y
@@ -206,8 +206,8 @@ CONFIG_PWM_ATMEL=y 
CONFIG_PWM_ATMEL_HLCDC_PWM=y

CONFIG_PWM_ATMEL_TCB=y

CONFIG_EXT4_FS=y

CONFIG_AUTOFS_FS=m

CONFIG_FANOTIFY=y

CONFIG_AUTOFS_FS=m

CONFIG_VFAT_FS=y

CONFIG_TMPFS=y

CONFIG_UBIFS_FS=y