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

Commit 84424026 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM soc defconfig updates from Olof Johansson:
 "This might be the last time we do a standalone defconfig branch, since
  we now prefer to get them with the rest of the subarch updates
  instead.  These add a handful of useful options on various platforms,
  enable new boards and SoCs, etc."

* tag 'defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: tegra: defconfig updates
  ARM: LPC32xx: Defconfig update
  ARM: mach-shmobile: marzen: defconfig update
  ARM: mxs_defconfig: Add SPI and LRADC support
  ARM: s3c6400_defconfig: enable more boards in defconfig
  ARM: imx_v6_v7_defconfig: Remove CONFIG_DEFAULT_MMAP_MIN_ADDR
  ARM: imx_v6_v7_defconfig: Add Chipidea USB driver support
  ARM: mxs_defconfig: Add framebuffer support
  ARM: mxs_defconfig: Add LED, PWM and MTD_CHAR support
  ARM: mxs_defconfig: Enable USB host
parents 0b8e74c6 3536c27c

arch/arm/configs/imx_v6_v7_defconfig

+3 −1
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ CONFIG_VMSPLIT_2G=y 
CONFIG_PREEMPT_VOLUNTARY=y

CONFIG_AEABI=y

# CONFIG_OABI_COMPAT is not set

CONFIG_DEFAULT_MMAP_MIN_ADDR=32768

CONFIG_CMDLINE="noinitrd console=ttymxc0,115200"

CONFIG_VFP=y

CONFIG_NEON=y
@@ -177,6 +176,9 @@ CONFIG_SND_SOC_IMX_MC13783=y 
CONFIG_USB=y

CONFIG_USB_EHCI_HCD=y

CONFIG_USB_EHCI_MXC=y

CONFIG_USB_CHIPIDEA=y

CONFIG_USB_CHIPIDEA_HOST=y

CONFIG_USB_MXS_PHY=y

CONFIG_USB_STORAGE=y

CONFIG_MMC=y

CONFIG_MMC_SDHCI=y

arch/arm/configs/lpc32xx_defconfig

+5 −2
Original line number Diff line number Diff line
@@ -133,7 +133,6 @@ CONFIG_SND_DEBUG_VERBOSE=y 
# CONFIG_SND_ARM is not set

# CONFIG_SND_SPI is not set

CONFIG_SND_SOC=y

# CONFIG_HID_SUPPORT is not set

CONFIG_USB=y

CONFIG_USB_OHCI_HCD=y

CONFIG_USB_STORAGE=y
@@ -149,6 +148,7 @@ CONFIG_LEDS_CLASS=y 
CONFIG_LEDS_PCA9532=y

CONFIG_LEDS_PCA9532_GPIO=y

CONFIG_LEDS_GPIO=y

CONFIG_LEDS_PWM=y

CONFIG_LEDS_TRIGGERS=y

CONFIG_LEDS_TRIGGER_TIMER=y

CONFIG_LEDS_TRIGGER_HEARTBEAT=y
@@ -161,10 +161,13 @@ CONFIG_RTC_DRV_DS1374=y 
CONFIG_RTC_DRV_PCF8563=y

CONFIG_RTC_DRV_LPC32XX=y

CONFIG_DMADEVICES=y

CONFIG_AMBA_PL08X=y

CONFIG_STAGING=y

CONFIG_LPC32XX_ADC=y

CONFIG_MAX517=y

CONFIG_IIO=y

CONFIG_MAX517=y

CONFIG_PWM=y

CONFIG_PWM_LPC32XX=y

CONFIG_EXT2_FS=y

CONFIG_AUTOFS4_FS=y

CONFIG_MSDOS_FS=y

arch/arm/configs/marzen_defconfig

+10 −5
Original line number Diff line number Diff line 
# CONFIG_ARM_PATCH_PHYS_VIRT is not set

CONFIG_EXPERIMENTAL=y

CONFIG_KERNEL_LZMA=y

CONFIG_NO_HZ=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_LOG_BUF_SHIFT=16

CONFIG_SYSCTL_SYSCALL=y

CONFIG_EMBEDDED=y

CONFIG_SLAB=y

# CONFIG_BLOCK is not set

# CONFIG_IOSCHED_CFQ is not set

CONFIG_ARCH_SHMOBILE=y

CONFIG_ARCH_R8A7779=y

CONFIG_MACH_MARZEN=y
@@ -21,7 +22,6 @@ CONFIG_ARM_ERRATA_458693=y 
CONFIG_ARM_ERRATA_460075=y

CONFIG_ARM_ERRATA_743622=y

CONFIG_ARM_ERRATA_754322=y

CONFIG_NO_HZ=y

CONFIG_SMP=y

# CONFIG_ARM_CPU_TOPOLOGY is not set

CONFIG_AEABI=y
@@ -29,13 +29,16 @@ CONFIG_AEABI=y 
CONFIG_HIGHMEM=y

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_CMDLINE="console=ttySC2,115200 earlyprintk=sh-sci.2,115200 ignore_loglevel"

CONFIG_CMDLINE="console=ttySC2,115200 earlyprintk=sh-sci.2,115200 ignore_loglevel root=/dev/nfs ip=on"

CONFIG_CMDLINE_FORCE=y

CONFIG_KEXEC=y

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

CONFIG_PM_RUNTIME=y

CONFIG_NET=y

