Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e9e3969f authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'next/defconfig' into next/soc 

* next/defconfig: (45 commits)
  ARM: multi_v7_defconfig: make eSDHC driver built-in
  ARM: config: aspeed: Add I2C, VUART, LPC Snoop
  ARM: configs: aspeed: Update Aspeed G4 with VMSPLIT_2G
  ARM: davinci_all_defconfig: enable tinydrm and ST7586
  ARM: defconfig: tegra: Enable ChipIdea UDC driver
  ARM: configs: Add Tegra I2S interfaces to multi_v7_defconfig
  ARM: tegra: Add Tegra I2S interfaces to defconfig
  ARM: tegra: Update default configuration for v4.13-rc1
  ARM: multi_v7_defconfig: add CONFIG_BRCMSTB_THERMAL
  ARM: omap2plus_defconfig: Enable LP87565
  ARM: omap2plus_defconfig: enable DP83867 phy driver
  ARM: configs: keystone: Enable D_CAN driver
  ARM: shmobile: Enable BQ32000 rtc in shmobile_defconfig
  ARM: configs: keystone: Enable MMC and regulators
  ARM: multi_v7_defconfig: Enable DMA for Renesas serial ports
  ARM: multi_v7_defconfig: Replace DRM_RCAR_HDMI by generic bridge options
  ARM: multi_v7_defconfig: Replace SND_SOC_RSRC_CARD by SND_SIMPLE_SCU_CARD
  ARM: shmobile: defconfig: Refresh
  ARM: shmobile: defconfig: Enable DMA for serial ports
  ARM: shmobile: defconfig: Replace DRM_RCAR_HDMI by generic bridge options
  ...
parents 826e08d3 152b8126

arch/arm/configs/aspeed_g4_defconfig

+4 −1
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ CONFIG_MODULE_UNLOAD=y 
# CONFIG_ARCH_MULTI_V7 is not set

CONFIG_ARCH_ASPEED=y

CONFIG_MACH_ASPEED_G4=y

CONFIG_VMSPLIT_2G=y

CONFIG_AEABI=y

# CONFIG_CPU_SW_DOMAIN_PAN is not set

# CONFIG_COMPACTION is not set
@@ -64,6 +65,7 @@ CONFIG_MTD_UBI_FASTMAP=y 
CONFIG_MTD_UBI_BLOCK=y

CONFIG_BLK_DEV_RAM=y

CONFIG_ASPEED_LPC_CTRL=y

CONFIG_ASPEED_LPC_SNOOP=y

CONFIG_EEPROM_AT24=y

CONFIG_NETDEVICES=y

CONFIG_NETCONSOLE=y
@@ -104,6 +106,7 @@ CONFIG_SERIAL_8250_CONSOLE=y 
CONFIG_SERIAL_8250_NR_UARTS=6

CONFIG_SERIAL_8250_RUNTIME_UARTS=6

CONFIG_SERIAL_8250_EXTENDED=y

CONFIG_SERIAL_8250_ASPEED_VUART=y

CONFIG_SERIAL_8250_SHARE_IRQ=y

CONFIG_SERIAL_OF_PLATFORM=y

CONFIG_ASPEED_BT_IPMI_BMC=y
@@ -114,6 +117,7 @@ CONFIG_I2C_CHARDEV=y 
CONFIG_I2C_MUX=y

CONFIG_I2C_MUX_PCA9541=y

CONFIG_I2C_MUX_PCA954x=y

CONFIG_I2C_ASPEED=y

CONFIG_GPIOLIB=y

CONFIG_GPIO_SYSFS=y

CONFIG_GPIO_ASPEED=y
@@ -166,7 +170,6 @@ CONFIG_PRINTK_TIME=y 
CONFIG_DYNAMIC_DEBUG=y

CONFIG_STRIP_ASM_SYMS=y

CONFIG_DEBUG_FS=y

CONFIG_LOCKUP_DETECTOR=y

CONFIG_WQ_WATCHDOG=y

CONFIG_PANIC_TIMEOUT=-1

# CONFIG_SCHED_DEBUG is not set

arch/arm/configs/aspeed_g5_defconfig

+3 −1
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ CONFIG_MTD_UBI_FASTMAP=y 
CONFIG_MTD_UBI_BLOCK=y

CONFIG_BLK_DEV_RAM=y

CONFIG_ASPEED_LPC_CTRL=y

CONFIG_ASPEED_LPC_SNOOP=y

CONFIG_EEPROM_AT24=y

CONFIG_NETDEVICES=y

CONFIG_NETCONSOLE=y
@@ -107,6 +108,7 @@ CONFIG_SERIAL_8250_CONSOLE=y 
CONFIG_SERIAL_8250_NR_UARTS=6

CONFIG_SERIAL_8250_RUNTIME_UARTS=6

CONFIG_SERIAL_8250_EXTENDED=y

CONFIG_SERIAL_8250_ASPEED_VUART=y

