[PATCH] M68k update (part 12)

Linux/m68k configuration updates
  - Unify serial console questions
  - Move serial driver config questions together
  - The Atari mouse driver depends on the Atari keyboard driver, hence on
    CONFIG_VT
  - Don't hardcode CONFIG_VT=n on VME, you may want it for a multi-machine
    kernel
  - The IRQ_* definitions are not used on Amiga, but we need them if we
    build a multi-machine kernel, too

diff --git a/arch/m68k/config.in b/arch/m68k/config.in
index 02cf4d3d8149949ead25a66368f88141448d4b03..5d737dc1fa9de66039d9a05220846bc4f6609f7f 100644 (file)
--- a/arch/m68k/config.in
+++ b/arch/m68k/config.in
@@ -374,11 +374,9 @@ if [ "$CONFIG_SERIAL_EXTENDED" = "y" ]; then
    bool '    Support the Bell Technologies HUB6 card' CONFIG_HUB6
 fi
 
-if [ "$CONFIG_VME" = "n" ]; then
-   define_bool CONFIG_VT y
-   if [ "$CONFIG_VT" = "y" ]; then
-      bool 'Support for console on virtual terminal' CONFIG_VT_CONSOLE
-   fi
+bool 'Virtual terminal' CONFIG_VT
+if [ "$CONFIG_VT" = "y" ]; then
+   bool 'Support for console on virtual terminal' CONFIG_VT_CONSOLE
 fi
 
 if [ "$CONFIG_ATARI" = "y" ]; then
@@ -391,7 +389,7 @@ if [ "$CONFIG_AMIGA" = "y" ]; then
       define_bool CONFIG_BUSMOUSE y
    fi
 fi
-if [ "$CONFIG_ATARI" = "y" ]; then
+if [ "$CONFIG_ATARI" = "y" -a "$CONFIG_VT" = "y" ]; then
    tristate 'Atari mouse support' CONFIG_ATARIMOUSE
    if [ "$CONFIG_ATARIMOUSE" != "n" ]; then
       define_bool CONFIG_BUSMOUSE y
@@ -413,16 +411,16 @@ if [ "$CONFIG_AMIGA" = "y" ]; then
    if [ "$CONFIG_AMIGA_PCMCIA" = "y" ]; then
       tristate 'Hisoft Whippet PCMCIA serial support' CONFIG_WHIPPET_SERIAL
    fi
+   tristate 'Multiface Card III serial support' CONFIG_MULTIFACE_III_TTY
+   if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
+      tristate 'Commodore A2232 serial support (EXPERIMENTAL)' CONFIG_A2232
+   fi
 fi
 if [ "$CONFIG_PARPORT" = "n" ]; then
    if [ "$CONFIG_ZORRO" = "y" ]; then
       tristate 'GVP IO-Extender support' CONFIG_GVPIOEXT
       dep_tristate '  GVP IO-Extender parallel printer support' CONFIG_GVPIOEXT_LP $CONFIG_GVPIOEXT
       dep_tristate '  GVP IO-Extender PLIP support' CONFIG_GVPIOEXT_PLIP $CONFIG_GVPIOEXT
-      tristate 'Multiface Card III serial support' CONFIG_MULTIFACE_III_TTY
-      if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
-        tristate 'Commodore A2232 serial support (EXPERIMENTAL)' CONFIG_A2232
-      fi
    fi
 fi
 if [ "$CONFIG_MAC" = "y" ]; then
@@ -465,21 +463,7 @@ else
    define_bool CONFIG_SUN_MOUSE n
    define_bool CONFIG_SBUS n
 fi
-
-if [ "$CONFIG_AMIGA" = "y" -o "$CONFIG_ATARI" = "y" -o \
-     "$CONFIG_MAC" = "y" -o "$CONFIG_HP300" = "y" -o \
-     "$CONFIG_SUN3" = "y" -o "$CONFIG_SUN3X" = "y" ]; then
-   if [ "$CONFIG_ATARI_MFPSER" = "y" -o "$CONFIG_ATARI_SCC" = "y" -o \
-        "$CONFIG_ATARI_MIDI" = "y" -o "$CONFIG_MAC_SCC" = "y" -o \
-        "$CONFIG_AMIGA_BUILTIN_SERIAL" = "y" -o \
-        "$CONFIG_GVPIOEXT" = "y" -o "$CONFIG_MULTIFACE_III_TTY" = "y" -o \
-        "$CONFIG_HPDCA" = "y" -o "$CONFIG_SUN3X_ZS" = "y" -o \
-        "$CONFIG_SERIAL" = "y" ]; then
-      bool 'Support for serial port console' CONFIG_SERIAL_CONSOLE
-   fi
-fi
 if [ "$CONFIG_VME" = "y" ]; then
