mvebu: enable SMP with SMP on UP enabled

The same kernel works ok for both Armada 370 (UP) and Armada XP (SMP)

Signed-off-by: Florian Fainelli <florian@openwrt.org>

SVN-Revision: 35178

1 files changed, 23 insertions, 2 deletions

diff --git a/target/linux/mvebu/config-default b/target/linux/mvebu/config-default
index 562d6f0..55a625b 100644
--- a/target/linux/mvebu/config-default
+++ b/target/linux/mvebu/config-default
@@ -33,9 +33,13 @@ CONFIG_ARM_APPENDED_DTB=y
 # CONFIG_ARM_ERRATA_458693 is not set
 # CONFIG_ARM_ERRATA_460075 is not set
 CONFIG_ARM_ERRATA_720789=y
+# CONFIG_ARM_ERRATA_742230 is not set
+# CONFIG_ARM_ERRATA_742231 is not set
 # CONFIG_ARM_ERRATA_743622 is not set
 CONFIG_ARM_ERRATA_751472=y
 # CONFIG_ARM_ERRATA_754322 is not set
+# CONFIG_ARM_ERRATA_754327 is not set
+# CONFIG_ARM_ERRATA_764369 is not set
 CONFIG_ARM_GIC=y
 CONFIG_ARM_L1_CACHE_SHIFT=6
 CONFIG_ARM_L1_CACHE_SHIFT_6=y
@@ -72,6 +76,7 @@ CONFIG_CPU_HAS_ASID=y
 # CONFIG_CPU_ICACHE_DISABLE is not set
 CONFIG_CPU_PABRT_V7=y
 CONFIG_CPU_PJ4B=y
+CONFIG_CPU_RMAP=y
 CONFIG_CPU_TLB_V7=y
 CONFIG_CPU_V7=y
 CONFIG_CRC_ITU_T=m
@@ -100,6 +105,7 @@ CONFIG_FAT_FS=y
 CONFIG_FRAME_POINTER=y
 CONFIG_GENERIC_BUG=y
 CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
 CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
 CONFIG_GENERIC_GPIO=y
 CONFIG_GENERIC_IO=y
@@ -122,6 +128,8 @@ CONFIG_HAVE_ARCH_KGDB=y
 CONFIG_HAVE_ARCH_PFN_VALID=y
 CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
 CONFIG_HAVE_ARCH_TRACEHOOK=y
+CONFIG_HAVE_ARM_SCU=y
+CONFIG_HAVE_ARM_TWD=y
 CONFIG_HAVE_BPF_JIT=y
 CONFIG_HAVE_CLK=y
 CONFIG_HAVE_CLK_PREPARE=y
@@ -141,7 +149,6 @@ CONFIG_HAVE_KERNEL_GZIP=y
 CONFIG_HAVE_KERNEL_LZMA=y
 CONFIG_HAVE_KERNEL_LZO=y
 CONFIG_HAVE_KERNEL_XZ=y
-CONFIG_HAVE_LATENCYTOP_SUPPORT=y
 CONFIG_HAVE_MEMBLOCK=y
 CONFIG_HAVE_NET_DSA=y
 CONFIG_HAVE_OPROFILE=y
@@ -154,6 +161,7 @@ CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
 CONFIG_HAVE_UID16=y
 CONFIG_HIGHMEM=y
 # CONFIG_HIGHPTE is not set
+CONFIG_HOTPLUG_CPU=y
 CONFIG_ICST=y
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_IRQ_DOMAIN=y
@@ -162,6 +170,7 @@ CONFIG_ISO9660_FS=y
 CONFIG_JBD=y
 CONFIG_JUMP_LABEL=y
 CONFIG_KTIME_SCALAR=y
+CONFIG_LOCAL_TIMERS=y
 CONFIG_LOG_BUF_SHIFT=14
 CONFIG_MACH_ARMADA_370=y
 CONFIG_MACH_ARMADA_370_XP=y
@@ -170,10 +179,12 @@ CONFIG_MAGIC_SYSRQ=y
 CONFIG_MDIO_BOARDINFO=y
 CONFIG_MIGHT_HAVE_CACHE_L2X0=y
 CONFIG_MODULES_USE_ELF_REL=y
+# CONFIG_MPCORE_WATCHDOG is not set
 CONFIG_MSDOS_FS=y
 CONFIG_MTD_OF_PARTS=y
 # CONFIG_MTD_PHYSMAP_OF is not set
 CONFIG_MULTI_IRQ_HANDLER=y
+CONFIG_MUTEX_SPIN_ON_OWNER=y
 CONFIG_MVEBU_CLK_CORE=y
 CONFIG_MVEBU_CLK_CPU=y
 CONFIG_MVEBU_CLK_GATING=y
@@ -181,7 +192,6 @@ CONFIG_MVMDIO=y
 CONFIG_MVNETA=y
 CONFIG_MV_XOR=y
 CONFIG_NEED_DMA_MAP_STATE=y
-CONFIG_NEED_PER_CPU_KM=y
 # CONFIG_NEON is not set
 CONFIG_NET_DMA=y
 CONFIG_NLS=y
@@ -191,6 +201,7 @@ CONFIG_NLS_ISO8859_1=y
 CONFIG_NLS_ISO8859_2=y
 CONFIG_NLS_UTF8=y
 CONFIG_NO_IOPORT=y
+CONFIG_NR_CPUS=4
 CONFIG_OF=y
 CONFIG_OF_ADDRESS=y
 CONFIG_OF_DEVICE=y
@@ -227,23 +238,32 @@ CONFIG_PLAT_VERSATILE=y
 CONFIG_PLAT_VERSATILE_CLCD=y
 CONFIG_PLAT_VERSATILE_SCHED_CLOCK=y
 # CONFIG_PREEMPT_RCU is not set
+CONFIG_RFS_ACCEL=y
+CONFIG_RPS=y
 CONFIG_RTC_CLASS=y
+# CONFIG_RTC_DRV_MV is not set
 # CONFIG_SCSI_DMA is not set
 CONFIG_SERIAL_8250_DW=y
 # CONFIG_SERIAL_AMBA_PL010 is not set
 # CONFIG_SERIAL_AMBA_PL011 is not set
 CONFIG_SERIAL_OF_PLATFORM=y
+CONFIG_SMP=y
+CONFIG_SMP_ON_UP=y
 CONFIG_SPARSE_IRQ=y
+CONFIG_STOP_MACHINE=y
 # CONFIG_SWP_EMULATE is not set
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
 # CONFIG_THUMB2_KERNEL is not set
 CONFIG_TICK_CPU_ACCOUNTING=y
 CONFIG_TIMER_STATS=y
+# CONFIG_TINY_RCU is not set
+CONFIG_TREE_RCU=y
 CONFIG_UDF_FS=m
 CONFIG_UID16=y
 CONFIG_UIDGID_CONVERTED=y
 # CONFIG_USB_ARCH_HAS_OHCI is not set
 # CONFIG_USB_ARCH_HAS_XHCI is not set
+CONFIG_USE_GENERIC_SMP_HELPERS=y
 CONFIG_USE_OF=y
 CONFIG_VECTORS_BASE=0xffff0000
 CONFIG_VEXPRESS_CONFIG=y
@@ -253,6 +273,7 @@ CONFIG_VFPv3=y
 # CONFIG_XEN is not set
 CONFIG_XZ_DEC_ARM=y
 CONFIG_XZ_DEC_BCJ=y
+CONFIG_XPS=y
 CONFIG_ZBOOT_ROM_BSS=0x0
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZONE_DMA_FLAG=0