CONFIG_SERIAL_8250_SHARE_IRQ=y

CONFIG_SERIAL_OF_PLATFORM=y

CONFIG_ASPEED_BT_IPMI_BMC=y
@@ -117,6 +119,7 @@ CONFIG_I2C_CHARDEV=y 
CONFIG_I2C_MUX=y

CONFIG_I2C_MUX_PCA9541=y

CONFIG_I2C_MUX_PCA954x=y

CONFIG_I2C_ASPEED=y

CONFIG_GPIOLIB=y

CONFIG_GPIO_SYSFS=y

CONFIG_GPIO_ASPEED=y
@@ -169,7 +172,6 @@ CONFIG_PRINTK_TIME=y 
CONFIG_DYNAMIC_DEBUG=y

CONFIG_STRIP_ASM_SYMS=y

CONFIG_DEBUG_FS=y

CONFIG_LOCKUP_DETECTOR=y

CONFIG_WQ_WATCHDOG=y

CONFIG_PANIC_TIMEOUT=-1

# CONFIG_SCHED_DEBUG is not set

arch/arm/configs/bcm2835_defconfig

+7 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ CONFIG_DEVTMPFS=y 
CONFIG_DEVTMPFS_MOUNT=y

# CONFIG_STANDALONE is not set

CONFIG_DMA_CMA=y

CONFIG_CMA_SIZE_MBYTES=32

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

CONFIG_SCSI_CONSTANTS=y
@@ -62,9 +63,15 @@ CONFIG_SCSI_SCAN_ASYNC=y 
CONFIG_NETDEVICES=y

CONFIG_USB_USBNET=y

CONFIG_USB_NET_SMSC95XX=y

CONFIG_BRCMFMAC=m

CONFIG_ZD1211RW=y

CONFIG_INPUT_EVDEV=y

# CONFIG_LEGACY_PTYS is not set

CONFIG_SERIAL_8250=y

CONFIG_SERIAL_8250_CONSOLE=y

CONFIG_SERIAL_8250_EXTENDED=y

CONFIG_SERIAL_8250_SHARE_IRQ=y

CONFIG_SERIAL_8250_BCM2835AUX=y

CONFIG_SERIAL_AMBA_PL011=y

CONFIG_SERIAL_AMBA_PL011_CONSOLE=y

CONFIG_TTY_PRINTK=y

arch/arm/configs/davinci_all_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -143,6 +143,8 @@ CONFIG_VIDEO_ADV7343=m 
CONFIG_DRM=m

CONFIG_DRM_TILCDC=m

CONFIG_DRM_DUMB_VGA_DAC=m

CONFIG_DRM_TINYDRM=m

CONFIG_TINYDRM_ST7586=m

CONFIG_FB=y

CONFIG_FIRMWARE_EDID=y

CONFIG_FB_DA8XX=y

arch/arm/configs/exynos_defconfig

+73 −6
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ CONFIG_NO_HZ=y 
CONFIG_HIGH_RES_TIMERS=y

CONFIG_CGROUPS=y

CONFIG_BLK_DEV_INITRD=y

CONFIG_KALLSYMS_ALL=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

CONFIG_PARTITION_ADVANCED=y
@@ -48,7 +47,43 @@ CONFIG_IP_PNP=y 
CONFIG_IP_PNP_DHCP=y

CONFIG_IP_PNP_BOOTP=y

CONFIG_IP_PNP_RARP=y

CONFIG_BT=m

CONFIG_BT_RFCOMM=m

CONFIG_BT_RFCOMM_TTY=y

CONFIG_BT_BNEP=m

CONFIG_BT_BNEP_MC_FILTER=y

CONFIG_BT_BNEP_PROTO_FILTER=y

CONFIG_BT_HIDP=m

CONFIG_BT_LEDS=y

CONFIG_BT_HCIBTUSB=m

CONFIG_BT_HCIBTSDIO=m

CONFIG_BT_HCIUART=m

CONFIG_BT_HCIUART_BCSP=y

CONFIG_BT_HCIUART_ATH3K=y

CONFIG_BT_HCIUART_3WIRE=y

CONFIG_BT_HCIUART_INTEL=y

CONFIG_BT_HCIUART_BCM=y

CONFIG_BT_HCIUART_QCA=y

CONFIG_BT_HCIUART_AG6XX=y

CONFIG_BT_HCIUART_MRVL=y

CONFIG_BT_HCIBCM203X=m

CONFIG_BT_HCIBPA10X=m

CONFIG_BT_HCIBFUSB=m

CONFIG_BT_HCIVHCI=m

CONFIG_BT_MRVL=m

CONFIG_BT_MRVL_SDIO=m

CONFIG_BT_ATH3K=m

CONFIG_CFG80211=y

CONFIG_MAC80211=y

CONFIG_MAC80211_LEDS=y

CONFIG_NFC=y

CONFIG_NFC_DIGITAL=m

