Commit e3b1f64e 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.

  The realview_smp_defconfig and realview_defconfig got merged into one,
  so we are now down to 110 files.

  For stm32, we have now added a Kconfig fragment, the first such file
  on arch/arm.  The purpose here is to have a shared defconfig file that
  works for all boards, while the DRAM offset has to be hardwired on
  NOMMU machines at compile time.

  The Exynos defconfig changes depend on changes in the RTC tree, so
  this is pulled in here, but has already been merged into 4.6 now"

* tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (45 commits)
  ARM: imx_v4_v5_defconfig: Enable initramfs support
  ARM: imx_v4_v5_defconfig: Cleanup imx_v4_v5_defconfig
  ARM: multi_v7_defconfig: Enable LP872x regulator support
  ARM: omap2plus_defconfig: Enable LP872x regulator support
  ARM: mxs_defconfig: Enable initramfs support
  ARM: mxs_defconfig: Cleanup mxs_defconfig
  ARM: multi_v5_defconfig: Enable initramfs support
  ARM: multi_v5_defconfig: Cleanup multi_v5_defconfig
  ARM: multi_v7_defconfig: enable useful configurations for Vybrid
  ARM: multi_v7_defconfig: add MACH_ARTPEC6
  ARM: omap2plus_defconfig: Enable AT24 eeprom
  ARM: omap2plus_defconfig: Enable TI TVP5150 video decoder support
  ARM: omap2plus_defconfig: Enable ISP support and dependencies
  ARM: omap2plus_defconfig: Enable OMAP IOMMU support
  ARM: socfpga_defconfig: enable support for initramfs/initrd support
  ARM: at91/defconfig: add sama5d2 adc support in sama5_defconfig
  ARM: multi_v7_defconfig: Enable BCM283x
  ARM: bcm2835_defconfig: Enable RPi power domain driver
  ARM: bcm2835_defconfig: Enable RPi firmware driver
  ARM: bcm2835_defconfig: enable ARMv7 support
  ...
parents 915c56bc fa54ae13

arch/arm/configs/bcm2835_defconfig

+5 −6
Original line number Diff line number Diff line
@@ -6,13 +6,13 @@ CONFIG_HIGH_RES_TIMERS=y 
CONFIG_BSD_PROCESS_ACCT=y

CONFIG_BSD_PROCESS_ACCT_V3=y

CONFIG_LOG_BUF_SHIFT=18

CONFIG_CFS_BANDWIDTH=y

CONFIG_RT_GROUP_SCHED=y

CONFIG_CGROUP_FREEZER=y

CONFIG_CGROUP_DEVICE=y

CONFIG_CPUSETS=y

CONFIG_CGROUP_DEVICE=y

CONFIG_CGROUP_CPUACCT=y

CONFIG_CGROUP_PERF=y

CONFIG_CFS_BANDWIDTH=y

CONFIG_RT_GROUP_SCHED=y

CONFIG_NAMESPACES=y

CONFIG_SCHED_AUTOGROUP=y

CONFIG_RELAY=y
@@ -26,7 +26,6 @@ CONFIG_OPROFILE=y 
CONFIG_JUMP_LABEL=y

CONFIG_CC_STACKPROTECTOR_REGULAR=y

CONFIG_ARCH_MULTI_V6=y

# CONFIG_ARCH_MULTI_V7 is not set

CONFIG_ARCH_BCM=y

CONFIG_ARCH_BCM2835=y

CONFIG_PREEMPT_VOLUNTARY=y
@@ -107,8 +106,10 @@ CONFIG_STAGING=y 
CONFIG_MAILBOX=y

CONFIG_BCM2835_MBOX=y

# CONFIG_IOMMU_SUPPORT is not set

CONFIG_RASPBERRYPI_POWER=y

CONFIG_PWM=y

CONFIG_PWM_BCM2835=y

CONFIG_RASPBERRYPI_FIRMWARE=y

CONFIG_EXT2_FS=y

CONFIG_EXT2_FS_XATTR=y

