From 59a8033a4ac5116ddd7a6b6d7d2b2600dec9b01c Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Sun, 23 Mar 2014 19:13:56 +0000
Subject: [PATCH] Update some generic ARM config options

---
 config-arm-generic   | 8 +++++---
 config-arm64         | 1 -
 config-armv7         | 1 -
 config-armv7-generic | 2 --
 config-armv7-lpae    | 2 --
 kernel.spec          | 3 +++
 6 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/config-arm-generic b/config-arm-generic
index db9c50ee1..cd56b2493 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -29,8 +29,6 @@ CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
 # CONFIG_ARM_DT_BL_CPUFREQ is not set
 CONFIG_NR_CPUS=8
 
-CONFIG_ARM_DMA_USE_IOMMU=y
-# CONFIG_ARM_SMMU is not set
 CONFIG_SWIOTLB=y
 CONFIG_DMA_VIRTUAL_CHANNELS=y
 CONFIG_FB_SIMPLE=y
@@ -40,10 +38,14 @@ CONFIG_HAVE_PERF_USER_STACK_DUMP=y
 
 # ARM AMBA generic HW
 CONFIG_ARM_AMBA=y
+CONFIG_ARM_CCI=y
+CONFIG_ARM_DMA_USE_IOMMU=y
 CONFIG_ARM_GIC=y
+CONFIG_ARM_GLOBAL_TIMER=y
+CONFIG_ARM_SMMU=y
 CONFIG_MMC_ARMMMCI=y
-CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
 CONFIG_SERIAL_AMBA_PL011=y
+CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
 CONFIG_SERIO_AMBAKMI=y
 CONFIG_OC_ETM=y
 CONFIG_FB_ARMCLCD=y
diff --git a/config-arm64 b/config-arm64
index b6b53b820..38a0debd2 100644
--- a/config-arm64
+++ b/config-arm64
@@ -12,7 +12,6 @@ CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y
 CONFIG_ARCH_REQUIRE_GPIOLIB=y
 # CONFIG_ARM64_64K_PAGES is not set
 CONFIG_COMPAT=y
-CONFIG_ARM_SMMU=y
 
 CONFIG_BCMA_POSSIBLE=y
 CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
diff --git a/config-armv7 b/config-armv7
index 804e519b6..3fd95ee46 100644
--- a/config-armv7
+++ b/config-armv7
@@ -656,6 +656,5 @@ CONFIG_REGULATOR_MAX8973=m
 # CONFIG_AB8500_DEBUG is not set
 
 # CONFIG_SOC_VF610 is not set
-# CONFIG_ARM_CCI is not set
 # CONFIG_MMC_TMIO is not set
 # CONFIG_SND_SOC_ADI is not set
diff --git a/config-armv7-generic b/config-armv7-generic
index 00de28edb..26e90fe82 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -115,8 +115,6 @@ CONFIG_CPU_IDLE_GOV_MENU=y
 CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
 CONFIG_LSM_MMAP_MIN_ADDR=32768
 
-CONFIG_ARM_GLOBAL_TIMER=y
-
 CONFIG_XZ_DEC_ARM=y
 
 CONFIG_LOCAL_TIMERS=y
diff --git a/config-armv7-lpae b/config-armv7-lpae
index 64698a52a..25fe122d5 100644
--- a/config-armv7-lpae
+++ b/config-armv7-lpae
@@ -21,7 +21,6 @@ CONFIG_SYS_SUPPORTS_HUGETLBFS=y
 CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
 CONFIG_ARM_VIRT_EXT=y
 CONFIG_VIRTUALIZATION=y
-CONFIG_ARM_SMMU=y
 CONFIG_ARM_DMA_IOMMU_ALIGNMENT=8
 
 # Cortex-A15
@@ -66,7 +65,6 @@ CONFIG_SOC_EXYNOS5440=y
 CONFIG_EXYNOS_THERMAL=m
 CONFIG_PCI_EXYNOS=y
 
-CONFIG_ARM_CCI=y
 CONFIG_TCG_TIS_I2C_INFINEON=m
 
 # CONFIG_EXYNOS_ATAGS is not set
diff --git a/kernel.spec b/kernel.spec
index 3bee5e471..8472507b1 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2068,6 +2068,9 @@ fi
 #                                    ||----w |
 #                                    ||     ||
 %changelog
+* Sun Mar 23 2014 Peter Robinson <pbrobinson@fedoraproject.org>
+- Update some generic ARM config options
+
 * Fri Mar 21 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.14.0-0.rc7.git2.1
 - Linux v3.14-rc7-59-g08edb33