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

Commit 9797f6b0 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:
 "As usual, a bunch of commits, mostly adding drivers and other options
  to defconfigs.

  We are adding three new defconfig files for the newly added 32-bit
  machines (aspeed and mps2), the rest is mainly housekeeping.

  The changes outside of arch/arm/config/ are for a Kconfig symbol that
  got renamed"

* tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (63 commits)
  ARM: aspeed: adapt defconfigs for new CONFIG_PRINTK_TIME
  ARM: u8500_defconfig: update sensor config
  ARM: u8500_defconfig: remove staging from defconfig
  ARM: multi_v7_defconfig: Remove unused Kconfig option MACH_UX500_DT
  ARM: at91/defconfig: sama5: add CONFIG_FHANDLE
  arm/configs: Add Aspeed defconfig
  arm/configs/multi_v5: Add Aspeed ast2400
  ARM: at91: sama5: Update defconfig
  ARM: imx_v6_v7_defconfig: add CONFIG_MICREL_PHY
  ARM: imx_v6_v7_defconfig: add CONFIG_I2C_GPIO
  ARM: multi_v7: Enable Tegra XUSB controller in defconfig
  ARM: tegra: Enable XUSB controller in defconfig
  ARM: omap2plus_defconfig: Enable PWM and ir-rx51 as loadable modules
  ARM: multi_v7_defconfig: add the Atmel sama5d2-compatible ADC driver
  ARM: multi_v7_defconfig: add the Atmel Audio microphone interface PDMIC
  ARM: multi_v7_defconfig: add Atmel ISI (Image Sensor Interface) driver
  ARM: multi_v7_defconfig: add Atmel watchdog timers
  ARM: multi_v7_defconfig: add HLCDC drivers as modules
  ARM: at91/defconfig: add PDMIC driver to sama5_defconfig
  ARM: at91/defconfig: add HLCDC driver to sama5_defconfig
  ...
parents 2ec3240f 0ef659a3

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -1354,7 +1354,7 @@ F: arch/arm/boot/dts/armada* 
F:	arch/arm/boot/dts/kirkwood*

F:	arch/arm64/boot/dts/marvell/armada*

F:	drivers/cpufreq/mvebu-cpufreq.c



F:	arch/arm/configs/mvebu_*_defconfig



ARM/Marvell Berlin SoC support

M:	Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>

arch/arm/configs/aspeed_g4_defconfig

0 → 100644
+86 −0
Original line number Diff line number Diff line 
CONFIG_KERNEL_XZ=y

CONFIG_SYSVIPC=y

CONFIG_USELIB=y

CONFIG_IRQ_DOMAIN_DEBUG=y

CONFIG_NO_HZ_IDLE=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_LOG_BUF_SHIFT=14

CONFIG_CGROUPS=y

CONFIG_BLK_DEV_INITRD=y

# CONFIG_RD_BZIP2 is not set

# CONFIG_RD_LZMA is not set

# CONFIG_RD_LZO is not set

# CONFIG_RD_LZ4 is not set

CONFIG_CC_OPTIMIZE_FOR_SIZE=y

CONFIG_BPF_SYSCALL=y

# CONFIG_SHMEM is not set

# CONFIG_AIO is not set

CONFIG_EMBEDDED=y

# CONFIG_COMPAT_BRK is not set

CONFIG_SLAB=y

CONFIG_CC_STACKPROTECTOR_STRONG=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

# CONFIG_BLOCK is not set

# CONFIG_ARCH_MULTI_V7 is not set

CONFIG_ARCH_ASPEED=y

CONFIG_MACH_ASPEED_G4=y

CONFIG_DEBUG_RODATA=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_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y

# CONFIG_PREVENT_FIRMWARE_BUILD 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

CONFIG_SERIAL_8250_NR_UARTS=6

CONFIG_SERIAL_8250_RUNTIME_UARTS=6

CONFIG_SERIAL_8250_EXTENDED=y

CONFIG_SERIAL_8250_SHARE_IRQ=y

CONFIG_SERIAL_OF_PLATFORM=y

# CONFIG_HW_RANDOM is not set

# CONFIG_USB_SUPPORT is not set

# CONFIG_IOMMU_SUPPORT is not set

CONFIG_FIRMWARE_MEMMAP=y

CONFIG_FANOTIFY=y

CONFIG_PRINTK_TIME=1

CONFIG_DYNAMIC_DEBUG=y

