diff options
author | Paul Mackerras <paulus@samba.org> | 2006-03-27 18:22:10 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-03-27 18:22:10 -0500 |
commit | 0a26b1364f14852bc9a51db0ca63c5250c775627 (patch) | |
tree | 83422473cb4bf4c450012cded06288a0dc6abedf /arch/ppc/mm/init.c | |
parent | ff2e6d7e27cf1f757ab0d97e1a9e46de47152a0e (diff) |
ppc: Remove CHRP, POWER3 and POWER4 support from arch/ppc
32-bit CHRP machines are now supported only in arch/powerpc, as are
all 64-bit PowerPC processors. This means that we don't use
Open Firmware on any platform in arch/ppc any more.
This makes PReP support a single-platform option like every other
platform support option in arch/ppc now, thus CONFIG_PPC_MULTIPLATFORM
is gone from arch/ppc. CONFIG_PPC_PREP is the option that selects
PReP support and is generally what has replaced
CONFIG_PPC_MULTIPLATFORM within arch/ppc.
_machine is all but dead now, being #defined to 0.
Updated Makefiles, comments and Kconfig options generally to reflect
these changes.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/ppc/mm/init.c')
-rw-r--r-- | arch/ppc/mm/init.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/arch/ppc/mm/init.c b/arch/ppc/mm/init.c index cb1c294fb932..386e000bcb73 100644 --- a/arch/ppc/mm/init.c +++ b/arch/ppc/mm/init.c | |||
@@ -412,14 +412,6 @@ void __init mem_init(void) | |||
412 | } | 412 | } |
413 | #endif /* CONFIG_BLK_DEV_INITRD */ | 413 | #endif /* CONFIG_BLK_DEV_INITRD */ |
414 | 414 | ||
415 | #ifdef CONFIG_PPC_OF | ||
416 | /* mark the RTAS pages as reserved */ | ||
417 | if ( rtas_data ) | ||
418 | for (addr = (ulong)__va(rtas_data); | ||
419 | addr < PAGE_ALIGN((ulong)__va(rtas_data)+rtas_size) ; | ||
420 | addr += PAGE_SIZE) | ||
421 | SetPageReserved(virt_to_page(addr)); | ||
422 | #endif | ||
423 | for (addr = PAGE_OFFSET; addr < (unsigned long)high_memory; | 415 | for (addr = PAGE_OFFSET; addr < (unsigned long)high_memory; |
424 | addr += PAGE_SIZE) { | 416 | addr += PAGE_SIZE) { |
425 | if (!PageReserved(virt_to_page(addr))) | 417 | if (!PageReserved(virt_to_page(addr))) |
@@ -494,11 +486,6 @@ set_phys_avail(unsigned long total_memory) | |||
494 | initrd_end - initrd_start, 1); | 486 | initrd_end - initrd_start, 1); |
495 | } | 487 | } |
496 | #endif /* CONFIG_BLK_DEV_INITRD */ | 488 | #endif /* CONFIG_BLK_DEV_INITRD */ |
497 | #ifdef CONFIG_PPC_OF | ||
498 | /* remove the RTAS pages from the available memory */ | ||
499 | if (rtas_data) | ||
500 | mem_pieces_remove(&phys_avail, rtas_data, rtas_size, 1); | ||
501 | #endif | ||
502 | } | 489 | } |
503 | 490 | ||
504 | /* Mark some memory as reserved by removing it from phys_avail. */ | 491 | /* Mark some memory as reserved by removing it from phys_avail. */ |