Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: (21 commits)
  m68k/mac: Make CONFIG_HEARTBEAT unavailable on Mac
  m68k/serial: Remove references to obsolete serial config options
  m68k/net: Remove obsolete IRQ_FLG_* users
  m68k: Don't comment out syscalls used by glibc
  m68k/atari: Move declaration of atari_SCC_reset_done to header file
  m68k/serial: Remove references to obsolete CONFIG_SERIAL167
  m68k/hp300: Export hp300_ledstate
  m68k: Initconst section fixes
  m68k/mac: cleanup macro case
  mac_scsi: fix mac_scsi on some powerbooks
  m68k/mac: fix powerbook 150 adb_type
  m68k/mac: fix baboon irq disable and shutdown
  m68k/mac: oss irq fixes
  m68k/mac: fix nubus slot irq disable and shutdown
  m68k/mac: enable via_alt_mapping on performa 580
  m68k/mac: cleanup forward declarations
  m68k/mac: cleanup mac_irq_pending
  m68k/mac: cleanup mac_clear_irq
  m68k/mac: early console
  m68k/mvme16x: Add support for EARLY_PRINTK
  ...

Fix up trivial conflict in arch/m68k/Kconfig.debug due to new
EARLY_PRINTK config option addition clashing with movement of the
BOOTPARAM options.

1 files changed, 59 insertions, 58 deletions

diff --git a/arch/m68k/kernel/head.S b/arch/m68k/kernel/head.S
index 27622b3273c1..d197e7ff62c5 100644
--- a/arch/m68k/kernel/head.S
+++ b/arch/m68k/kernel/head.S
@@ -250,9 +250,8 @@
  * USE_MFP:     Use the ST-MFP port (Modem1) for serial debug.
  *
  * Macintosh constants:
- * MAC_SERIAL_DEBUG:    Turns on serial debug output for the Macintosh.
- * MAC_USE_SCC_A:       Use the SCC port A (modem) for serial debug.
- * MAC_USE_SCC_B:       Use the SCC port B (printer) for serial debug (default).
+ * MAC_USE_SCC_A: Use SCC port A (modem) for serial debug and early console.
+ * MAC_USE_SCC_B: Use SCC port B (printer) for serial debug and early console.
  */
 
 #include <linux/linkage.h>
@@ -268,33 +267,25 @@
 
 #include <asm/machw.h>
 
-/*
- * Macintosh console support
- */
-
 #ifdef CONFIG_FRAMEBUFFER_CONSOLE
 #define CONSOLE
 #define CONSOLE_PENGUIN
 #endif
 
-/*
- * Macintosh serial debug support; outputs boot info to the printer
- *   and/or modem serial ports
- */
-#undef MAC_SERIAL_DEBUG
+#ifdef CONFIG_EARLY_PRINTK
+#define SERIAL_DEBUG
+#else
+#undef SERIAL_DEBUG
+#endif
 
-/*
- * Macintosh serial debug port selection; define one or both;
- *   requires MAC_SERIAL_DEBUG to be defined
- */
-#define MAC_USE_SCC_A           /* Macintosh modem serial port */
-#define MAC_USE_SCC_B           /* Macintosh printer serial port */
+#else /* !CONFIG_MAC */
 
-#endif  /* CONFIG_MAC */
+#define SERIAL_DEBUG
+
+#endif /* !CONFIG_MAC */
 
 #undef MMU_PRINT
 #undef MMU_NOCACHE_KERNEL
-#define SERIAL_DEBUG
 #undef DEBUG
 
 /*
@@ -655,11 +646,11 @@ ENTRY(__start)
         lea     %pc@(L(mac_rowbytes)),%a1
         movel   %a0@,%a1@
 
-#ifdef MAC_SERIAL_DEBUG
+#ifdef SERIAL_DEBUG
         get_bi_record   BI_MAC_SCCBASE
         lea     %pc@(L(mac_sccbase)),%a1
         movel   %a0@,%a1@
-#endif /* MAC_SERIAL_DEBUG */
+#endif
 
 #if 0
         /*
@@ -1427,7 +1418,7 @@ L(mmu_fixup_done):
         subl    %d0,L(console_font)
         subl    %d0,L(console_font_data)
 #endif
-#ifdef MAC_SERIAL_DEBUG
+#ifdef SERIAL_DEBUG
         orl     #0x50000000,L(mac_sccbase)
 #endif
 1:
@@ -1917,7 +1908,7 @@ mmu_030_print:
         jbne    30b
 
 mmu_print_done:
-        puts    "\n\n"
+        puts    "\n"
 
 func_return     mmu_print
 
@@ -2768,7 +2759,7 @@ L(scc_initable_mac):
         .byte   9,0             /* no interrupts */
         .byte   10,0            /* NRZ */
         .byte   11,0x50         /* use baud rate generator */
-        .byte   12,10,13,0      /* 9600 baud */
+        .byte   12,1,13,0       /* 38400 baud */
         .byte   14,1            /* Baud rate generator enable */
         .byte   3,0xc1          /* enable receiver */
         .byte   5,0xea          /* enable transmitter */
@@ -2906,10 +2897,12 @@ func_start	serial_init,%d0/%d1/%a0/%a1
 #endif
 #ifdef CONFIG_MAC
         is_not_mac(L(serial_init_not_mac))
