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

Commit 6911a528 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 Olof Johansson:
 "Defconfig additions, removals, etc.

  Most of these are small changes adding the options for newly
  upstreamed drivers, or drivers needed for new board support.

  - removed Broadcom bcm_defconfig, targets are all covered in
    multi_v7_defconfig

  - new defconfig: multi_v4t_defconfig"

* tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (43 commits)
  ARM: multi_v7_defconfig: enable STMicroelectronics DRM Support
  ARM: multi_v7_defconfig: enable STMicroelectronics BDISP 2D blitter driver
  ARM: omap2plus_defconfig: Fix USB selection to keep Ethernet working
  ARM: configs: lpc18xx: enable adc and dac iio drivers
  ARM: config: Add a multi_v4t_defconfig
  ARM: multi_v7_defconfig: add ACT8945A
  ARM: at91/defconfig: Add ACT8945A driver
  ARM: imx_v6_v7_defconfig: Select ADS7846 support
  ARM: configs: qualcomm: Add MDM9615 missing defconfigs
  ARM: multi_v7_defconfig: Enable vivid driver as a module
  ARM: exynos_defconfig: Enable vivid driver as a module
  ARM: defconfig: enable the MSM8660 pin controller
  ARM: imx_v6_v7_defconfig: enable USB FFS gadget
  ARM: socfpga: enable PL330 DMA in socfpga_defconfig
  ARM: socfpga: add PCIe to socfpga_defconfig
  ARM: multi_v7_defconfig: defconfig: Enable r8a7792 SoC
  ARM: shmobile: defconfig: Enable r8a7792 SoC
  ARM: Remove bcm_defconfig
  ARM: multi_v7_defconfig: Enable Broadcom Kona watchdog
  ARM: multi_v7_defconfig: Enable Broadcom STB PWM
  ...
parents 3fbff9c8 772a7f22

arch/arm/configs/bcm_defconfig

deleted100644 → 0
+0 −141
Original line number Diff line number Diff line 
# CONFIG_LOCALVERSION_AUTO is not set

# CONFIG_SWAP is not set

CONFIG_SYSVIPC=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_BSD_PROCESS_ACCT=y

CONFIG_BSD_PROCESS_ACCT_V3=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_LOG_BUF_SHIFT=19

CONFIG_CGROUPS=y

CONFIG_CGROUP_FREEZER=y

CONFIG_CGROUP_DEVICE=y

CONFIG_CGROUP_CPUACCT=y

CONFIG_CGROUP_SCHED=y

CONFIG_BLK_CGROUP=y

CONFIG_NAMESPACES=y

CONFIG_BLK_DEV_INITRD=y

CONFIG_SYSCTL_SYSCALL=y

CONFIG_EMBEDDED=y

# CONFIG_COMPAT_BRK is not set

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

# CONFIG_BLK_DEV_BSG is not set

CONFIG_PARTITION_ADVANCED=y

CONFIG_ARCH_BCM=y

CONFIG_ARCH_BCM_21664=y

CONFIG_ARCH_BCM_281XX=y

CONFIG_ARM_THUMBEE=y

CONFIG_SMP=y

CONFIG_PREEMPT=y

CONFIG_AEABI=y

# CONFIG_COMPACTION is not set

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_CMDLINE="console=ttyS0,115200n8 mem=128M"

CONFIG_CPU_IDLE=y

CONFIG_VFP=y

CONFIG_NEON=y

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

CONFIG_PM=y

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_PACKET_DIAG=y

CONFIG_UNIX=y

CONFIG_UNIX_DIAG=y

CONFIG_NET_KEY=y

CONFIG_INET=y

CONFIG_IP_MULTICAST=y

CONFIG_SYN_COOKIES=y

CONFIG_TCP_MD5SIG=y

CONFIG_IPV6=y

CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y

CONFIG_PROC_DEVICETREE=y

# CONFIG_BLK_DEV is not set

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

CONFIG_CHR_DEV_SG=y

CONFIG_SCSI_MULTI_LUN=y