CONFIG_EXT2_FS_POSIX_ACL=y
@@ -142,7 +143,5 @@ CONFIG_TEST_KSTRTOX=y 
CONFIG_KGDB=y

CONFIG_KGDB_KDB=y

CONFIG_STRICT_DEVMEM=y

CONFIG_DEBUG_LL=y

CONFIG_EARLY_PRINTK=y

# CONFIG_XZ_DEC_ARM is not set

# CONFIG_XZ_DEC_ARMTHUMB is not set

arch/arm/configs/dram_0x00000000.config

0 → 100644
+1 −0
Original line number Diff line number Diff line 
CONFIG_DRAM_BASE=0x00000000

arch/arm/configs/imx_v4_v5_defconfig

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

CONFIG_LOG_BUF_SHIFT=14

CONFIG_CGROUPS=y

CONFIG_BLK_DEV_INITRD=y

CONFIG_EXPERT=y

# CONFIG_COMPAT_BRK is not set

CONFIG_SLAB=y
@@ -24,14 +25,12 @@ CONFIG_ARCH_MXC=y 
CONFIG_MACH_SCB9328=y

CONFIG_MACH_APF9328=y

CONFIG_MACH_MX21ADS=y

CONFIG_MACH_EUKREA_CPUIMX25SD=y

CONFIG_SOC_IMX25=y

CONFIG_MACH_MX27ADS=y

CONFIG_MACH_MX27_3DS=y

CONFIG_MACH_IMX27_VISSTRIM_M10=y

CONFIG_MACH_PCA100=y

CONFIG_MACH_MXT_TD60=y

CONFIG_MACH_IMX27_DT=y

CONFIG_SOC_IMX25=y

CONFIG_PREEMPT=y

CONFIG_AEABI=y

CONFIG_ZBOOT_ROM_TEXT=0x0
@@ -88,6 +87,7 @@ CONFIG_KEYBOARD_IMX=y 
# CONFIG_INPUT_MOUSE is not set

CONFIG_INPUT_TOUCHSCREEN=y

CONFIG_TOUCHSCREEN_ADS7846=m

CONFIG_TOUCHSCREEN_MX25=y

CONFIG_TOUCHSCREEN_MC13783=y

# CONFIG_LEGACY_PTYS is not set

CONFIG_SERIAL_8250=m
@@ -107,6 +107,7 @@ CONFIG_HWMON=m 
CONFIG_SENSORS_MC13783_ADC=m

CONFIG_WATCHDOG=y

CONFIG_IMX2_WDT=y

CONFIG_MFD_MX25_TSADC=y

CONFIG_MFD_MC13XXX_SPI=y

CONFIG_REGULATOR=y

CONFIG_REGULATOR_FIXED_VOLTAGE=y
@@ -169,11 +170,11 @@ CONFIG_RTC_DRV_IMXDI=y 
CONFIG_RTC_DRV_MC13XXX=y

CONFIG_RTC_DRV_MXC=y

CONFIG_DMADEVICES=y

CONFIG_IMX_SDMA=y

CONFIG_IMX_DMA=y

CONFIG_IMX_SDMA=y

# CONFIG_IOMMU_SUPPORT is not set

CONFIG_EXT2_FS=y

CONFIG_EXT3_FS=y

CONFIG_IIO=y

CONFIG_FSL_MX25_ADC=y

CONFIG_EXT4_FS=y

# CONFIG_DNOTIFY is not set

CONFIG_VFAT_FS=y
@@ -187,6 +188,5 @@ CONFIG_NLS_CODEPAGE_437=m 
CONFIG_NLS_CODEPAGE_850=m

CONFIG_NLS_ISO8859_1=y

CONFIG_NLS_ISO8859_15=m

# CONFIG_CRYPTO_ANSI_CPRNG is not set

CONFIG_FONTS=y

CONFIG_FONT_8x8=y

arch/arm/configs/imx_v6_v7_defconfig

+15 −8
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ CONFIG_PCI=y 
CONFIG_PCI_MSI=y

CONFIG_PCI_IMX6=y

CONFIG_SMP=y