CONFIG_NFC_NCI=y

CONFIG_NFC_NCI_SPI=m

CONFIG_NFC_NCI_UART=m

CONFIG_NFC_HCI=m

CONFIG_NFC_SHDLC=y

CONFIG_NFC_S3FWRN5_I2C=y

CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y

CONFIG_DMA_CMA=y
@@ -65,7 +100,9 @@ CONFIG_BLK_DEV_DM=y 
CONFIG_DM_CRYPT=m

CONFIG_NETDEVICES=y

CONFIG_SMSC911X=y

CONFIG_USB_RTL8150=m

CONFIG_USB_RTL8152=y

CONFIG_USB_LAN78XX=m

CONFIG_USB_USBNET=y

CONFIG_USB_NET_SMSC75XX=y

CONFIG_USB_NET_SMSC95XX=y
@@ -189,7 +226,25 @@ CONFIG_USB_EHCI_HCD=y 
CONFIG_USB_EHCI_EXYNOS=y

CONFIG_USB_OHCI_HCD=y

CONFIG_USB_OHCI_EXYNOS=y

CONFIG_USB_ACM=m

CONFIG_USB_PRINTER=m

CONFIG_USB_WDM=m

CONFIG_USB_TMC=m

CONFIG_USB_STORAGE=y

CONFIG_USB_STORAGE_REALTEK=m

CONFIG_USB_STORAGE_DATAFAB=m

CONFIG_USB_STORAGE_FREECOM=m

CONFIG_USB_STORAGE_ISD200=m

CONFIG_USB_STORAGE_USBAT=m

CONFIG_USB_STORAGE_SDDR09=m

CONFIG_USB_STORAGE_SDDR55=m

CONFIG_USB_STORAGE_JUMPSHOT=m

CONFIG_USB_STORAGE_ALAUDA=m

CONFIG_USB_STORAGE_ONETOUCH=m

CONFIG_USB_STORAGE_KARMA=m

CONFIG_USB_STORAGE_CYPRESS_ATACB=m

CONFIG_USB_STORAGE_ENE_UB6250=m

CONFIG_USB_UAS=m

CONFIG_USB_DWC3=y

CONFIG_USB_DWC2=y

CONFIG_USB_HSIC_USB3503=y
@@ -209,7 +264,6 @@ CONFIG_LEDS_GPIO=y 
CONFIG_LEDS_PWM=y

CONFIG_LEDS_MAX77693=y

CONFIG_LEDS_MAX8997=y

CONFIG_LEDS_TRIGGERS=y

CONFIG_LEDS_TRIGGER_HEARTBEAT=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_MAX8997=y
@@ -253,18 +307,30 @@ CONFIG_ROOT_NFS=y 
CONFIG_NLS_CODEPAGE_437=y

CONFIG_NLS_ASCII=y

CONFIG_NLS_ISO8859_1=y

CONFIG_NLS_UTF8=y

CONFIG_PRINTK_TIME=y

CONFIG_DYNAMIC_DEBUG=y

CONFIG_DEBUG_INFO=y

CONFIG_DEBUG_FS=y

CONFIG_MAGIC_SYSRQ=y

CONFIG_DEBUG_KERNEL=y

CONFIG_LOCKUP_DETECTOR=y

CONFIG_DEBUG_RT_MUTEXES=y

CONFIG_DEBUG_SPINLOCK=y

CONFIG_DEBUG_MUTEXES=y

CONFIG_SOFTLOCKUP_DETECTOR=y

# CONFIG_DETECT_HUNG_TASK is not set

CONFIG_PROVE_LOCKING=y

CONFIG_DEBUG_ATOMIC_SLEEP=y

CONFIG_DEBUG_USER=y

CONFIG_CRYPTO_RSA=m

CONFIG_CRYPTO_DH=m

CONFIG_CRYPTO_USER=m

CONFIG_CRYPTO_TEST=m

CONFIG_CRYPTO_LRW=m

CONFIG_CRYPTO_XTS=m

CONFIG_CRYPTO_MD5=m

CONFIG_CRYPTO_SHA512=m

CONFIG_CRYPTO_SHA3=m

CONFIG_CRYPTO_SALSA20=m

CONFIG_CRYPTO_LZO=m

CONFIG_CRYPTO_LZ4=m

CONFIG_CRYPTO_USER_API_HASH=m

CONFIG_CRYPTO_USER_API_SKCIPHER=m

CONFIG_CRYPTO_USER_API_RNG=m
@@ -276,6 +342,7 @@ CONFIG_CRYPTO_SHA1_ARM_NEON=m 
CONFIG_CRYPTO_SHA256_ARM=m

CONFIG_CRYPTO_SHA512_ARM=m

CONFIG_CRYPTO_AES_ARM_BS=m

CONFIG_CRYPTO_CHACHA20_NEON=m

CONFIG_CRC_CCITT=y

CONFIG_FONTS=y

CONFIG_FONT_7x14=y