CONFIG_SCSI_SCAN_ASYNC=y

CONFIG_INPUT_FF_MEMLESS=y

CONFIG_INPUT_JOYDEV=y

CONFIG_INPUT_EVDEV=y

# CONFIG_KEYBOARD_ATKBD is not set

# CONFIG_INPUT_MOUSE is not set

CONFIG_INPUT_TOUCHSCREEN=y

CONFIG_INPUT_MISC=y

CONFIG_INPUT_UINPUT=y

# CONFIG_SERIO is not set

# CONFIG_LEGACY_PTYS is not set

CONFIG_SERIAL_8250=y

CONFIG_SERIAL_8250_CONSOLE=y

CONFIG_SERIAL_8250_EXTENDED=y

CONFIG_SERIAL_8250_MANY_PORTS=y

CONFIG_SERIAL_8250_SHARE_IRQ=y

CONFIG_SERIAL_8250_RSA=y

CONFIG_SERIAL_8250_DW=y

CONFIG_HW_RANDOM=y

CONFIG_I2C=y

CONFIG_I2C_CHARDEV=y

# CONFIG_HWMON is not set

CONFIG_MFD_BCM590XX=y

CONFIG_REGULATOR=y

CONFIG_REGULATOR_FIXED_VOLTAGE=y

CONFIG_REGULATOR_USERSPACE_CONSUMER=y

CONFIG_REGULATOR_BCM590XX=y



CONFIG_VIDEO_OUTPUT_CONTROL=y

CONFIG_FB=y

CONFIG_BACKLIGHT_LCD_SUPPORT=y

CONFIG_LCD_CLASS_DEVICE=y

CONFIG_BACKLIGHT_CLASS_DEVICE=y

CONFIG_BACKLIGHT_PWM=y

# CONFIG_USB_SUPPORT is not set

CONFIG_MMC=y

CONFIG_MMC_BLOCK_MINORS=32

CONFIG_MMC_TEST=y

CONFIG_MMC_SDHCI=y

CONFIG_MMC_SDHCI_PLTFM=y

CONFIG_MMC_SDHCI_BCM_KONA=y

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_TRIGGERS=y

CONFIG_LEDS_TRIGGER_TIMER=y

CONFIG_LEDS_TRIGGER_HEARTBEAT=y

CONFIG_LEDS_TRIGGER_DEFAULT_ON=y

CONFIG_PWM=y

CONFIG_PWM_BCM_KONA=y

CONFIG_EXT4_FS=y

CONFIG_EXT4_FS_POSIX_ACL=y

CONFIG_EXT4_FS_SECURITY=y

CONFIG_AUTOFS4_FS=y

CONFIG_FUSE_FS=y

CONFIG_MSDOS_FS=y

CONFIG_VFAT_FS=y

CONFIG_TMPFS=y

CONFIG_TMPFS_POSIX_ACL=y

CONFIG_CONFIGFS_FS=y

# CONFIG_MISC_FILESYSTEMS is not set

CONFIG_NLS_CODEPAGE_437=y

CONFIG_NLS_ISO8859_1=y

CONFIG_PRINTK_TIME=y

CONFIG_DEBUG_INFO=y

CONFIG_DEBUG_FS=y

CONFIG_MAGIC_SYSRQ=y

CONFIG_DETECT_HUNG_TASK=y

CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=110

CONFIG_BOOTPARAM_HUNG_TASK_PANIC=y

# CONFIG_FTRACE is not set

# CONFIG_CRYPTO_ANSI_CPRNG is not set

CONFIG_CRC_CCITT=y

CONFIG_CRC_T10DIF=y

CONFIG_CRC_ITU_T=y

CONFIG_CRC7=y

CONFIG_XZ_DEC=y

CONFIG_AVERAGE=y

CONFIG_PINCTRL_BCM281XX=y

CONFIG_WATCHDOG=y

CONFIG_BCM_KONA_WDT=y

CONFIG_BCM_KONA_WDT_DEBUG=y