-   define_bool CONFIG_SERIAL_CONSOLE y
    if [ "$CONFIG_MVME147" = "y" ]; then
       bool 'SCC support for MVME147 serial ports' CONFIG_MVME147_SCC
    fi
@@ -493,10 +477,24 @@ if [ "$CONFIG_VME" = "y" ]; then
 fi
 if [ "$CONFIG_APOLLO" = "y" ]; then
    bool 'Support for DN serial port (dummy)' CONFIG_DN_SERIAL
-   bool 'Support for serial port console' CONFIG_SERIAL_CONSOLE
-
    define_tristate CONFIG_SERIAL $CONFIG_DN_SERIAL
 fi 
+
+if [ "$CONFIG_AMIGA" = "y" -o "$CONFIG_ATARI" = "y" -o \
+     "$CONFIG_MAC" = "y" -o "$CONFIG_HP300" = "y" -o \
+     "$CONFIG_SUN3" = "y" -o "$CONFIG_SUN3X" = "y" -o \
+     "$CONFIG_VME" = "y" -o "$CONFIG_APOLLO" = "y" ]; then
+   if [ "$CONFIG_ATARI_MFPSER" = "y" -o "$CONFIG_ATARI_SCC" = "y" -o \
+        "$CONFIG_ATARI_MIDI" = "y" -o "$CONFIG_MAC_SCC" = "y" -o \
+        "$CONFIG_AMIGA_BUILTIN_SERIAL" = "y" -o \
+        "$CONFIG_GVPIOEXT" = "y" -o "$CONFIG_MULTIFACE_III_TTY" = "y" -o \
+        "$CONFIG_HPDCA" = "y" -o "$CONFIG_SUN3X_ZS" = "y" -o \
+        "$CONFIG_SERIAL" = "y" -o "$CONFIG_MVME147_SCC" = "y" -o \
+       "$CONFIG_SERIAL167" = "y" -o "$CONFIG_MVME162_SCC" = "y" -o \
+       "$CONFIG_BVME6000_SCC" = "y" -o "$CONFIG_DN_SERIAL" = "y" ]; then
+      bool 'Support for serial port console' CONFIG_SERIAL_CONSOLE
+   fi
+fi
 bool 'Support for user serial device modules' CONFIG_USERIAL
 bool 'Watchdog Timer Support'  CONFIG_WATCHDOG
 if [ "$CONFIG_WATCHDOG" != "n" ]; then
@@ -530,7 +528,7 @@ endmenu
 
 source fs/Config.in
 
-if [ "$CONFIG_VME" = "n" ]; then
+if [ "$CONFIG_VT" = "y" ]; then
    mainmenu_option next_comment
    comment 'Console drivers'
    source drivers/video/Config.in

diff --git a/include/asm-m68k/irq.h b/include/asm-m68k/irq.h
index 27e030fa6e7cd4366c7f7f1344895d2f57511d4e..7ed06f437f5b05591b3133c196549936c5369ffd 100644 (file)
--- a/include/asm-m68k/irq.h
+++ b/include/asm-m68k/irq.h
@@ -85,7 +85,7 @@ extern void sys_free_irq(unsigned int, void *);
  * mechanism like all other architectures - SA_INTERRUPT and SA_SHIRQ
  * are your friends.
  */
-#ifndef CONFIG_AMIGA
+#ifndef MACH_AMIGA_ONLY
 #define IRQ_FLG_LOCK   (0x0001)        /* handler is not replaceable   */
 #define IRQ_FLG_REPLACE        (0x0002)        /* replace existing handler     */
 #define IRQ_FLG_FAST   (0x0004)