aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTushar Behera <tushar.behera@linaro.org>2013-08-07 15:43:05 +0530
committerTushar Behera <tushar.behera@linaro.org>2013-08-07 15:43:07 +0530
commit05adad0ee6943702a70a059964fb0c5a99f0bac4 (patch)
tree318405b02e39671b448fb141cfe8e35df1e859f0
parent525cc3dc66f7ebbc5b6342e502d45969b3735014 (diff)
CONFIG: ARNDALE: UBUNTU: Disalbe LPAE, enable CMAsamsung-lt-v3.9-7
When both CMA and LPAE are enabled, there is a boot-time kernel crash. Since LPAE is not required for member build, selecting CMA over LPAE. Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
-rw-r--r--arch/arm/configs/arndale_ubuntu_defconfig3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/configs/arndale_ubuntu_defconfig b/arch/arm/configs/arndale_ubuntu_defconfig
index 54cf579c6132..8580020dd47d 100644
--- a/arch/arm/configs/arndale_ubuntu_defconfig
+++ b/arch/arm/configs/arndale_ubuntu_defconfig
@@ -24,7 +24,6 @@ CONFIG_ARCH_EXYNOS=y
CONFIG_S3C_LOWLEVEL_UART_PORT=2
# CONFIG_ARCH_EXYNOS4 is not set
CONFIG_ARCH_EXYNOS5=y
-CONFIG_ARM_LPAE=y
CONFIG_SMP=y
CONFIG_SCHED_MC=y
CONFIG_SCHED_SMT=y
@@ -66,6 +65,8 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
CONFIG_DEVTMPFS=y
CONFIG_DEVTMPFS_MOUNT=y
CONFIG_EXTRA_FIRMWARE="edid-1920x1080.fw"
+CONFIG_CMA=y
+CONFIG_CMA_SIZE_MBYTES=64
CONFIG_CONNECTOR=y
CONFIG_MTD=y
CONFIG_MTD_CMDLINE_PARTS=y