CONFIG_UNIX=y

CONFIG_INET=y

CONFIG_IP_PNP=y

CONFIG_IP_PNP_DHCP=y

# CONFIG_IPV6 is not set

# CONFIG_WIRELESS is not set

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
@@ -71,16 +74,18 @@ CONFIG_GPIO_SYSFS=y 
CONFIG_THERMAL=y

CONFIG_RCAR_THERMAL=y

CONFIG_SSB=y

# CONFIG_HID_SUPPORT is not set

# CONFIG_USB_SUPPORT is not set

CONFIG_MMC=y

CONFIG_MMC_SDHI=y

CONFIG_UIO=y

CONFIG_UIO_PDRV_GENIRQ=y

# CONFIG_IOMMU_SUPPORT is not set

# CONFIG_FILE_LOCKING is not set

# CONFIG_DNOTIFY is not set

# CONFIG_INOTIFY_USER is not set

CONFIG_TMPFS=y

# CONFIG_MISC_FILESYSTEMS is not set

CONFIG_NFS_FS=y

CONFIG_ROOT_NFS=y

CONFIG_MAGIC_SYSRQ=y

CONFIG_DEBUG_INFO=y

CONFIG_DEBUG_INFO_REDUCED=y

arch/arm/configs/mxs_defconfig

+35 −1
Original line number Diff line number Diff line
@@ -53,6 +53,9 @@ CONFIG_DEVTMPFS=y 
# CONFIG_FIRMWARE_IN_KERNEL is not set

# CONFIG_BLK_DEV is not set

CONFIG_MTD=y

CONFIG_MTD_CHAR=y

CONFIG_MTD_DATAFLASH=y

CONFIG_MTD_M25P80

CONFIG_MTD_NAND=y

CONFIG_MTD_NAND_GPMI_NAND=y

CONFIG_NETDEVICES=y
@@ -82,13 +85,13 @@ CONFIG_I2C_CHARDEV=y 
CONFIG_I2C_MXS=y

CONFIG_SPI=y

CONFIG_SPI_GPIO=m

CONFIG_SPI_MXS=y

CONFIG_DEBUG_GPIO=y

CONFIG_GPIO_SYSFS=y

# CONFIG_HWMON is not set

# CONFIG_MFD_SUPPORT is not set

CONFIG_DISPLAY_SUPPORT=m

# CONFIG_HID_SUPPORT is not set

# CONFIG_USB_SUPPORT is not set

CONFIG_SOUND=y

CONFIG_SND=y

CONFIG_SND_TIMER=y
@@ -103,14 +106,45 @@ CONFIG_SND_SOC_I2C_AND_SPI=y 
CONFIG_SND_SOC_SGTL5000=y

CONFIG_REGULATOR=y

CONFIG_REGULATOR_FIXED_VOLTAGE=y

CONFIG_FB=y

CONFIG_FB_MXS=y

CONFIG_BACKLIGHT_LCD_SUPPORT=y

CONFIG_LCD_CLASS_DEVICE=y

CONFIG_BACKLIGHT_CLASS_DEVICE=y

CONFIG_BACKLIGHT_PWM=y

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_FONTS=y

CONFIG_LOGO=y

CONFIG_USB=y

CONFIG_USB_CHIPIDEA=y

CONFIG_USB_CHIPIDEA_HOST=y

CONFIG_USB_STORAGE=y

CONFIG_USB_MXS_PHY=y

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

CONFIG_MMC=y

CONFIG_MMC_MXS=y

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_GPIO=y

CONFIG_LEDS_TRIGGERS=y

CONFIG_LEDS_TRIGGER_TIMER=y

CONFIG_LEDS_TRIGGER_ONESHOT=y

CONFIG_LEDS_TRIGGER_HEARTBEAT=y

CONFIG_LEDS_TRIGGER_BACKLIGHT=y

CONFIG_LEDS_TRIGGER_GPIO=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_DS1307=m

CONFIG_RTC_DRV_STMP=y

CONFIG_DMADEVICES=y

CONFIG_MXS_DMA=y

CONFIG_STAGING=y

CONFIG_MXS_LRADC=y

CONFIG_IIO_SYSFS_TRIGGER=y

CONFIG_COMMON_CLK_DEBUG=y

CONFIG_IIO=y

CONFIG_PWM=y

CONFIG_PWM_MXS=y

CONFIG_EXT3_FS=y

# CONFIG_DNOTIFY is not set

CONFIG_FSCACHE=m

arch/arm/configs/s3c6400_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -9,11 +9,14 @@ CONFIG_ARCH_S3C64XX=y 
CONFIG_S3C_BOOT_ERROR_RESET=y

CONFIG_MACH_SMDK6400=y

CONFIG_MACH_ANW6410=y

CONFIG_MACH_MINI6410=y

CONFIG_MACH_REAL6410=y

CONFIG_MACH_SMDK6410=y

CONFIG_MACH_NCP=y

CONFIG_MACH_HMT=y

CONFIG_MACH_SMARTQ5=y

CONFIG_MACH_SMARTQ7=y

CONFIG_MACH_WLF_CRAGG_6410=y

CONFIG_CPU_32v6K=y

CONFIG_AEABI=y

CONFIG_CMDLINE="console=ttySAC0,115200 root=/dev/ram init=/linuxrc initrd=0x51000000,6M ramdisk_size=6144"