diff options
author | Paul Mundt <lethal@linux-sh.org> | 2008-05-25 22:45:45 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2008-05-25 22:45:45 -0400 |
commit | 9c28faaab19132b3f029d4ffa9a4dee8a11f0cbb (patch) | |
tree | 4cb81f20ab9f7e21460b28b9a6c3b623a9ca2b7d | |
parent | c511afb41f21857fbbae78f83f88b1247597f46f (diff) |
sh: Drop broken URAM support on SH7723.
This was copied over from the previous MobileR bits, which doesn't
apply to R2. The URAM block on R2 is recycled for the L2 instead.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
-rw-r--r-- | arch/sh/Kconfig | 1 | ||||
-rw-r--r-- | arch/sh/kernel/cpu/sh4a/setup-sh7723.c | 6 |
2 files changed, 0 insertions, 7 deletions
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index 8a68160079a9..9a854c8e5274 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig | |||
@@ -281,7 +281,6 @@ config CPU_SUBTYPE_SH7723 | |||
281 | select CPU_SH4A | 281 | select CPU_SH4A |
282 | select CPU_SHX2 | 282 | select CPU_SHX2 |
283 | select ARCH_SPARSEMEM_ENABLE | 283 | select ARCH_SPARSEMEM_ENABLE |
284 | select SYS_SUPPORTS_NUMA | ||
285 | help | 284 | help |
286 | Select SH7723 if you have an SH-MobileR2 CPU. | 285 | Select SH7723 if you have an SH-MobileR2 CPU. |
287 | 286 | ||
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7723.c b/arch/sh/kernel/cpu/sh4a/setup-sh7723.c index 629b06ceb61f..566ce79b9abf 100644 --- a/arch/sh/kernel/cpu/sh4a/setup-sh7723.c +++ b/arch/sh/kernel/cpu/sh4a/setup-sh7723.c | |||
@@ -292,9 +292,3 @@ void __init plat_irq_setup(void) | |||
292 | { | 292 | { |
293 | register_intc_controller(&intc_desc); | 293 | register_intc_controller(&intc_desc); |
294 | } | 294 | } |
295 | |||
296 | void __init plat_mem_setup(void) | ||
297 | { | ||
298 | /* Register the URAM space as Node 1 */ | ||
299 | setup_bootmem_node(1, 0x055f0000, 0x05610000); | ||
300 | } | ||