CONFIG_STRIP_ASM_SYMS=y

CONFIG_PAGE_POISONING=y

CONFIG_DEBUG_KMEMLEAK=y

CONFIG_DEBUG_SHIRQ=y

CONFIG_LOCKUP_DETECTOR=y

CONFIG_WQ_WATCHDOG=y

# CONFIG_SCHED_DEBUG is not set

CONFIG_SCHED_STACK_END_CHECK=y

CONFIG_DEBUG_RT_MUTEXES=y

CONFIG_DEBUG_WW_MUTEX_SLOWPATH=y

# CONFIG_FTRACE is not set

CONFIG_MEMTEST=y

CONFIG_UBSAN=y

CONFIG_DEBUG_USER=y

CONFIG_DEBUG_LL=y

CONFIG_DEBUG_LL_UART_8250=y

CONFIG_DEBUG_UART_PHYS=0x1e784000

CONFIG_DEBUG_UART_VIRT=0xe8784000

CONFIG_EARLY_PRINTK=y

CONFIG_DEBUG_SET_MODULE_RONX=y

# CONFIG_XZ_DEC_X86 is not set

# CONFIG_XZ_DEC_POWERPC is not set

# CONFIG_XZ_DEC_IA64 is not set

# CONFIG_XZ_DEC_SPARC is not set

arch/arm/configs/aspeed_g5_defconfig

0 → 100644
+88 −0
Original line number Diff line number Diff line 
CONFIG_KERNEL_XZ=y

CONFIG_SYSVIPC=y

CONFIG_USELIB=y

CONFIG_IRQ_DOMAIN_DEBUG=y

CONFIG_NO_HZ_IDLE=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_LOG_BUF_SHIFT=14

CONFIG_CGROUPS=y

CONFIG_BLK_DEV_INITRD=y

# CONFIG_RD_BZIP2 is not set

# CONFIG_RD_LZMA is not set

# CONFIG_RD_LZO is not set

# CONFIG_RD_LZ4 is not set

CONFIG_CC_OPTIMIZE_FOR_SIZE=y

CONFIG_BPF_SYSCALL=y

# CONFIG_SHMEM is not set

# CONFIG_AIO is not set

CONFIG_EMBEDDED=y

# CONFIG_COMPAT_BRK is not set

CONFIG_SLAB=y

CONFIG_CC_STACKPROTECTOR_STRONG=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

# CONFIG_BLOCK is not set

CONFIG_ARCH_MULTI_V6=y

# CONFIG_ARCH_MULTI_V7 is not set

CONFIG_ARCH_ASPEED=y

CONFIG_MACH_ASPEED_G5=y

CONFIG_DEBUG_RODATA=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_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y

# CONFIG_PREVENT_FIRMWARE_BUILD 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

CONFIG_SERIAL_8250_NR_UARTS=6

CONFIG_SERIAL_8250_RUNTIME_UARTS=6

CONFIG_SERIAL_8250_EXTENDED=y

CONFIG_SERIAL_8250_SHARE_IRQ=y

CONFIG_SERIAL_OF_PLATFORM=y

# CONFIG_HW_RANDOM is not set

# CONFIG_USB_SUPPORT is not set

# CONFIG_IOMMU_SUPPORT is not set

CONFIG_FIRMWARE_MEMMAP=y

CONFIG_FANOTIFY=y

CONFIG_PRINTK_TIME=1

CONFIG_DYNAMIC_DEBUG=y

CONFIG_STRIP_ASM_SYMS=y

CONFIG_PAGE_POISONING=y

CONFIG_DEBUG_KMEMLEAK=y

CONFIG_DEBUG_SHIRQ=y

CONFIG_LOCKUP_DETECTOR=y

CONFIG_WQ_WATCHDOG=y

# CONFIG_SCHED_DEBUG is not set

CONFIG_SCHED_STACK_END_CHECK=y

CONFIG_DEBUG_RT_MUTEXES=y

CONFIG_DEBUG_WW_MUTEX_SLOWPATH=y

# CONFIG_FTRACE is not set

CONFIG_MEMTEST=y

CONFIG_UBSAN=y

CONFIG_UBSAN_ALIGNMENT=y

CONFIG_DEBUG_USER=y

CONFIG_DEBUG_LL=y

CONFIG_DEBUG_LL_UART_8250=y

CONFIG_DEBUG_UART_PHYS=0x1e784000

