Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

[linux-2.6-omap-h63xx.git] / arch / sparc / kernel / head.S

diff --git a/arch/sparc/kernel/head.S b/arch/sparc/kernel/head.S
index 50d9a16af795c5d675fefd40a3e17cab5f486840..2fe2c117e772fac352230dd2827d5a45d8915fd4 100644 (file)
--- a/arch/sparc/kernel/head.S
+++ b/arch/sparc/kernel/head.S
@@ -63,15 +63,9 @@ cputypvar_sun4m:
 
        .align 4
 
-#ifndef CONFIG_SUN4
 sun4_notsup:
-       .asciz  "Sparc-Linux sun4 needs a specially compiled kernel, turn CONFIG_SUN4 on.\n\n"
+       .asciz  "Sparc-Linux sun4 support does no longer exist.\n\n"
        .align 4
-#else
-sun4cdm_notsup:
-       .asciz  "Kernel compiled with CONFIG_SUN4 cannot run on SUN4C/SUN4M/SUN4D\nTurn CONFIG_SUN4 off.\n\n"
-       .align 4
-#endif
 
 sun4e_notsup:
         .asciz  "Sparc-Linux sun4e support does not exist\n\n"
@@ -471,6 +465,7 @@ gokernel:
                mov     %o7, %g4                ! Save %o7
 
                /* Jump to it, and pray... */
+               __INIT
 current_pc:
                call    1f
                 nop
@@ -780,15 +775,6 @@ execute_in_high_mem:
                 nop
 
 found_version:
-#ifdef CONFIG_SUN4
-/* For people who try sun4 kernels, even if Configure.help advises them. */
-               ld      [%g7 + 0x68], %o1
-               set     sun4cdm_notsup, %o0
-               call    %o1
-                nop
-               b       halt_me
-                nop
-#endif
 /* Get the machine type via the mysterious romvec node operations. */
 
                add     %g7, 0x1c, %l1          
@@ -1150,15 +1136,6 @@ sun4c_continue_boot:
                 nop
 
 sun4_init:
-#ifdef CONFIG_SUN4
-/* There, happy now Adrian? */
-               set     cputypval, %o2          ! Let everyone know we
-               set     ' ', %o0                        ! are a "sun4 " architecture
-               stb     %o0, [%o2 + 0x4]                
-
-               b got_prop 
-                nop
-#else
                sethi   %hi(SUN4_PROM_VECTOR+0x84), %o1
                ld      [%o1 + %lo(SUN4_PROM_VECTOR+0x84)], %o1
                set     sun4_notsup, %o0
@@ -1170,7 +1147,7 @@ sun4_init:
                 nop
 1:             ba      1b                      ! Cannot exit into KMON
                 nop
-#endif
+
 no_sun4e_here:
                ld      [%g7 + 0x68], %o1
                set     sun4e_notsup, %o0