make sure SMP is enabled by default on arm
it is disabled on kirkwood the only non smp platform tweak the vexpress options very slightly
This commit is contained in:
parent
a426d7787b
commit
20639e833d
@ -13,6 +13,10 @@ CONFIG_OABI_COMPAT=y
|
|||||||
CONFIG_VFP=y
|
CONFIG_VFP=y
|
||||||
CONFIG_ARM_UNWIND=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_NWFPE is not set
|
||||||
CONFIG_FPE_FASTFPE=y
|
CONFIG_FPE_FASTFPE=y
|
||||||
|
|
||||||
|
@ -116,11 +116,8 @@ CONFIG_ARM_ERRATA_720789=y
|
|||||||
CONFIG_ARM_GIC=y
|
CONFIG_ARM_GIC=y
|
||||||
# CONFIG_PCI_SYSCALL is not set
|
# CONFIG_PCI_SYSCALL is not set
|
||||||
# CONFIG_PCCARD is not set
|
# CONFIG_PCCARD is not set
|
||||||
CONFIG_SMP=y
|
|
||||||
CONFIG_SMP_ON_UP=y
|
|
||||||
CONFIG_HAVE_ARM_SCU=y
|
CONFIG_HAVE_ARM_SCU=y
|
||||||
CONFIG_HAVE_ARM_TWD=y
|
CONFIG_HAVE_ARM_TWD=y
|
||||||
CONFIG_NR_CPUS=2
|
|
||||||
CONFIG_HOTPLUG_CPU=y
|
CONFIG_HOTPLUG_CPU=y
|
||||||
CONFIG_LOCAL_TIMERS=y
|
CONFIG_LOCAL_TIMERS=y
|
||||||
CONFIG_HZ=128
|
CONFIG_HZ=128
|
||||||
|
@ -48,7 +48,6 @@ CONFIG_ARM_ERRATA_720789=y
|
|||||||
# CONFIG_ARM_ERRATA_754322 is not set
|
# CONFIG_ARM_ERRATA_754322 is not set
|
||||||
# CONFIG_ARM_ERRATA_754327 is not set
|
# CONFIG_ARM_ERRATA_754327 is not set
|
||||||
# CONFIG_ARM_ERRATA_764369 is not set
|
# CONFIG_ARM_ERRATA_764369 is not set
|
||||||
CONFIG_SMP_ON_UP=y
|
|
||||||
CONFIG_LOCAL_TIMERS=y
|
CONFIG_LOCAL_TIMERS=y
|
||||||
# CONFIG_THUMB2_KERNEL is not set
|
# CONFIG_THUMB2_KERNEL is not set
|
||||||
# CONFIG_NEON is not set
|
# CONFIG_NEON is not set
|
||||||
|
@ -1,11 +1,23 @@
|
|||||||
CONFIG_ARM=y
|
|
||||||
|
|
||||||
CONFIG_ARCH_VEXPRESS=y
|
CONFIG_ARCH_VEXPRESS=y
|
||||||
CONFIG_ARCH_VEXPRESS_CA9X4=y
|
CONFIG_ARCH_VEXPRESS_CA9X4=y
|
||||||
|
|
||||||
CONFIG_PLAT_VERSATILE=y
|
|
||||||
CONFIG_PLAT_VERSATILE_CLCD=y
|
CONFIG_PLAT_VERSATILE_CLCD=y
|
||||||
CONFIG_PLAT_VERSATILE_SCHED_CLOCK=y
|
CONFIG_PLAT_VERSATILE_SCHED_CLOCK=y
|
||||||
|
CONFIG_PLAT_VERSATILE=y
|
||||||
|
CONFIG_ARM_TIMER_SP804=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_PMU=y
|
||||||
|
|
||||||
# Need to verify whether these are generic or vexpress specific
|
# Need to verify whether these are generic or vexpress specific
|
||||||
CONFIG_ARM_AMBA=y
|
CONFIG_ARM_AMBA=y
|
||||||
@ -15,21 +27,6 @@ CONFIG_VFP=y
|
|||||||
CONFIG_VFPv3=y
|
CONFIG_VFPv3=y
|
||||||
|
|
||||||
CONFIG_CPUSETS=y
|
CONFIG_CPUSETS=y
|
||||||
CONFIG_CPU_32v6K=y
|
|
||||||
CONFIG_CPU_32v7=y
|
|
||||||
CONFIG_CPU_ABRT_EV7=y
|
|
||||||
CONFIG_CPU_CACHE_V7=y
|
|
||||||
CONFIG_CPU_CACHE_VIPT=y
|
|
||||||
CONFIG_CPU_COPY_V6=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
|
|
||||||
|
|
||||||
# CONFIG_THUMB2_AVOID_R_ARM_THM_JUMP11 is not set
|
# CONFIG_THUMB2_AVOID_R_ARM_THM_JUMP11 is not set
|
||||||
# CONFIG_THUMB2_KERNEL is not set
|
# CONFIG_THUMB2_KERNEL is not set
|
||||||
CONFIG_TICK_ONESHOT=y
|
CONFIG_TICK_ONESHOT=y
|
||||||
|
@ -2326,6 +2326,10 @@ fi
|
|||||||
# ||----w |
|
# ||----w |
|
||||||
# || ||
|
# || ||
|
||||||
%changelog
|
%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>
|
* Mon May 14 2012 Josh Boyer <jwboyer@redhat.com>
|
||||||
- Enable DRM_VIA again per Adam Jackson
|
- Enable DRM_VIA again per Adam Jackson
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user