-#ifdef MAC_SERIAL_DEBUG
-#if !defined(MAC_USE_SCC_A) && !defined(MAC_USE_SCC_B)
-#define MAC_USE_SCC_B
-#endif
+
+#ifdef SERIAL_DEBUG
+/* You may define either or both of these. */
+#define MAC_USE_SCC_A /* Modem port */
+#define MAC_USE_SCC_B /* Printer port */
+
 #define mac_scc_cha_b_ctrl_offset       0x0
 #define mac_scc_cha_a_ctrl_offset       0x2
 #define mac_scc_cha_b_data_offset       0x4
@@ -2940,7 +2933,7 @@ func_start	serial_init,%d0/%d1/%a0/%a1
         jra     7b
 8:
 #endif  /* MAC_USE_SCC_B */
-#endif  /* MAC_SERIAL_DEBUG */
+#endif  /* SERIAL_DEBUG */
 
         jra     L(serial_init_done)
 L(serial_init_not_mac):
@@ -3011,7 +3004,7 @@ func_start	serial_putc,%d0/%d1/%a0/%a1
 #ifdef CONFIG_MAC
         is_not_mac(5f)
 
-#ifdef MAC_SERIAL_DEBUG
+#ifdef SERIAL_DEBUG
 
 #ifdef MAC_USE_SCC_A
         movel   %pc@(L(mac_sccbase)),%a1
@@ -3029,7 +3022,7 @@ func_start	serial_putc,%d0/%d1/%a0/%a1
         moveb   %d0,%a1@(mac_scc_cha_b_data_offset)
 #endif  /* MAC_USE_SCC_B */
 
-#endif  /* MAC_SERIAL_DEBUG */
+#endif  /* SERIAL_DEBUG */
 
         jra     L(serial_putc_done)
 5:
@@ -3248,33 +3241,39 @@ func_return	putn
 
 #ifdef CONFIG_MAC
 /*
- *      mac_serial_print
+ *      mac_early_print
  *
  *      This routine takes its parameters on the stack.  It then
- *      turns around and calls the internal routine.  This routine
- *      is used until the Linux console driver initializes itself.
+ *      turns around and calls the internal routines.  This routine
+ *      is used by the boot console.
  *
  *      The calling parameters are:
- *              void mac_serial_print(const char *str);
+ *              void mac_early_print(const char *str, unsigned length);
  *
  *      This routine does NOT understand variable arguments only
  *      simple strings!
  */
-ENTRY(mac_serial_print)
-        moveml  %d0/%a0,%sp@-
-#if 1
-        move    %sr,%sp@-
+ENTRY(mac_early_print)
+        moveml  %d0/%d1/%a0,%sp@-
+        movew   %sr,%sp@-
         ori     #0x0700,%sr
-#endif
-        movel   %sp@(10),%a0            /* fetch parameter */
+        movel   %sp@(18),%a0            /* fetch parameter */
+        movel   %sp@(22),%d1            /* fetch parameter */
         jra     2f
-1:      serial_putc     %d0
-2:      moveb   %a0@+,%d0
-        jne     1b
-#if 1
-        move    %sp@+,%sr
+1:
+#ifdef CONSOLE
+        console_putc    %d0
 #endif
-        moveml  %sp@+,%d0/%a0
+#ifdef SERIAL_DEBUG
+        serial_putc     %d0
+#endif
+        subq    #1,%d1
+2:      jeq     3f
+        moveb   %a0@+,%d0
+        jne     1b
+3:
+        movew   %sp@+,%sr
+        moveml  %sp@+,%d0/%d1/%a0
         rts
 #endif /* CONFIG_MAC */
 
@@ -3409,10 +3408,10 @@ func_start	console_put_stats,%a0/%d7
          *              a0 = pointer to boot_info
          *              d7 = value of boot_info fields
          */
-        puts    "\nMacLinux\n\n"
+        puts    "\nMacLinux\n"
 
 #ifdef SERIAL_DEBUG
-        puts    " vidaddr:"
+        puts    "\n vidaddr:"
         putn    %pc@(L(mac_videobase))          /* video addr. */
 
         puts    "\n  _stext:"
@@ -3423,19 +3422,21 @@ func_start	console_put_stats,%a0/%d7
         lea     %pc@(_end),%a0
         putn    %a0
 
-        puts    "\ncpuid:"
+        puts    "\n   cpuid:"
         putn    %pc@(L(cputype))
-        putc    '\n'
 
-#ifdef MAC_SERIAL_DEBUG
+#  ifdef CONFIG_MAC
+        puts    "\n sccbase:"
         putn    %pc@(L(mac_sccbase))
+#  endif
+#  ifdef MMU_PRINT
         putc    '\n'
-#endif
-#  if defined(MMU_PRINT)
         jbsr    mmu_print_machine_cpu_types
-#  endif /* MMU_PRINT */
+#  endif
 #endif /* SERIAL_DEBUG */
 
+        putc    '\n'
+
 func_return     console_put_stats
 
 #ifdef CONSOLE_PENGUIN
@@ -3896,11 +3897,11 @@ L(mac_dimensions):
         .long   0
 L(mac_rowbytes):
         .long   0
-#ifdef MAC_SERIAL_DEBUG
+#ifdef SERIAL_DEBUG
 L(mac_sccbase):
         .long   0
-#endif /* MAC_SERIAL_DEBUG */
 #endif
+#endif /* CONFIG_MAC */
 
 #if defined (CONFIG_APOLLO)
 LSRB0        = 0x10412