summaryrefslogtreecommitdiffstats
path: root/arch/arm/configs
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2015-04-03 14:57:51 -0700
committerOlof Johansson <olof@lixom.net>2015-04-03 14:57:51 -0700
commitd66e8d2e3c03bd380f23b29699d1991b1f064f22 (patch)
tree79d75fd80edec7d197ca95fcc8f1cf46cb5b894a /arch/arm/configs
parentd8ea2645e91c8a6446bc987a74ed67688763e7d4 (diff)
parentbb84296ae52da844c9cab81e0197152a69f2f841 (diff)
downloadlinux-stable-d66e8d2e3c03bd380f23b29699d1991b1f064f22.tar.gz
linux-stable-d66e8d2e3c03bd380f23b29699d1991b1f064f22.tar.bz2
linux-stable-d66e8d2e3c03bd380f23b29699d1991b1f064f22.zip
Merge tag 'samsung-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/defconfig
Merge "Samsung defconfig updates for v4.1" from Kukjin Kim: - update exynos-defconfig : enable HDMI, CPUidle, ChromeOS EC chardev driver and thermal emulation, Marvell WiFi-Ex, CPUfreq, and support for NFS rootfs : remove EXYNOS_THERMAL_CORE define and disable IOMMU support until support it * tag 'samsung-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: ARM: exynos_defconfig: Enable HDMI support ARM: exynos_defconfig: Enable options to mount a rootfs via NFS ARM: exynos_defconfig: Enable ChromeOS EC chardev driver ARM: exynos_defconfig: Enable CPU idle ARM: exynos_defconfig: Enable Marvell WiFi-Ex support ARM: exynos_defconfig: Disable IOMMU support ARM: exynos_defconfig: Enable support for cpufreq on Exynos SoCs ARM: exynos_defconfig: Enable thermal emulation for Exynos TMU ARM: exynos_defconfig: Remove CONFIG_EXYNOS_THERMAL_CORE define Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/configs')
-rw-r--r--arch/arm/configs/exynos_defconfig20
1 files changed, 18 insertions, 2 deletions
diff --git a/arch/arm/configs/exynos_defconfig b/arch/arm/configs/exynos_defconfig
index 1d8935359fd0..d034c96c039b 100644
--- a/arch/arm/configs/exynos_defconfig
+++ b/arch/arm/configs/exynos_defconfig
@@ -26,6 +26,8 @@ CONFIG_ZBOOT_ROM_BSS=0x0
CONFIG_ARM_APPENDED_DTB=y
CONFIG_ARM_ATAG_DTB_COMPAT=y
CONFIG_CMDLINE="root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M console=ttySAC1,115200 init=/linuxrc mem=256M"
+CONFIG_CPU_IDLE=y
+CONFIG_ARM_EXYNOS_CPUIDLE=y
CONFIG_VFP=y
CONFIG_NEON=y
CONFIG_PM=y
@@ -34,6 +36,14 @@ CONFIG_PACKET=y
CONFIG_UNIX=y
CONFIG_NET_KEY=y
CONFIG_INET=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+CONFIG_IP_PNP_BOOTP=y
+CONFIG_IP_PNP_RARP=y
+CONFIG_WIRELESS=y
+CONFIG_CFG80211=y
+CONFIG_MWIFIEX=y
+CONFIG_MWIFIEX_SDIO=y
CONFIG_RFKILL_REGULATOR=y
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
CONFIG_DEVTMPFS=y
@@ -91,9 +101,11 @@ CONFIG_CHARGER_MAX77693=y
CONFIG_CHARGER_TPS65090=y
CONFIG_HWMON=y
CONFIG_SENSORS_LM90=y
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_THERMAL=y
CONFIG_THERMAL=y
CONFIG_EXYNOS_THERMAL=y
-CONFIG_EXYNOS_THERMAL_CORE=y
+CONFIG_THERMAL_EMULATION=y
CONFIG_WATCHDOG=y
CONFIG_S3C2410_WATCHDOG=y
CONFIG_MFD_CROS_EC=y
@@ -118,6 +130,7 @@ CONFIG_REGULATOR_S2MPS11=y
CONFIG_REGULATOR_S5M8767=y
CONFIG_REGULATOR_TPS65090=y
CONFIG_DRM=y
+CONFIG_DRM_EXYNOS_HDMI=y
CONFIG_DRM_BRIDGE=y
CONFIG_DRM_PTN3460=y
CONFIG_DRM_PS8622=y
@@ -171,10 +184,11 @@ 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
CONFIG_COMMON_CLK_S2MPS11=y
-CONFIG_EXYNOS_IOMMU=y
CONFIG_EXTCON=y
CONFIG_EXTCON_MAX14577=y
CONFIG_EXTCON_MAX77693=y
@@ -197,6 +211,8 @@ CONFIG_TMPFS=y
CONFIG_TMPFS_POSIX_ACL=y
CONFIG_CRAMFS=y
CONFIG_ROMFS_FS=y
+CONFIG_NFS_FS=y
+CONFIG_ROOT_NFS=y
CONFIG_NLS_CODEPAGE_437=y
CONFIG_NLS_ASCII=y
CONFIG_NLS_ISO8859_1=y