mirror of
https://github.com/torvalds/linux.git
synced 2024-11-17 01:22:07 +00:00
151cd97630
This is a collection of the various changes to defconfig files, most importantly enabling some additional platforms in the multi_v7_defconfig file. These are split out into a separate branch to avoid most of the merge conflicts in the defconfig files. This also touches 12 other defconfig files for shmobile, at91, hisilicon, keystone, mvebu, omap, and tegra. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQIVAwUAVIcj5WCrR//JCVInAQIDNhAAjJYvkKQNQEHSgpP9EO7psu5Il21uGICK VUHgOFeJezGEcjnZIaGaICPxUXVHmn8fdHfymEFYtUJhPGRKZV4WGfU5/vai9JHV HNOm9Rveg4rqJr4zNEWXDaIjhrxmbWIUkf9+S1jAvV3QbKIWt1vEyS5ka1PiepBb P19lT7t2VVDguVLQmJCLarYjoF/mZdrunRfFp7wBo6xClbsa9S5ldPT5LQY/ufYc mFaYd78imELKFtgNyYhS++o9egDoW+feFC22/ZllVNH6k/FYqfXmoCyzTy7Tb0tp T8R7yGsZfpwtZPXus9cm2S4FW1nXQxUtn+1Z97a1u16k6TP+N/kBKP67BILD1I+T J0G7yQHIMdH0AhVq+7VXzHiPX37GvOqJl+c9g6pMHP/hgJQ5m3sT6iYxLUmHWuoS QsQLeT4PalVgd8UvwNI8xTAaWXpvi9mNbl1++O5DahqWhT38Rl9URJNI689Detfe U92jtRQwFTBIXMFs2P1g7hjrMoQ71BiX5iVqdO/OMw7iGafq/pKBDc4020uUP34P qblXKjVQw3n+nO/QKPKdAEwjApoZxS62qF8QtKuNfYR+daz2MYG8TR60ug805tgQ w42tJaajQN/YbG6SWW3X/g3xoRRtriJ6mvm6xeoAau1bw1V3XuqtOT5AoF5SF1FZ 65CUSM2j/yY= =brXv -----END PGP SIGNATURE----- Merge tag 'defconfig-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull ARM SoC defconfig changes from Arnd Bergmann: "This is a collection of the various changes to defconfig files, most importantly enabling some additional platforms in the multi_v7_defconfig file. These are split out into a separate branch to avoid most of the merge conflicts in the defconfig files. This also touches 12 other defconfig files for shmobile, at91, hisilicon, keystone, mvebu, omap, and tegra" * tag 'defconfig-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (36 commits) ARM: omap2plus_defconfig: enable ECAP and EHRPWM ARM: omap2plus_defconfig: enable XHCI ARM: omap2plus_defconfig: enable AM33XX SoC sound ARM: omap2plus_defconfig: enable EDT FT5X06 touchscreen ARM: omap2plus_defconfig: remove unwanted ethernet drivers ARM: multi_v7_defconfig: enable MAX77686 PMIC drivers for exynos4412-prime based SoCs ARM: at91/defconfig: add DM9000 to at91_dt ARM: at91/defconfig: add QT1070 to at91_dt ARM: at91/defconfig: add TCB PWM driver selection ARM: at91/defconfig: add the XDMA driver ARM: at91: sama5: update defconfig ARM: defconfig: imx_v6_v7_defconfig updates ARM: multi_v7_defconfig: add driver support for hix5hd2 ARM: exynos_defconfig: Use 16 minors per MMC block device ARM: mvebu: add MTD_BLOCK to mvebu_v7_defconfig ARM: mvebu: enable i2c device in mvebu_v7_defconfig ARM: mvebu: re-enable SDHCI driver for Armada 38x SoC in v7 defconfig ARM: tegra: Regenerate default configuration ARM: multi_v7_defconfig: Enable cgroups ARM: multi_v7_defconfig: Enable Broadcom Cygnus ...
183 lines
4.3 KiB
Plaintext
183 lines
4.3 KiB
Plaintext
CONFIG_SYSVIPC=y
|
|
CONFIG_NO_HZ=y
|
|
CONFIG_IKCONFIG=y
|
|
CONFIG_IKCONFIG_PROC=y
|
|
CONFIG_LOG_BUF_SHIFT=16
|
|
CONFIG_BLK_DEV_INITRD=y
|
|
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
|
|
CONFIG_SYSCTL_SYSCALL=y
|
|
CONFIG_EMBEDDED=y
|
|
CONFIG_PERF_EVENTS=y
|
|
CONFIG_SLAB=y
|
|
CONFIG_ARCH_SHMOBILE_MULTI=y
|
|
CONFIG_ARCH_EMEV2=y
|
|
CONFIG_ARCH_R7S72100=y
|
|
CONFIG_ARCH_R8A7740=y
|
|
CONFIG_ARCH_R8A7779=y
|
|
CONFIG_ARCH_R8A7790=y
|
|
CONFIG_ARCH_R8A7791=y
|
|
CONFIG_ARCH_R8A7794=y
|
|
CONFIG_MACH_LAGER=y
|
|
CONFIG_MACH_MARZEN=y
|
|
# CONFIG_SWP_EMULATE is not set
|
|
CONFIG_CPU_BPREDICT_DISABLE=y
|
|
CONFIG_PL310_ERRATA_588369=y
|
|
CONFIG_ARM_ERRATA_754322=y
|
|
CONFIG_PCI=y
|
|
CONFIG_PCI_RCAR_GEN2=y
|
|
CONFIG_PCI_RCAR_GEN2_PCIE=y
|
|
CONFIG_SMP=y
|
|
CONFIG_SCHED_MC=y
|
|
CONFIG_HAVE_ARM_ARCH_TIMER=y
|
|
CONFIG_NR_CPUS=8
|
|
CONFIG_AEABI=y
|
|
CONFIG_HIGHMEM=y
|
|
CONFIG_ZBOOT_ROM_TEXT=0x0
|
|
CONFIG_ZBOOT_ROM_BSS=0x0
|
|
CONFIG_ARM_APPENDED_DTB=y
|
|
CONFIG_KEXEC=y
|
|
CONFIG_VFP=y
|
|
CONFIG_NEON=y
|
|
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
|
|
CONFIG_PM_RUNTIME=y
|
|
CONFIG_NET=y
|
|
CONFIG_PACKET=y
|
|
CONFIG_UNIX=y
|
|
CONFIG_INET=y
|
|
CONFIG_IP_PNP=y
|
|
CONFIG_IP_PNP_DHCP=y
|
|
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
|
|
CONFIG_DEVTMPFS=y
|
|
CONFIG_DEVTMPFS_MOUNT=y
|
|
CONFIG_MTD=y
|
|
CONFIG_MTD_M25P80=y
|
|
CONFIG_MTD_SPI_NOR=y
|
|
CONFIG_EEPROM_AT24=y
|
|
CONFIG_BLK_DEV_SD=y
|
|
CONFIG_ATA=y
|
|
CONFIG_SATA_RCAR=y
|
|
CONFIG_NETDEVICES=y
|
|
# 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_FARADAY 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_SH_ETH=y
|
|
# CONFIG_NET_VENDOR_SEEQ is not set
|
|
CONFIG_SMSC911X=y
|
|
# CONFIG_NET_VENDOR_STMICRO is not set
|
|
# CONFIG_NET_VENDOR_VIA is not set
|
|
# CONFIG_NET_VENDOR_WIZNET is not set
|
|
CONFIG_SMSC_PHY=y
|
|
# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
|
|
CONFIG_KEYBOARD_GPIO=y
|
|
# CONFIG_INPUT_MOUSE is not set
|
|
CONFIG_INPUT_TOUCHSCREEN=y
|
|
CONFIG_TOUCHSCREEN_ST1232=y
|
|
# CONFIG_LEGACY_PTYS is not set
|
|
CONFIG_SERIAL_8250=y
|
|
CONFIG_SERIAL_8250_CONSOLE=y
|
|
CONFIG_SERIAL_8250_EXTENDED=y
|
|
CONFIG_SERIAL_8250_EM=y
|
|
CONFIG_SERIAL_SH_SCI=y
|
|
CONFIG_SERIAL_SH_SCI_NR_UARTS=20
|
|
CONFIG_SERIAL_SH_SCI_CONSOLE=y
|
|
CONFIG_I2C_GPIO=y
|
|
CONFIG_I2C_RIIC=y
|
|
CONFIG_I2C_SH_MOBILE=y
|
|
CONFIG_I2C_RCAR=y
|
|
CONFIG_SPI=y
|
|
CONFIG_SPI_RSPI=y
|
|
CONFIG_SPI_SH_MSIOF=y
|
|
CONFIG_SPI_SH_HSPI=y
|
|
CONFIG_GPIO_EM=y
|
|
CONFIG_GPIO_RCAR=y
|
|
# CONFIG_HWMON is not set
|
|
CONFIG_THERMAL=y
|
|
CONFIG_RCAR_THERMAL=y
|
|
CONFIG_REGULATOR=y
|
|
CONFIG_REGULATOR_FIXED_VOLTAGE=y
|
|
CONFIG_REGULATOR_GPIO=y
|
|
CONFIG_MEDIA_SUPPORT=y
|
|
CONFIG_MEDIA_CAMERA_SUPPORT=y
|
|
CONFIG_MEDIA_CONTROLLER=y
|
|
CONFIG_VIDEO_V4L2_SUBDEV_API=y
|
|
CONFIG_V4L_PLATFORM_DRIVERS=y
|
|
CONFIG_SOC_CAMERA=y
|
|
CONFIG_SOC_CAMERA_PLATFORM=y
|
|
CONFIG_VIDEO_RCAR_VIN=y
|
|
CONFIG_V4L_MEM2MEM_DRIVERS=y
|
|
CONFIG_VIDEO_RENESAS_VSP1=y
|
|
# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
|
|
CONFIG_VIDEO_ADV7180=y
|
|
CONFIG_DRM=y
|
|
CONFIG_DRM_RCAR_DU=y
|
|
CONFIG_BACKLIGHT_LCD_SUPPORT=y
|
|
# CONFIG_LCD_CLASS_DEVICE is not set
|
|
# CONFIG_BACKLIGHT_GENERIC is not set
|
|
CONFIG_BACKLIGHT_PWM=y
|
|
CONFIG_SOUND=y
|
|
CONFIG_SND=y
|
|
CONFIG_SND_SOC=y
|
|
CONFIG_SND_SOC_SH4_FSI=y
|
|
CONFIG_SND_SOC_RCAR=y
|
|
CONFIG_SND_SOC_AK4642=y
|
|
CONFIG_SND_SOC_WM8978=y
|
|
CONFIG_USB=y
|
|
CONFIG_USB_EHCI_HCD=y
|
|
CONFIG_USB_OHCI_HCD=y
|
|
CONFIG_USB_RENESAS_USBHS=y
|
|
CONFIG_USB_RCAR_PHY=y
|
|
CONFIG_USB_RCAR_GEN2_PHY=y
|
|
CONFIG_USB_GADGET=y
|
|
CONFIG_USB_RENESAS_USBHS_UDC=y
|
|
CONFIG_USB_ETH=y
|
|
CONFIG_MMC=y
|
|
CONFIG_MMC_SDHI=y
|
|
CONFIG_MMC_SH_MMCIF=y
|
|
CONFIG_NEW_LEDS=y
|
|
CONFIG_LEDS_CLASS=y
|
|
CONFIG_LEDS_GPIO=y
|
|
CONFIG_RTC_CLASS=y
|
|
CONFIG_RTC_DRV_S35390A=y
|
|
CONFIG_DMADEVICES=y
|
|
CONFIG_SH_DMAE=y
|
|
CONFIG_RCAR_AUDMAC_PP=y
|
|
CONFIG_RCAR_DMAC=y
|
|
# CONFIG_IOMMU_SUPPORT is not set
|
|
CONFIG_PWM=y
|
|
CONFIG_PWM_RENESAS_TPU=y
|
|
# CONFIG_DNOTIFY is not set
|
|
CONFIG_MSDOS_FS=y
|
|
CONFIG_VFAT_FS=y
|
|
CONFIG_TMPFS=y
|
|
CONFIG_CONFIGFS_FS=y
|
|
# CONFIG_MISC_FILESYSTEMS is not set
|
|
CONFIG_NFS_FS=y
|
|
CONFIG_NFS_V3_ACL=y
|
|
CONFIG_NFS_V4=y
|
|
CONFIG_NFS_V4_1=y
|
|
CONFIG_ROOT_NFS=y
|
|
CONFIG_NLS_CODEPAGE_437=y
|
|
CONFIG_NLS_ISO8859_1=y
|
|
# CONFIG_ENABLE_WARN_DEPRECATED is not set
|
|
# CONFIG_ENABLE_MUST_CHECK is not set
|
|
# CONFIG_ARM_UNWIND is not set
|
|
CONFIG_CPU_FREQ=y
|
|
CONFIG_CPU_FREQ_GOV_COMMON=y
|
|
CONFIG_CPU_FREQ_STAT=y
|
|
CONFIG_CPU_FREQ_STAT_DETAILS=y
|
|
CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
|
|
CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
|
|
CONFIG_CPU_FREQ_GOV_POWERSAVE=y
|
|
CONFIG_CPU_FREQ_GOV_USERSPACE=y
|
|
CONFIG_CPU_FREQ_GOV_ONDEMAND=y
|
|
CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
|
|
CONFIG_CPU_THERMAL=y
|
|
CONFIG_GENERIC_CPUFREQ_CPU0=y
|
|
CONFIG_REGULATOR_DA9210=y
|