summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config-arm-generic4
-rw-r--r--config-arm-omap3
-rw-r--r--config-arm-tegra1
-rw-r--r--config-arm-versatile31
-rw-r--r--kernel.spec4
5 files changed, 22 insertions, 21 deletions
diff --git a/config-arm-generic b/config-arm-generic
index 324579b1f..5aabaa67b 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -13,6 +13,10 @@ CONFIG_OABI_COMPAT=y
CONFIG_VFP=y
CONFIG_ARM_UNWIND=y
+CONFIG_SMP=y
+CONFIG_NR_CPUS=4
+CONFIG_SMP_ON_UP=y
+
# CONFIG_FPE_NWFPE is not set
CONFIG_FPE_FASTFPE=y
diff --git a/config-arm-omap b/config-arm-omap
index 11887ec15..f53d7d3bc 100644
--- a/config-arm-omap
+++ b/config-arm-omap
@@ -116,11 +116,8 @@ CONFIG_ARM_ERRATA_720789=y
CONFIG_ARM_GIC=y
# CONFIG_PCI_SYSCALL is not set
# CONFIG_PCCARD is not set
-CONFIG_SMP=y
-CONFIG_SMP_ON_UP=y
CONFIG_HAVE_ARM_SCU=y
CONFIG_HAVE_ARM_TWD=y
-CONFIG_NR_CPUS=2
CONFIG_HOTPLUG_CPU=y
CONFIG_LOCAL_TIMERS=y
CONFIG_HZ=128
diff --git a/config-arm-tegra b/config-arm-tegra
index 0a169eced..1f20ce7f9 100644
--- a/config-arm-tegra
+++ b/config-arm-tegra
@@ -48,7 +48,6 @@ CONFIG_ARM_ERRATA_720789=y
# CONFIG_ARM_ERRATA_754322 is not set
# CONFIG_ARM_ERRATA_754327 is not set
# CONFIG_ARM_ERRATA_764369 is not set
-CONFIG_SMP_ON_UP=y
CONFIG_LOCAL_TIMERS=y
# CONFIG_THUMB2_KERNEL is not set
# CONFIG_NEON is not set
diff --git a/config-arm-versatile b/config-arm-versatile
index 83cb9d7a9..207042501 100644
--- a/config-arm-versatile
+++ b/config-arm-versatile
@@ -1,35 +1,32 @@
-CONFIG_ARM=y
-
CONFIG_ARCH_VEXPRESS=y
CONFIG_ARCH_VEXPRESS_CA9X4=y
-
-CONFIG_PLAT_VERSATILE=y
CONFIG_PLAT_VERSATILE_CLCD=y
CONFIG_PLAT_VERSATILE_SCHED_CLOCK=y
+CONFIG_PLAT_VERSATILE=y
+CONFIG_ARM_TIMER_SP804=y
-# Need to verify whether these are generic or vexpress specific
-CONFIG_ARM_AMBA=y
-
-CONFIG_USE_GENERIC_SMP_HELPERS=y
-CONFIG_VFP=y
-CONFIG_VFPv3=y
-
-CONFIG_CPUSETS=y
+CONFIG_CPU_V7=y
CONFIG_CPU_32v6K=y
CONFIG_CPU_32v7=y
CONFIG_CPU_ABRT_EV7=y
+CONFIG_CPU_PABRT_V7=y
CONFIG_CPU_CACHE_V7=y
CONFIG_CPU_CACHE_VIPT=y
CONFIG_CPU_COPY_V6=y
+CONFIG_CPU_TLB_V7=y
+CONFIG_CPU_HAS_ASID=y
CONFIG_CPU_CP15=y
CONFIG_CPU_CP15_MMU=y
-CONFIG_CPU_HAS_ASID=y
CONFIG_CPU_HAS_PMU=y
-CONFIG_CPU_PABRT_V7=y
-CONFIG_CPU_RMAP=y
-CONFIG_CPU_TLB_V7=y
-CONFIG_CPU_V7=y
+# Need to verify whether these are generic or vexpress specific
+CONFIG_ARM_AMBA=y
+
+CONFIG_USE_GENERIC_SMP_HELPERS=y
+CONFIG_VFP=y
+CONFIG_VFPv3=y
+
+CONFIG_CPUSETS=y
# CONFIG_THUMB2_AVOID_R_ARM_THM_JUMP11 is not set
# CONFIG_THUMB2_KERNEL is not set
CONFIG_TICK_ONESHOT=y
diff --git a/kernel.spec b/kernel.spec
index d448a4ade..332ee7f72 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2326,6 +2326,10 @@ fi
# ||----w |
# || ||
%changelog
+* Tue May 15 2012 Dennis Gilmore <dennis@ausil.us>
+- make sure smp is on in generic arm config
+- tweak vexpress config
+
* Mon May 14 2012 Josh Boyer <jwboyer@redhat.com>
- Enable DRM_VIA again per Adam Jackson