CONFIG_DEBUG_UART_VIRT=0xe8784000

CONFIG_EARLY_PRINTK=y

CONFIG_DEBUG_SET_MODULE_RONX=y

# CONFIG_XZ_DEC_X86 is not set

# CONFIG_XZ_DEC_POWERPC is not set

# CONFIG_XZ_DEC_IA64 is not set

# CONFIG_XZ_DEC_SPARC is not set

arch/arm/configs/bcm2835_defconfig

+7 −4
Original line number Diff line number Diff line
@@ -38,10 +38,13 @@ CONFIG_CRASH_DUMP=y 
CONFIG_VFP=y

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

# CONFIG_SUSPEND is not set

CONFIG_PM=y

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_INET=y

CONFIG_IP_PNP=y

CONFIG_IP_PNP_DHCP=y

CONFIG_NETWORK_SECMARK=y

CONFIG_NETFILTER=y

CONFIG_CFG80211=y
@@ -63,7 +66,6 @@ CONFIG_INPUT_EVDEV=y 
CONFIG_SERIAL_AMBA_PL011=y

CONFIG_SERIAL_AMBA_PL011_CONSOLE=y

CONFIG_TTY_PRINTK=y

CONFIG_I2C=y

CONFIG_I2C_CHARDEV=y

CONFIG_I2C_BCM2835=y

CONFIG_SPI=y
@@ -73,10 +75,10 @@ CONFIG_GPIO_SYSFS=y 
# CONFIG_HWMON is not set

CONFIG_WATCHDOG=y

CONFIG_BCM2835_WDT=y

CONFIG_FB=y

CONFIG_DRM=y

CONFIG_DRM_VC4=y

CONFIG_FB_SIMPLE=y

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y

CONFIG_SOUND=y

CONFIG_SND=y

CONFIG_SND_SOC=y
@@ -87,7 +89,7 @@ CONFIG_USB_DWC2=y 
CONFIG_MMC=y

CONFIG_MMC_SDHCI=y

CONFIG_MMC_SDHCI_PLTFM=y

CONFIG_MMC_SDHCI_BCM2835=y

CONFIG_MMC_SDHCI_IPROC=y

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_GPIO=y
@@ -122,6 +124,7 @@ CONFIG_TMPFS=y 
CONFIG_TMPFS_POSIX_ACL=y

# CONFIG_MISC_FILESYSTEMS is not set

CONFIG_NFS_FS=y

CONFIG_ROOT_NFS=y

CONFIG_NFSD=y

CONFIG_NLS_CODEPAGE_437=y

CONFIG_NLS_ASCII=y

arch/arm/configs/davinci_all_defconfig

+6 −1
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ CONFIG_EXPERIMENTAL=y 
# CONFIG_SWAP is not set

CONFIG_SYSVIPC=y

CONFIG_POSIX_MQUEUE=y

CONFIG_FHANDLE=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_LOG_BUF_SHIFT=14
@@ -70,8 +71,10 @@ CONFIG_MTD_CFI=m 
CONFIG_MTD_CFI_INTELEXT=m

CONFIG_MTD_CFI_AMDSTD=m

CONFIG_MTD_PHYSMAP=m

CONFIG_MTD_M25P80=m

CONFIG_MTD_NAND=m

CONFIG_MTD_NAND_DAVINCI=m

CONFIG_MTD_SPI_NOR=m

CONFIG_PROC_DEVICETREE=y

CONFIG_BLK_DEV_LOOP=m

CONFIG_BLK_DEV_RAM=y
@@ -117,7 +120,10 @@ CONFIG_SERIAL_OF_PLATFORM=y 
CONFIG_I2C=y

CONFIG_I2C_CHARDEV=y

CONFIG_I2C_DAVINCI=y

CONFIG_SPI=y

CONFIG_SPI_DAVINCI=m

CONFIG_PINCTRL_SINGLE=y

CONFIG_GPIO_SYSFS=y

CONFIG_GPIO_PCF857X=y

CONFIG_WATCHDOG=y

CONFIG_DAVINCI_WATCHDOG=m
@@ -187,7 +193,6 @@ CONFIG_TI_EDMA=y 
CONFIG_EXT2_FS=y

CONFIG_EXT3_FS=y

CONFIG_XFS_FS=m

CONFIG_INOTIFY=y

CONFIG_AUTOFS4_FS=m

CONFIG_MSDOS_FS=y

CONFIG_VFAT_FS=y