arch/arm/configs/exynos_defconfig

+17 −12
Original line number Diff line number Diff line 
CONFIG_SYSVIPC=y

CONFIG_FHANDLE=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_CGROUPS=y
@@ -13,8 +12,6 @@ CONFIG_ARCH_EXYNOS3=y 
CONFIG_EXYNOS5420_MCPM=y

CONFIG_SMP=y

CONFIG_BIG_LITTLE=y

CONFIG_BL_SWITCHER=y

CONFIG_BL_SWITCHER_DUMMY_IF=y

CONFIG_NR_CPUS=8

CONFIG_PREEMPT=y

CONFIG_AEABI=y
@@ -84,9 +81,9 @@ CONFIG_INPUT_MAX77693_HAPTIC=y 
CONFIG_INPUT_MAX8997_HAPTIC=y

CONFIG_KEYBOARD_SAMSUNG=y

CONFIG_SERIAL_8250=y

CONFIG_SERIAL_OF_PLATFORM=y

CONFIG_SERIAL_SAMSUNG=y

CONFIG_SERIAL_SAMSUNG_CONSOLE=y

CONFIG_SERIAL_OF_PLATFORM=y

CONFIG_HW_RANDOM=y

CONFIG_TCG_TPM=y

CONFIG_TCG_TIS_I2C_INFINEON=y
@@ -112,10 +109,8 @@ CONFIG_SENSORS_LM90=y 
CONFIG_SENSORS_NTC_THERMISTOR=y

CONFIG_SENSORS_PWM_FAN=y

CONFIG_SENSORS_INA2XX=y

CONFIG_THERMAL=y

CONFIG_CPU_THERMAL=y

CONFIG_THERMAL_EMULATION=y

CONFIG_EXYNOS_THERMAL=y

CONFIG_WATCHDOG=y

CONFIG_S3C2410_WATCHDOG=y

CONFIG_MFD_CROS_EC=y
@@ -144,20 +139,32 @@ CONFIG_REGULATOR_TPS65090=y 
CONFIG_REGULATOR_WM8994=y

CONFIG_MEDIA_SUPPORT=m

CONFIG_MEDIA_CAMERA_SUPPORT=y

CONFIG_MEDIA_CONTROLLER=y

CONFIG_VIDEO_V4L2_SUBDEV_API=y

CONFIG_MEDIA_USB_SUPPORT=y

CONFIG_USB_VIDEO_CLASS=m

CONFIG_V4L_PLATFORM_DRIVERS=y

CONFIG_VIDEO_SAMSUNG_EXYNOS4_IS=m

CONFIG_VIDEO_S5P_FIMC=m

CONFIG_VIDEO_S5P_MIPI_CSIS=m

CONFIG_VIDEO_EXYNOS_FIMC_LITE=m

CONFIG_VIDEO_EXYNOS4_FIMC_IS=m

CONFIG_V4L_MEM2MEM_DRIVERS=y

CONFIG_VIDEO_SAMSUNG_S5P_JPEG=m

CONFIG_VIDEO_SAMSUNG_S5P_MFC=m

CONFIG_V4L_TEST_DRIVERS=y

CONFIG_DRM=y

CONFIG_DRM_NXP_PTN3460=y

CONFIG_DRM_PARADE_PS8622=y

CONFIG_DRM_EXYNOS=y

CONFIG_DRM_EXYNOS_FIMD=y

CONFIG_DRM_EXYNOS_DSI=y

CONFIG_DRM_EXYNOS_MIXER=y

CONFIG_DRM_EXYNOS_DPI=y

CONFIG_DRM_EXYNOS_DSI=y

CONFIG_DRM_EXYNOS_HDMI=y

CONFIG_DRM_PANEL_SIMPLE=y

CONFIG_DRM_PANEL_SAMSUNG_LD9040=y

CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=y

CONFIG_DRM_NXP_PTN3460=y

CONFIG_DRM_PARADE_PS8622=y

CONFIG_EXYNOS_VIDEO=y

CONFIG_EXYNOS_MIPI_DSI=y

