Commit 839ddb93 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'arm/defconfig-cleanup' into arm/defconfig 

I have continued the cleanup of the multi_*_defconfig files, and
reordered the other files according to the 'make savedefconfig'
output as before.

Since a third of the defconfig files are for machines that
are now marked as unused, I skipped those files. There are still
a few things that get removed by 'make savedefconfig' as they
now get selected by some driver:

-CONFIG_SERIAL_BCM63XX=y
-CONFIG_SND_AUDIO_GRAPH_CARD=m
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_TEGRA20_APB_DMA=y

I think for those we should follow up with patches to remove the
'select' statements.

* arm/defconfig-cleanup:
  ARM: defconfig: fix CONFIG_SND_SOC_AC97_CODEC name
  ARM: defconfig: drop CONFIG_MICROCHIP_PIT64B
  ARM: defconfig: drop CONFIG_USB_FSL_USB2
  ARM: defconfig: drop CONFIG_SND_SOC_FSL_SAI
  ARM: defconfig: drop CONFIG_PTP_1588_CLOCK=y
  ARM: defconfig: drop CONFIG_DRM_RCAR_LVDS
  ARM: defconfig: drop CONFIG_SERIAL_OMAP references
  ARM: defconfig: drop CONFIG_NET_VENDOR_ASIX=y
  ARM: defconfig: clean up multi_v4t and multi_v5 configs
  ARM: defconfig: reorder defconfig files
parents b90cb105 8bd2b56b

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 −4
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
@@ -152,7 +152,6 @@ CONFIG_SPI=y 
CONFIG_SPI_CADENCE_QUADSPI=y

CONFIG_SPI_DAVINCI=y

CONFIG_SPI_SPIDEV=y

CONFIG_PTP_1588_CLOCK=y

CONFIG_PINCTRL_SINGLE=y

CONFIG_GPIOLIB=y

CONFIG_GPIO_SYSFS=y
@@ -224,7 +223,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 +234,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