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

Commit 54fff785 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc 

Pull ARM SoC defconfig updates from Arnd Bergmann:
 "Defconfig additions, removals, etc. Almost all of them just turn on
  drivers that we want on some platform, usually after the driver has
  been merged into mainline.

  There is now a new defconfig file for tango4"

* tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (44 commits)
  ARM: multi_v7_defconfig: enable pstore configs
  ARM: multi_v7_defconfig: enable some newly added crypto modules
  ARM: davinci_all_defconfig: enable SATA modules
  arm64: defconfig: enable CONFIG_MTD_NAND and CONFIG_MTD_NAND_DENALI_DT
  arm64: defconfig: enable CONFIG_MTD_BLOCK
  ARM: Import tango4_defconfig
  ARM: omap2plus_defconfig: Enable support for RTC M41T80
  ARM: omap2plus_defconfig: Enable support for micrell phys
  ARM: vf610m4: defconfig: enable EXT4 filesystem
  ARM: omap2plus_defconfig: Fix probe errors on UARTs 5 and 6
  arm64: defconfig: Enable NUMA and NUMA_BALANCING
  arm64: defconfig: enable SMMUv3 config
  ARM: davinci_all_defconfig: enable iio
  ARM: Keystone: Enable ARCH_HAS_RESET_CONTROLLER
  ARM: configs: stm32: Add RTC support in STM32 defconfig
  ARM: defconfig: qcom: add APQ8060 DragonBoard devices
  ARM: qcom_defconfig: enable thermal sensors
  ARM: qcom_defconfig: add ahci configs
  ARM: qcom_defconfig: add pcie and atl1c ethernet configs
  ARM: qcom_defconfig: add usb related configs
  ...
parents c35675f3 ddf5cf02

arch/arm/configs/aspeed_g4_defconfig

+34 −4
Original line number Diff line number Diff line
@@ -28,22 +28,49 @@ CONFIG_MACH_ASPEED_G4=y 
CONFIG_AEABI=y

CONFIG_UACCESS_WITH_MEMCPY=y

CONFIG_SECCOMP=y

# CONFIG_ATAGS is not set

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_ARM_APPENDED_DTB=y

CONFIG_ARM_ATAG_DTB_COMPAT=y

CONFIG_KEXEC=y

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

CONFIG_NET=y

CONFIG_INET=y

CONFIG_NET_NCSI=y

# CONFIG_WIRELESS is not set

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y

# CONFIG_PREVENT_FIRMWARE_BUILD is not set

CONFIG_NETDEVICES=y

# CONFIG_NET_VENDOR_ALACRITECH is not set

# CONFIG_NET_VENDOR_AMAZON is not set

# CONFIG_NET_VENDOR_ARC is not set

# CONFIG_NET_CADENCE is not set

# CONFIG_NET_VENDOR_BROADCOM is not set

# CONFIG_NET_VENDOR_CIRRUS is not set

# CONFIG_NET_VENDOR_EZCHIP is not set

CONFIG_FTGMAC100=y

# CONFIG_NET_VENDOR_HISILICON is not set

# CONFIG_NET_VENDOR_INTEL is not set

# CONFIG_NET_VENDOR_MARVELL is not set

# CONFIG_NET_VENDOR_MICREL is not set

# CONFIG_NET_VENDOR_NATSEMI is not set

# CONFIG_NET_VENDOR_NETRONOME is not set

# CONFIG_NET_VENDOR_QUALCOMM is not set

# CONFIG_NET_VENDOR_RENESAS is not set

# CONFIG_NET_VENDOR_ROCKER is not set

# CONFIG_NET_VENDOR_SAMSUNG is not set

# CONFIG_NET_VENDOR_SEEQ is not set

# CONFIG_NET_VENDOR_SOLARFLARE is not set

# CONFIG_NET_VENDOR_SMSC is not set

# CONFIG_NET_VENDOR_STMICRO is not set

# CONFIG_NET_VENDOR_SYNOPSYS is not set

# CONFIG_NET_VENDOR_VIA is not set

# CONFIG_NET_VENDOR_WIZNET is not set

# CONFIG_WLAN is not set

# CONFIG_INPUT is not set

# CONFIG_SERIO is not set

# CONFIG_VT is not set

# CONFIG_LEGACY_PTYS is not set

# CONFIG_DEVKMEM is not set

CONFIG_SERIAL_8250=y

# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set

CONFIG_SERIAL_8250_CONSOLE=y
@@ -52,7 +79,10 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=6 
CONFIG_SERIAL_8250_EXTENDED=y

CONFIG_SERIAL_8250_SHARE_IRQ=y

CONFIG_SERIAL_OF_PLATFORM=y

CONFIG_ASPEED_BT_IPMI_BMC=y

