Merge tag 'upstream-3.15-rc1' of git://git.infradead.org/linux-ubifs

[karo-tx-linux.git] / arch / m68k / kernel / head.S

diff --git a/arch/m68k/kernel/head.S b/arch/m68k/kernel/head.S
index 4c99bab7e6647c0709ebacbff38b42f01ab24449..3ab329b8852173694bac06c2559841fed73d95ac 100644 (file)
--- a/arch/m68k/kernel/head.S
+++ b/arch/m68k/kernel/head.S
@@ -275,7 +275,6 @@
 
 #ifdef CONFIG_FRAMEBUFFER_CONSOLE
 #define CONSOLE
-#define CONSOLE_PENGUIN
 #endif
 
 #ifdef CONFIG_EARLY_PRINTK
@@ -658,27 +657,6 @@ ENTRY(__start)
        movel   %a0@,%a1@
 #endif
 
-#if 0
-       /*
-        * Clear the screen
-        */
-       lea     %pc@(L(mac_videobase)),%a0
-       movel   %a0@,%a1
-       lea     %pc@(L(mac_dimensions)),%a0
-       movel   %a0@,%d1
-       swap    %d1             /* #rows is high bytes */
-       andl    #0xFFFF,%d1     /* rows */
-       subl    #10,%d1
-       lea     %pc@(L(mac_rowbytes)),%a0
-loopy2:
-       movel   %a0@,%d0
-       subql   #1,%d0
-loopx2:
-       moveb   #0x55, %a1@+
-       dbra    %d0,loopx2
-       dbra    %d1,loopy2
-#endif
-
 L(test_notmac):
 #endif /* CONFIG_MAC */
 
@@ -907,15 +885,15 @@ L(nothp):
  */
 #ifdef CONFIG_MAC
        is_not_mac(L(nocon))
-#ifdef CONSOLE
+#  ifdef CONSOLE
        console_init
-#ifdef CONSOLE_PENGUIN
+#    ifdef CONFIG_LOGO
        console_put_penguin
-#endif /* CONSOLE_PENGUIN */
+#    endif /* CONFIG_LOGO */
        console_put_stats
-#endif /* CONSOLE */
+#  endif /* CONSOLE */
 L(nocon):
-#endif /* CONFIG_MAC */
+#endif /* CONFIG_MAC */
 
 
        putc    '\n'
@@ -3324,14 +3302,13 @@ func_return     set_leds
 #define Lconsole_struct_num_columns    8
 #define Lconsole_struct_num_rows       12
 #define Lconsole_struct_left_edge      16
-#define Lconsole_struct_penguin_putc   20
 
 func_start     console_init,%a0-%a4/%d0-%d7
        /*
         *      Some of the register usage that follows
         *              a0 = pointer to boot_info
         *              a1 = pointer to screen
-        *              a2 = pointer to Lconsole_globals
+        *              a2 = pointer to console_globals
         *              d3 = pixel width of screen
         *              d4 = pixel height of screen
         *              (d3,d4) ~= (x,y) of a point just below
@@ -3456,7 +3433,7 @@ func_start        console_put_stats,%a0/%d7
 
 func_return    console_put_stats
 
-#ifdef CONSOLE_PENGUIN
+#ifdef CONFIG_LOGO
 func_start     console_put_penguin,%a0-%a1/%d0-%d7
        /*
         *      Get 'that_penguin' onto the screen in the upper right corner
@@ -3799,38 +3776,6 @@ L(console_plot_pixel_exit):
 func_return    console_plot_pixel
 #endif /* CONSOLE */
 
-#if 0
-/*
- * This is some old code lying around.  I don't believe
- * it's used or important anymore.  My guess is it contributed
- * to getting to this point, but it's done for now.
- * It was still in the 2.1.77 head.S, so it's still here.
- * (And still not used!)
- */
-L(showtest):
-       moveml  %a0/%d7,%sp@-
-       puts    "A="
-       putn    %a1
-
-       .long   0xf0119f15              | ptestr        #5,%a1@,#7,%a0
-
-       puts    "DA="
-       putn    %a0
-
-       puts    "D="
-       putn    %a0@
-
-       puts    "S="
-       lea     %pc@(L(mmu)),%a0
-       .long   0xf0106200              | pmove         %psr,%a0@
-       clrl    %d7
-       movew   %a0@,%d7
-       putn    %d7
-
-       putc    '\n'
-       moveml  %sp@+,%a0/%d7
-       rts
-#endif /* 0 */
 
 __INITDATA
        .align  4
@@ -3849,7 +3794,6 @@ L(console_globals):
        .long   0               /* max num columns */
        .long   0               /* max num rows */
        .long   0               /* left edge */
-       .long   0               /* mac putc */
 L(console_font):
        .long   0               /* pointer to console font (struct font_desc) */
 L(console_font_data):