Commit e92ab510 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

ARM: defconfig: reorder defconfig files 



The debug-info and can subystem options have moved around in the
'savedefconfig' output, so fix these up to reduce the clutter
from the savedefconfig command.

Reviewed-by: default avatarClaudiu Beznea <claudiu.beznea@microchip.com>
Acked-by: default avatarJernej Skrabec <jernej.skrabec@gmail.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 568035b0

arch/arm/configs/at91_dt_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ CONFIG_IP_PNP_RARP=y 
# CONFIG_INET_DIAG is not set

CONFIG_IPV6_SIT_6RD=y

CONFIG_CAN=y

CONFIG_CAN_AT91=y

CONFIG_CFG80211=y

CONFIG_MAC80211=y

CONFIG_DEVTMPFS=y
@@ -81,6 +80,7 @@ CONFIG_DM9000=y 
# CONFIG_NET_VENDOR_STMICRO is not set

CONFIG_DAVICOM_PHY=y

CONFIG_MICREL_PHY=y

CONFIG_CAN_AT91=y

CONFIG_LIBERTAS=m

CONFIG_LIBERTAS_SDIO=m

CONFIG_LIBERTAS_SPI=m

arch/arm/configs/dove_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,6 @@ CONFIG_NLS_ISO8859_1=y 
CONFIG_NLS_ISO8859_2=y

CONFIG_NLS_UTF8=y

CONFIG_TIMER_STATS=y

CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y

CONFIG_CRYPTO_NULL=y

CONFIG_CRYPTO_ECB=m

CONFIG_CRYPTO_PCBC=m
@@ -136,6 +135,7 @@ CONFIG_CRC_CCITT=y 
CONFIG_LIBCRC32C=y

CONFIG_PRINTK_TIME=y

# CONFIG_DEBUG_BUGVERBOSE is not set

CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y

CONFIG_MAGIC_SYSRQ=y

CONFIG_DEBUG_FS=y

# CONFIG_SCHED_DEBUG is not set

arch/arm/configs/exynos_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -374,8 +374,8 @@ CONFIG_FONTS=y 
CONFIG_FONT_7x14=y

CONFIG_PRINTK_TIME=y

CONFIG_DYNAMIC_DEBUG=y

CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y

CONFIG_DEBUG_KERNEL=y

CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y

CONFIG_MAGIC_SYSRQ=y

CONFIG_DEBUG_FS=y

CONFIG_SOFTLOCKUP_DETECTOR=y

arch/arm/configs/imx_v6_v7_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,6 @@ CONFIG_IP_PNP=y 
CONFIG_IP_PNP_DHCP=y

CONFIG_NETFILTER=y

CONFIG_CAN=y

CONFIG_CAN_FLEXCAN=y

CONFIG_BT=y

CONFIG_BT_BNEP=m

CONFIG_BT_HCIUART=y
@@ -136,6 +135,7 @@ CONFIG_SMSC911X=y 
# CONFIG_NET_VENDOR_STMICRO is not set

CONFIG_MICREL_PHY=y

CONFIG_AT803X_PHY=y

CONFIG_CAN_FLEXCAN=y

CONFIG_USB_PEGASUS=m

CONFIG_USB_RTL8150=m

CONFIG_USB_RTL8152=y

arch/arm/configs/keystone_defconfig

+3 −3
Original line number Diff line number Diff line
@@ -109,8 +109,6 @@ CONFIG_IP6_NF_IPTABLES=m 
CONFIG_IP_SCTP=y

CONFIG_VLAN_8021Q=y

CONFIG_CAN=m

CONFIG_CAN_C_CAN=m

CONFIG_CAN_C_CAN_PLATFORM=m

CONFIG_PCI=y

CONFIG_PCI_MSI=y

CONFIG_DEVTMPFS=y
@@ -137,6 +135,8 @@ CONFIG_TI_KEYSTONE_NETCP_ETHSS=y 
CONFIG_MARVELL_PHY=y

CONFIG_MICREL_PHY=y

CONFIG_DP83867_PHY=y

CONFIG_CAN_C_CAN=m

CONFIG_CAN_C_CAN_PLATFORM=m

CONFIG_INPUT_EVDEV=m

CONFIG_INPUT_MISC=y

CONFIG_INPUT_GPIO_DECODER=m
@@ -224,7 +224,6 @@ CONFIG_NFSD=y 
CONFIG_NFSD_V3_ACL=y

CONFIG_NLS_CODEPAGE_437=y

CONFIG_NLS_ISO8859_1=y

CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y

CONFIG_CRYPTO_USER=y

CONFIG_CRYPTO_AUTHENC=y

CONFIG_CRYPTO_CBC=y
@@ -236,5 +235,6 @@ CONFIG_CRYPTO_USER_API_HASH=y 
CONFIG_CRYPTO_USER_API_SKCIPHER=y

CONFIG_DMA_CMA=y

CONFIG_PRINTK_TIME=y

CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y

CONFIG_DEBUG_SHIRQ=y

CONFIG_DEBUG_USER=y