# CONFIG_HW_RANDOM is not set

CONFIG_GPIOLIB=y

CONFIG_GPIO_ASPEED=y

# CONFIG_USB_SUPPORT is not set

# CONFIG_IOMMU_SUPPORT is not set

CONFIG_FIRMWARE_MEMMAP=y

arch/arm/configs/aspeed_g5_defconfig

+37 −1
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ CONFIG_ARCH_MULTI_V6=y 
# CONFIG_ARCH_MULTI_V7 is not set

CONFIG_ARCH_ASPEED=y

CONFIG_MACH_ASPEED_G5=y

CONFIG_VMSPLIT_2G=y

CONFIG_AEABI=y

CONFIG_UACCESS_WITH_MEMCPY=y

CONFIG_SECCOMP=y
@@ -36,15 +37,46 @@ CONFIG_ARM_APPENDED_DTB=y 
CONFIG_ARM_ATAG_DTB_COMPAT=y

CONFIG_KEXEC=y

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

CONFIG_NET=y

CONFIG_UNIX=y

CONFIG_INET=y

CONFIG_NET_NCSI=y

# CONFIG_WIRELESS is not set

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y

# CONFIG_PREVENT_FIRMWARE_BUILD is not set

CONFIG_NETDEVICES=y

# CONFIG_NET_VENDOR_ALACRITECH is not set

# CONFIG_NET_VENDOR_AMAZON is not set

# CONFIG_NET_VENDOR_ARC is not set

# CONFIG_NET_CADENCE is not set

# CONFIG_NET_VENDOR_BROADCOM is not set

# CONFIG_NET_VENDOR_CIRRUS is not set

# CONFIG_NET_VENDOR_EZCHIP is not set

CONFIG_FTGMAC100=y

# CONFIG_NET_VENDOR_HISILICON is not set

# CONFIG_NET_VENDOR_INTEL is not set

# CONFIG_NET_VENDOR_MARVELL is not set

# CONFIG_NET_VENDOR_MICREL is not set

# CONFIG_NET_VENDOR_NATSEMI is not set

# CONFIG_NET_VENDOR_NETRONOME is not set

# CONFIG_NET_VENDOR_QUALCOMM is not set

# CONFIG_NET_VENDOR_RENESAS is not set

# CONFIG_NET_VENDOR_ROCKER is not set

# CONFIG_NET_VENDOR_SAMSUNG is not set

# CONFIG_NET_VENDOR_SEEQ is not set

# CONFIG_NET_VENDOR_SOLARFLARE is not set

# CONFIG_NET_VENDOR_SMSC is not set

# CONFIG_NET_VENDOR_STMICRO is not set

# CONFIG_NET_VENDOR_SYNOPSYS is not set

# CONFIG_NET_VENDOR_VIA is not set

# CONFIG_NET_VENDOR_WIZNET is not set

# CONFIG_WLAN is not set

# CONFIG_INPUT is not set

# CONFIG_SERIO is not set

# CONFIG_VT is not set

# CONFIG_LEGACY_PTYS is not set

# CONFIG_DEVKMEM is not set

CONFIG_SERIAL_8250=y

# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set

CONFIG_SERIAL_8250_CONSOLE=y
@@ -53,7 +85,10 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=6 
CONFIG_SERIAL_8250_EXTENDED=y

CONFIG_SERIAL_8250_SHARE_IRQ=y

CONFIG_SERIAL_OF_PLATFORM=y

CONFIG_ASPEED_BT_IPMI_BMC=y

# CONFIG_HW_RANDOM is not set

CONFIG_GPIOLIB=y

CONFIG_GPIO_ASPEED=y

# CONFIG_USB_SUPPORT is not set

# CONFIG_IOMMU_SUPPORT is not set

CONFIG_FIRMWARE_MEMMAP=y
@@ -82,6 +117,7 @@ CONFIG_DEBUG_UART_VIRT=0xe8784000 
CONFIG_EARLY_PRINTK=y

CONFIG_STRICT_MODULE_RWX=y

CONFIG_STRICT_KERNEL_RWX=y

CONFIG_CRYPTO_ECHAINIV=y

# CONFIG_XZ_DEC_X86 is not set

# CONFIG_XZ_DEC_POWERPC is not set

# CONFIG_XZ_DEC_IA64 is not set

arch/arm/configs/davinci_all_defconfig

+23 −0
Original line number Diff line number Diff line
@@ -78,6 +78,8 @@ CONFIG_IDE=m 
CONFIG_BLK_DEV_PALMCHIP_BK3710=m

CONFIG_SCSI=m

CONFIG_BLK_DEV_SD=m

CONFIG_ATA=m

CONFIG_AHCI_DA850=m