CONFIG_ARM_PSCI=y

CONFIG_PREEMPT_VOLUNTARY=y

CONFIG_AEABI=y

CONFIG_HIGHMEM=y
@@ -56,6 +57,7 @@ CONFIG_KEXEC=y 
CONFIG_CPU_FREQ=y

CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y

CONFIG_ARM_IMX6Q_CPUFREQ=y

CONFIG_CPU_IDLE=y

CONFIG_VFP=y

CONFIG_NEON=y

CONFIG_BINFMT_MISC=m
@@ -71,7 +73,6 @@ CONFIG_IP_PNP_DHCP=y 
# CONFIG_INET_XFRM_MODE_TUNNEL is not set

# CONFIG_INET_XFRM_MODE_BEET is not set

# CONFIG_INET_LRO is not set

CONFIG_IPV6=y

CONFIG_NETFILTER=y

CONFIG_CAN=y

CONFIG_CAN_FLEXCAN=y
@@ -103,10 +104,13 @@ CONFIG_MTD_M25P80=y 
CONFIG_MTD_SST25L=y

CONFIG_MTD_NAND=y

CONFIG_MTD_NAND_GPMI_NAND=y

CONFIG_MTD_NAND_VF610_NFC=y

CONFIG_MTD_NAND_MXC=y

CONFIG_MTD_SPI_NOR=y

CONFIG_SPI_FSL_QUADSPI=y

CONFIG_MTD_UBI=y

CONFIG_MTD_UBI_FASTMAP=y

CONFIG_MTD_UBI_BLOCK=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_SIZE=65536
@@ -144,7 +148,6 @@ CONFIG_USB_RTL8152=m 
CONFIG_USB_USBNET=m

CONFIG_USB_NET_CDC_EEM=m

CONFIG_BRCMFMAC=m

CONFIG_WL_TI=y

CONFIG_WL12XX=m

CONFIG_WLCORE_SDIO=m

# CONFIG_WILINK_PLATFORM_DATA is not set
@@ -163,6 +166,7 @@ CONFIG_TOUCHSCREEN_MC13783=y 
CONFIG_TOUCHSCREEN_TSC2007=y

CONFIG_TOUCHSCREEN_STMPE=y

CONFIG_TOUCHSCREEN_SX8654=y

CONFIG_TOUCHSCREEN_COLIBRI_VF50=y

CONFIG_INPUT_MISC=y

CONFIG_INPUT_MMA8450=y

CONFIG_SERIO_SERPORT=m
@@ -172,7 +176,6 @@ CONFIG_SERIAL_IMX=y 
CONFIG_SERIAL_IMX_CONSOLE=y

CONFIG_SERIAL_FSL_LPUART=y

CONFIG_SERIAL_FSL_LPUART_CONSOLE=y

CONFIG_HW_RANDOM=y

# CONFIG_I2C_COMPAT is not set

CONFIG_I2C_CHARDEV=y

# CONFIG_I2C_HELPER_AUTO is not set
@@ -181,6 +184,7 @@ CONFIG_I2C_ALGOPCA=m 
CONFIG_I2C_IMX=y

CONFIG_SPI=y

CONFIG_SPI_IMX=y

CONFIG_SPI_FSL_DSPI=y

CONFIG_GPIO_SYSFS=y

CONFIG_GPIO_MC9S08DZ60=y

CONFIG_GPIO_PCA953X=y
@@ -191,6 +195,7 @@ CONFIG_POWER_RESET_IMX=y 
CONFIG_POWER_RESET_SYSCON=y

CONFIG_POWER_RESET_SYSCON_POWEROFF=y

CONFIG_SENSORS_GPIO_FAN=y

CONFIG_SENSORS_IIO_HWMON=y

CONFIG_THERMAL=y

CONFIG_CPU_THERMAL=y

CONFIG_IMX_THERMAL=y
@@ -226,7 +231,6 @@ CONFIG_DRM=y 
CONFIG_DRM_PANEL_SIMPLE=y

CONFIG_DRM_DW_HDMI_AHB_AUDIO=m

