From 6bebad469b89cf505b3a85154ce9468767eb1db4 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Tue, 26 Aug 2014 11:08:07 +0100
Subject: Minor generic ARMv7 updates, Build tegra on both LPAE and general
 ARMv7 kernels (thank srwarren RHBZ 1110963), Set CMA to 64mb on LPAE kernel
 (RHBZ 1127000)

---
 config-armv7-lpae | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

(limited to 'config-armv7-lpae')

diff --git a/config-armv7-lpae b/config-armv7-lpae
index 7ad1fce57..661ce3685 100644
--- a/config-armv7-lpae
+++ b/config-armv7-lpae
@@ -8,11 +8,9 @@ CONFIG_ARCH_VIRT=y
 # CONFIG_ARCH_OMAP4 is not set
 # CONFIG_SOC_OMAP5 is not set
 # CONFIG_SOC_AM33XX is not set
-# CONFIG_SND_AM33XX_SOC_EVM is not set
 # CONFIG_SOC_AM43XX is not set
 # CONFIG_SOC_DRA7XX is not set
 # CONFIG_ARCH_ROCKCHIP is not set
-# CONFIG_ARCH_TEGRA is not set
 # CONFIG_ARCH_ZYNQ is not set
 # CONFIG_ARCH_AXXIA is not set
 
@@ -23,6 +21,9 @@ CONFIG_ARM_VIRT_EXT=y
 CONFIG_VIRTUALIZATION=y
 CONFIG_ARM_DMA_IOMMU_ALIGNMENT=8
 
+CONFIG_CMA_SIZE_SEL_MBYTES=y
+CONFIG_CMA_SIZE_MBYTES=64
+
 # Cortex-A15
 CONFIG_ARM_ERRATA_798181=y
 CONFIG_ARM_ERRATA_773022=y
@@ -30,7 +31,6 @@ CONFIG_ARM_ERRATA_773022=y
 CONFIG_KVM=y
 CONFIG_KVM_ARM_HOST=y
 CONFIG_KVM_ARM_MAX_VCPUS=8
-CONFIG_KVM_ARM_VGIC=y
 CONFIG_KVM_ARM_TIMER=y
 
 # CONFIG_XEN is not set
@@ -62,10 +62,22 @@ CONFIG_POWER_RESET_KEYSTONE=y
 CONFIG_DAVINCI_WATCHDOG=m
 CONFIG_SPI_DAVINCI=m
 CONFIG_TI_DAVINCI_MDIO=m
-# CONFIG_SND_DAVINCI_SOC is not set
 # CONFIG_TI_SOC_THERMAL is not set
 
-# CONFIG_TEGRA_HOST1X is not set
-# CONFIG_DRM_PANEL_SIMPLE is not set
-# CONFIG_DRM_PANEL_LD9040 is not set
-# CONFIG_DRM_PANEL_S6E8AA0 is not set
+# Tegra (non A15 device options)
+# CONFIG_ARCH_TEGRA_2x_SOC is not set
+# CONFIG_ARCH_TEGRA_3x_SOC is not set
+# CONFIG_TEGRA20_MC is not set
+# CONFIG_TEGRA_IOMMU_GART is not set
+# CONFIG_SPI_TEGRA20_SFLASH is not set
+# CONFIG_SPI_TEGRA20_SLINK is not set
+# CONFIG_MFD_MAX8907 is not set
+# CONFIG_MFD_NVEC is not set
+# CONFIG_SND_SOC_TEGRA_ALC5632 is not set
+# CONFIG_SND_SOC_TEGRA_TRIMSLICE is not set
+# CONFIG_SND_SOC_TEGRA_WM8753 is not set
+# CONFIG_SND_SOC_TEGRA_WM8903 is not set
+# CONFIG_SND_SOC_TEGRA_WM9712 is not set
+# CONFIG_SND_SOC_TEGRA20_AC97 is not set
+# CONFIG_SND_SOC_TEGRA20_DAS is not set
+# CONFIG_SND_SOC_TEGRA20_SPDIF is not set
-- 
cgit