---

yaml --- r: 68194 b: refs/heads/master c: 7da3b8e h: refs/heads/master v: v3
git-mirror · Sep 21, 2007 · 30d708f · 30d708f
1 parent 98c391e
commit 30d708f
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1ee010087e2d26f0d8182bb189d5606e3586253c
+refs/heads/master: 7da3b8ef662af6252aa17c55cc0aa6d74cbf02e4
diff --git a/trunk/arch/sh/kernel/cpu/sh4a/setup-shx3.c b/trunk/arch/sh/kernel/cpu/sh4a/setup-shx3.c
@@ -255,3 +255,17 @@ void __init plat_irq_setup(void)
 {
 	register_intc_controller(&intc_desc);
 }
+
+void __init plat_mem_setup(void)
+{
+	/* Register CPU#0 URAM space as Node 1 */
+	setup_bootmem_node(1, 0x145f0000, 0x14610000);	/* CPU0 */
+
+#if 0
+	/* XXX: Not yet.. */
+	setup_bootmem_node(2, 0x14df0000, 0x14e10000);	/* CPU1 */
+	setup_bootmem_node(3, 0x155f0000, 0x15610000);	/* CPU2 */
+	setup_bootmem_node(4, 0x15df0000, 0x15e10000);	/* CPU3 */
+	setup_bootmem_node(5, 0x16000000, 0x16020000);	/* CSM */
+#endif
+}
diff --git a/trunk/arch/sh/mm/Kconfig b/trunk/arch/sh/mm/Kconfig
@@ -198,6 +198,8 @@ config CPU_SUBTYPE_SHX3
 	select CPU_SH4A
 	select CPU_SHX3
 	select CPU_HAS_INTC_IRQ
+	select ARCH_SPARSEMEM_ENABLE
+	select SYS_SUPPORTS_NUMA
 
 # SH4AL-DSP Processor Support
 
@@ -323,6 +325,7 @@ config ARCH_SPARSEMEM_DEFAULT
 
 config MAX_ACTIVE_REGIONS
 	int
+	default "6" if (CPU_SUBTYPE_SHX3 && SPARSEMEM)
 	default "2" if (CPU_SUBTYPE_SH7722 && SPARSEMEM)
 	default "1"