CONFIG_DRM_IMX=y

CONFIG_DRM_IMX_FB_HELPER=y

CONFIG_DRM_IMX_PARALLEL_DISPLAY=y

CONFIG_DRM_IMX_TVE=y

CONFIG_DRM_IMX_LDB=y
@@ -270,6 +274,7 @@ CONFIG_USB_EHSET_TEST_FIXTURE=m 
CONFIG_NOP_USB_XCEIV=y

CONFIG_USB_MXS_PHY=y

CONFIG_USB_GADGET=y

CONFIG_USB_FSL_USB2=y

CONFIG_USB_CONFIGFS=m

CONFIG_USB_CONFIGFS_SERIAL=y

CONFIG_USB_CONFIGFS_ACM=y
@@ -295,6 +300,7 @@ CONFIG_MMC_SDHCI_ESDHC_IMX=y 
CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_GPIO=y

CONFIG_LEDS_PWM=y

CONFIG_LEDS_TRIGGERS=y

CONFIG_LEDS_TRIGGER_TIMER=y

CONFIG_LEDS_TRIGGER_ONESHOT=y
@@ -311,15 +317,18 @@ CONFIG_RTC_DRV_MC13XXX=y 
CONFIG_RTC_DRV_MXC=y

CONFIG_RTC_DRV_SNVS=y

CONFIG_DMADEVICES=y

CONFIG_FSL_EDMA=y

CONFIG_IMX_SDMA=y

CONFIG_MXS_DMA=y

CONFIG_FSL_EDMA=y

CONFIG_STAGING=y

# CONFIG_IOMMU_SUPPORT is not set

CONFIG_IIO=y

CONFIG_VF610_ADC=y

CONFIG_PWM=y

CONFIG_PWM_FSL_FTM=y

CONFIG_PWM_IMX=y

CONFIG_NVMEM=y

CONFIG_NVMEM_IMX_OCOTP=y

CONFIG_EXT2_FS=y

CONFIG_EXT2_FS_XATTR=y

CONFIG_EXT2_FS_POSIX_ACL=y
@@ -327,9 +336,6 @@ CONFIG_EXT2_FS_SECURITY=y 
CONFIG_EXT3_FS=y

CONFIG_EXT3_FS_POSIX_ACL=y

CONFIG_EXT3_FS_SECURITY=y

CONFIG_EXT4_FS=y

CONFIG_EXT4_FS_POSIX_ACL=y

CONFIG_EXT4_FS_SECURITY=y

CONFIG_QUOTA=y

CONFIG_QUOTA_NETLINK_INTERFACE=y

# CONFIG_PRINT_QUOTA_WARNING is not set
@@ -364,6 +370,7 @@ CONFIG_PROVE_LOCKING=y 
# CONFIG_ARM_UNWIND is not set

CONFIG_SECURITYFS=y

CONFIG_CRYPTO_DEV_FSL_CAAM=y

CONFIG_CRYPTO_DEV_SAHARA=y

CONFIG_CRC_CCITT=m

CONFIG_CRC_T10DIF=y

CONFIG_CRC7=m

arch/arm/configs/multi_v5_defconfig

+2 −1
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ CONFIG_SYSVIPC=y 
CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_LOG_BUF_SHIFT=19

CONFIG_BLK_DEV_INITRD=y

CONFIG_PROFILING=y

CONFIG_OPROFILE=y

CONFIG_KPROBES=y
@@ -97,9 +98,9 @@ CONFIG_NET_DSA_MV88E6352=y 
CONFIG_MV643XX_ETH=y

CONFIG_R8169=y

CONFIG_MARVELL_PHY=y

CONFIG_MWL8K=m

CONFIG_LIBERTAS=y

CONFIG_LIBERTAS_SDIO=y

CONFIG_MWL8K=m

CONFIG_INPUT_EVDEV=y

CONFIG_KEYBOARD_GPIO=y

# CONFIG_INPUT_MOUSE is not set

CRA Git | Maintained and supported by SUSTech CRA and CCSE