CONFIG_NETDEVICES=y

CONFIG_NETCONSOLE=y

CONFIG_TUN=m
@@ -100,6 +102,7 @@ CONFIG_KEYBOARD_XTKBD=m 
# CONFIG_INPUT_MOUSE is not set

CONFIG_INPUT_TOUCHSCREEN=y

CONFIG_INPUT_MISC=y

CONFIG_INPUT_PWM_BEEPER=m

CONFIG_INPUT_DM355EVM=m

CONFIG_SERIO_LIBPS2=y

# CONFIG_VT_CONSOLE is not set
@@ -114,6 +117,7 @@ CONFIG_I2C_CHARDEV=y 
CONFIG_I2C_DAVINCI=y

CONFIG_SPI=y

CONFIG_SPI_DAVINCI=m

CONFIG_PINCTRL_DA850_PUPD=m

CONFIG_PINCTRL_SINGLE=y

CONFIG_GPIO_SYSFS=y

CONFIG_GPIO_PCA953X=y
@@ -126,8 +130,15 @@ CONFIG_TPS6507X=y 
CONFIG_REGULATOR=y

CONFIG_REGULATOR_FIXED_VOLTAGE=y

CONFIG_REGULATOR_TPS6507X=y

CONFIG_MEDIA_SUPPORT=m

CONFIG_MEDIA_CAMERA_SUPPORT=y

CONFIG_V4L_PLATFORM_DRIVERS=y

CONFIG_VIDEO_DAVINCI_VPIF_CAPTURE=m

# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set

CONFIG_VIDEO_TVP514X=m

CONFIG_DRM=m

CONFIG_DRM_TILCDC=m

CONFIG_DRM_DUMB_VGA_DAC=m

CONFIG_FB=y

CONFIG_FIRMWARE_EDID=y

CONFIG_FB_DA8XX=y
@@ -192,6 +203,18 @@ CONFIG_TI_EDMA=y 
CONFIG_MEMORY=y

CONFIG_TI_AEMIF=m

CONFIG_DA8XX_DDRCTL=y

CONFIG_IIO=m

CONFIG_IIO_BUFFER=y

CONFIG_IIO_BUFFER_CB=m

CONFIG_IIO_KFIFO_BUF=m

CONFIG_IIO_TRIGGER=y

CONFIG_IIO_SW_DEVICE=m

CONFIG_IIO_SW_TRIGGER=m

CONFIG_IIO_HRTIMER_TRIGGER=m

CONFIG_IIO_SYSFS_TRIGGER=m

CONFIG_PWM=y

CONFIG_PWM_TIECAP=m

CONFIG_PWM_TIEHRPWM=m

CONFIG_EXT2_FS=y

CONFIG_EXT3_FS=y

CONFIG_EXT4_FS_POSIX_ACL=y

arch/arm/configs/exynos_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ CONFIG_PACKET=y 
CONFIG_UNIX=y

CONFIG_NET_KEY=y

CONFIG_INET=y

CONFIG_IP_MULTICAST=y

CONFIG_IP_PNP=y

CONFIG_IP_PNP_DHCP=y

CONFIG_IP_PNP_BOOTP=y

arch/arm/configs/imx_v6_v7_defconfig

+2 −2
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ CONFIG_BT_HCIUART=y 
CONFIG_BT_HCIUART_H4=y

CONFIG_BT_HCIUART_LL=y

CONFIG_CFG80211=y

CONFIG_CFG80211_WEXT=y

CONFIG_MAC80211=y

CONFIG_RFKILL=y

CONFIG_RFKILL_INPUT=y
@@ -174,7 +175,6 @@ CONFIG_INPUT_MISC=y 
CONFIG_INPUT_MMA8450=y

CONFIG_SERIO_SERPORT=m

# CONFIG_LEGACY_PTYS is not set

# CONFIG_DEVKMEM is not set

CONFIG_SERIAL_IMX=y

CONFIG_SERIAL_IMX_CONSOLE=y

CONFIG_SERIAL_FSL_LPUART=y
@@ -194,11 +194,11 @@ CONFIG_GPIO_SYSFS=y 
CONFIG_GPIO_MC9S08DZ60=y

CONFIG_GPIO_PCA953X=y

CONFIG_GPIO_STMPE=y

CONFIG_POWER_SUPPLY=y

CONFIG_POWER_RESET=y

CONFIG_POWER_RESET_IMX=y

CONFIG_POWER_RESET_SYSCON=y

CONFIG_POWER_RESET_SYSCON_POWEROFF=y

CONFIG_POWER_SUPPLY=y

CONFIG_SENSORS_GPIO_FAN=y

CONFIG_SENSORS_IIO_HWMON=y

CONFIG_THERMAL=y