CONFIG_LCD_CLASS_DEVICE=y
@@ -171,7 +178,6 @@ CONFIG_SND_SOC_SAMSUNG=y 
CONFIG_SND_SOC_SAMSUNG_SMDK_WM8994=y

CONFIG_SND_SOC_SMDK_WM8994_PCM=y

CONFIG_SND_SOC_SNOW=y

CONFIG_SND_SOC_ODROIDX2=y

CONFIG_SND_SIMPLE_CARD=y

CONFIG_USB=y

CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
@@ -209,7 +215,6 @@ CONFIG_RTC_DRV_S5M=y 
CONFIG_RTC_DRV_S3C=y

CONFIG_DMADEVICES=y

CONFIG_PL330_DMA=y

CONFIG_CHROME_PLATFORMS=y

CONFIG_CROS_EC_CHARDEV=y

CONFIG_COMMON_CLK_MAX77686=y

CONFIG_COMMON_CLK_MAX77802=y
@@ -227,7 +232,6 @@ CONFIG_PWM_SAMSUNG=y 
CONFIG_PHY_EXYNOS5250_SATA=y

CONFIG_EXT2_FS=y

CONFIG_EXT3_FS=y

CONFIG_EXT4_FS=y

CONFIG_AUTOFS4_FS=y

CONFIG_MSDOS_FS=y

CONFIG_VFAT_FS=y
@@ -260,3 +264,4 @@ CONFIG_CRYPTO_AES_ARM_BS=m 
CONFIG_CRC_CCITT=y

CONFIG_FONTS=y

CONFIG_FONT_7x14=y

CONFIG_VIDEO_VIVID=m

arch/arm/configs/imx_v6_v7_defconfig

+3 −1
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ CONFIG_MICREL_PHY=y 
CONFIG_USB_PEGASUS=m

CONFIG_USB_RTL8150=m

CONFIG_USB_RTL8152=m

CONFIG_USB_USBNET=m

CONFIG_USB_USBNET=y

CONFIG_USB_NET_CDC_EEM=m

CONFIG_BRCMFMAC=m

CONFIG_WL12XX=m
@@ -161,6 +161,7 @@ CONFIG_KEYBOARD_IMX=y 
CONFIG_MOUSE_PS2=m

CONFIG_MOUSE_PS2_ELANTECH=y

CONFIG_INPUT_TOUCHSCREEN=y

CONFIG_TOUCHSCREEN_ADS7846=y

CONFIG_TOUCHSCREEN_EGALAX=y

CONFIG_TOUCHSCREEN_IMX6UL_TSC=y

CONFIG_TOUCHSCREEN_EDT_FT5X06=y
@@ -296,6 +297,7 @@ CONFIG_USB_ZERO=m 
CONFIG_USB_ETH=m

CONFIG_USB_G_NCM=m

CONFIG_USB_GADGETFS=m

CONFIG_USB_FUNCTIONFS=m

CONFIG_USB_MASS_STORAGE=m

CONFIG_USB_G_SERIAL=m

CONFIG_MMC=y

arch/arm/configs/keystone_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -144,6 +144,7 @@ CONFIG_I2C_DAVINCI=y 
CONFIG_SPI=y

CONFIG_SPI_DAVINCI=y

CONFIG_SPI_SPIDEV=y

CONFIG_PINCTRL_SINGLE=y

CONFIG_GPIOLIB=y

CONFIG_GPIO_SYSFS=y

CONFIG_GPIO_DAVINCI=y

arch/arm/configs/lpc18xx_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -149,6 +149,8 @@ CONFIG_PWM=y 
CONFIG_PWM_LPC18XX_SCT=y

CONFIG_IIO=y

CONFIG_MMA7455_I2C=y

CONFIG_LPC18XX_ADC=y

CONFIG_LPC18XX_DAC=y

CONFIG_IIO_SYSFS_TRIGGER=y

CONFIG_PHY_LPC18XX_USB_OTG=y

CONFIG_NVMEM=y