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/kernel/entry.S | |
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/kernel/entry.S')
-rw-r--r-- | arch/ppc/kernel/entry.S | 52 |
1 files changed, 0 insertions, 52 deletions
diff --git a/arch/ppc/kernel/entry.S b/arch/ppc/kernel/entry.S index fa8d49789ef1..5891ecbdc703 100644 --- a/arch/ppc/kernel/entry.S +++ b/arch/ppc/kernel/entry.S | |||
@@ -930,55 +930,3 @@ END_FTR_SECTION_IFSET(CPU_FTR_601) | |||
930 | b 4b | 930 | b 4b |
931 | 931 | ||
932 | .comm ee_restarts,4 | 932 | .comm ee_restarts,4 |
933 | |||
934 | /* | ||
935 | * PROM code for specific machines follows. Put it | ||
936 | * here so it's easy to add arch-specific sections later. | ||
937 | * -- Cort | ||
938 | */ | ||
939 | #ifdef CONFIG_PPC_OF | ||
940 | /* | ||
941 | * On CHRP, the Run-Time Abstraction Services (RTAS) have to be | ||
942 | * called with the MMU off. | ||
943 | */ | ||
944 | _GLOBAL(enter_rtas) | ||
945 | stwu r1,-INT_FRAME_SIZE(r1) | ||
946 | mflr r0 | ||
947 | stw r0,INT_FRAME_SIZE+4(r1) | ||
948 | lis r4,rtas_data@ha | ||
949 | lwz r4,rtas_data@l(r4) | ||
950 | lis r6,1f@ha /* physical return address for rtas */ | ||
951 | addi r6,r6,1f@l | ||
952 | tophys(r6,r6) | ||
953 | tophys(r7,r1) | ||
954 | lis r8,rtas_entry@ha | ||
955 | lwz r8,rtas_entry@l(r8) | ||
956 | mfmsr r9 | ||
957 | stw r9,8(r1) | ||
958 | LOAD_MSR_KERNEL(r0,MSR_KERNEL) | ||
959 | SYNC /* disable interrupts so SRR0/1 */ | ||
960 | MTMSRD(r0) /* don't get trashed */ | ||
961 | li r9,MSR_KERNEL & ~(MSR_IR|MSR_DR) | ||
962 | mtlr r6 | ||
963 | CLR_TOP32(r7) | ||
964 | mtspr SPRN_SPRG2,r7 | ||
965 | mtspr SPRN_SRR0,r8 | ||
966 | mtspr SPRN_SRR1,r9 | ||
967 | RFI | ||
968 | 1: tophys(r9,r1) | ||
969 | lwz r8,INT_FRAME_SIZE+4(r9) /* get return address */ | ||
970 | lwz r9,8(r9) /* original msr value */ | ||
971 | FIX_SRR1(r9,r0) | ||
972 | addi r1,r1,INT_FRAME_SIZE | ||
973 | li r0,0 | ||
974 | mtspr SPRN_SPRG2,r0 | ||
975 | mtspr SPRN_SRR0,r8 | ||
976 | mtspr SPRN_SRR1,r9 | ||
977 | RFI /* return to caller */ | ||
978 | |||
979 | .globl machine_check_in_rtas | ||
980 | machine_check_in_rtas: | ||
981 | twi 31,0,0 | ||
982 | /* XXX load up BATs and panic */ | ||
983 | |||
984 | #endif /* CONFIG_PPC_OF */ | ||