linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / arch / ppc / boot / simple / head.S

diff --git a/arch/ppc/boot/simple/head.S b/arch/ppc/boot/simple/head.S
index e80c7d8..5e4adc2 100644 (file)
--- a/arch/ppc/boot/simple/head.S
+++ b/arch/ppc/boot/simple/head.S
@@ -52,12 +52,12 @@ start_:
         */
        li      r4,0x0000
        isync
-       mtspr   HID0,r4
+       mtspr   SPRN_HID0,r4
        sync
        isync
 #endif
 
-#if defined(CONFIG_MBX) || defined(CONFIG_RPX6) || defined(CONFIG_PPC_PREP)
+#if defined(CONFIG_MBX) || defined(CONFIG_RPX8260) || defined(CONFIG_PPC_PREP)
        mr      r29,r3  /* On the MBX860, r3 is the board info pointer.
                         * On the RPXSUPER, r3 points to the NVRAM
                         * configuration keys.
@@ -120,26 +120,12 @@ haveOF:
        mtspr   SPRN_DER,r4
 #endif
 
-#ifdef CONFIG_REDWOOD_4
-       /* All of this Redwood 4 stuff will soon disappear when the
-        * boot rom is straightened out.
-        */
-       mr      r29, r3         /* Easier than changing the other code */
-       bl      HdwInit
-       mr      r3, r29
-#endif
-
-#if defined(CONFIG_MBX) || defined(CONFIG_RPX6) || defined(CONFIG_PPC_PREP)
+#if defined(CONFIG_MBX) || defined(CONFIG_RPX8260) || defined(CONFIG_PPC_PREP)
        mr      r4,r29  /* put the board info pointer where the relocate
                         * routine will find it
                         */
 #endif
 
-#ifdef CONFIG_MV64X60
-       /* mv64x60 specific hook to do things like moving register base, etc. */
-       bl      mv64x60_init
-#endif
-
        /* Get the load address.
        */
        subi    r3, r3, 4       /* Get the actual IP, not NIP */