[PATCH] drivers/macintosh/Config.in

[PATCH] drivers/macintosh/Config.in

[Tom Rini]

[-- Attachment #1: Type: text/plain, Size: 453 bytes --]

Hey all.  I was wondering what both camps would think of a
drivers/macintosh/Config.in?  It would simply a few things and remove some
duplicated bits.  I've attached my first attempt at it, and everything should
look the same as before (I did rename some of the ADB driver comments from
the m68k side so they matched the others).

Comments?  (We probably wouldn't see this until 2.5 anyways tho..)

--
Tom Rini (TR1265)
http://gate.crashing.org/~trini/

[-- Attachment #2: macConfig.patch --]
[-- Type: text/plain, Size: 5171 bytes --]

===== arch/ppc/config.in 1.58 vs edited =====
--- 1.58/arch/ppc/config.in	Thu Dec 28 09:46:13 2000
+++ edited/arch/ppc/config.in	Sat Jan  6 17:12:13 2001
@@ -281,37 +281,7 @@

 source drivers/input/Config.in

-mainmenu_option next_comment
-comment 'Macintosh device drivers'
-
-if [ "$CONFIG_WORKSTATION_PPC" = "y" ]; then
-  # we want to change this to something like CONFIG_SYSCTRL_CUDA/PMU
-  bool 'Support for CUDA based PowerMacs' CONFIG_ADB_CUDA
-  bool 'Support for PMU  based PowerMacs' CONFIG_ADB_PMU
-  if [ "$CONFIG_ADB_PMU" = "y" ]; then
-    bool '   Power management support for PowerBooks' CONFIG_PMAC_PBOOK
-    # made a separate option since backlight may end up beeing used
-    # on non-powerbook machines (but only on PMU based ones AFAIK)
-    bool '   Backlight control for LCD screens' CONFIG_PMAC_BACKLIGHT
-  fi
-  bool 'Support for PowerMac floppy' CONFIG_MAC_FLOPPY
-  tristate 'Support for PowerMac serial ports' CONFIG_MAC_SERIAL
-  if [ "$CONFIG_MAC_SERIAL" = "y" ]; then
-    bool '   Support for console on serial port' CONFIG_SERIAL_CONSOLE
-  fi
-  bool 'Apple Desktop Bus (ADB) support' CONFIG_ADB
-  if [ "$CONFIG_ADB" = "y" ]; then
-    bool '   Include MacIO (CHRP) ADB driver' CONFIG_ADB_MACIO
-    dep_bool '   Use input layer for ADB devices' CONFIG_INPUT_ADBHID $CONFIG_INPUT
-    if [ "$CONFIG_INPUT_ADBHID" = "y" ]; then
-      bool '     Support for ADB raw keycodes' CONFIG_MAC_ADBKEYCODES
-      bool '     Support for mouse button 2+3 emulation' CONFIG_MAC_EMUMOUSEBTN
-    else
-      bool '   Support for ADB keyboard (old driver)' CONFIG_ADB_KEYBOARD
-    fi
-  fi
-fi
-endmenu
+source drivers/macintosh/Config.in

 source drivers/char/Config.in

===== arch/m68k/config.in 1.17 vs edited =====
--- 1.17/arch/m68k/config.in	Sat Nov 18 04:02:44 2000
+++ edited/arch/m68k/config.in	Sat Jan  6 16:58:19 2001
@@ -407,20 +407,7 @@
    fi
 fi
 if [ "$CONFIG_MAC" = "y" ]; then
-   tristate 'Macintosh serial support' CONFIG_MAC_SCC
-   bool 'Apple Desktop Bus (ADB) support' CONFIG_ADB
-   if [ "$CONFIG_ADB" = "y" ]; then
-      bool '   Support for ADB keyboard' CONFIG_ADB_KEYBOARD
-      bool '   Support for ADB mouse' CONFIG_ADBMOUSE
-      bool '   Include Mac II ADB driver' CONFIG_ADB_MACII
-      bool '   Include Mac IIsi ADB driver' CONFIG_ADB_MACIISI
-      bool '   Include CUDA ADB driver' CONFIG_ADB_CUDA
-      bool '   Include IOP (IIfx/Quadra 9x0) ADB driver' CONFIG_ADB_IOP
-      bool '   Include PMU (Powerbook) ADB driver' CONFIG_ADB_PMU68K
-   fi
-   if [ "$CONFIG_ADBMOUSE" = "y" ]; then
-      define_bool CONFIG_BUSMOUSE y
-   fi
+  source drivers/macintosh/Config.in
 fi
 if [ "$CONFIG_HP300" = "y" -a "$CONFIG_DIO" = "y" ]; then
    tristate 'HP DCA serial support' CONFIG_HPDCA
--- /dev/null	Tue May  5 13:32:27 1998
+++ drivers/macintosh/Config.in	Sat Jan  6 17:08:30 2001
@@ -0,0 +1,56 @@
+#
+# Macintosh driver configuration
+#
+
+mainmenu_option next_comment
+comment 'Macintosh device drivers'
+
+bool 'Macintosh driver support' CONFIG_MACINTOSH_DRIVERS
+if [ "$CONFIG_MACINTOSH_DRIVERS" = "y" ]; then
+  bool 'Apple Desktop Bus (ADB) support' CONFIG_ADB
+  if [ "$CONFIG_ADB" = "y" ]; then
+    # We want to change these to something like CONFIG_SYSCTRL_xxx
+    # PowerPC macintoshes
+    if [ "$CONFIG_WORKSTATION_PPC" = "y" ]; then
+      bool '   Support for MacIO (CHRP) based machines' CONFIG_ADB_MACIO
+      bool '   Support for PMU based machines' CONFIG_ADB_PMU
+    fi
+    # 68k macintoshes
+    if [ "$CONFIG_MAC" = "y" ]; then
+      bool '   Support for Mac II machines' CONFIG_ADB_MACII
+      bool '   Support for Mac IIsi machines' CONFIG_ADB_MACIISI
+      bool '   Support for IOP (IIfx/Quadra 9x0) based machines' CONFIG_ADB_IOP
+      bool '   Support for PMU (Powerbook) based machines' CONFIG_ADB_PMU68K
+    fi
+    # Common
+    bool '   Support for CUDA based machines' CONFIG_ADB_CUDA
+    dep_bool '   Use input layer for ADB devices' CONFIG_INPUT_ADBHID $CONFIG_INPUT
+    if [ "$CONFIG_INPUT_ADBHID" = "y" ]; then
+      bool '     Support for ADB raw keycodes' CONFIG_MAC_ADBKEYCODES
+      bool '     Support for mouse button 2+3 emulation' CONFIG_MAC_EMUMOUSEBTN
+    else
+      bool '   Support for ADB keyboard (old driver)' CONFIG_ADB_KEYBOARD
+      bool '   Support for ADB mouse (old driver)' CONFIG_ADBMOUSE
+    fi
+  fi
+  if [ "$CONFIG_ADB_PMU" = "y" ]; then
+    bool '   Power management support for PowerBooks' CONFIG_PMAC_PBOOK
+    # made a separate option since backlight may end up beeing used
+    # on non-powerbook machines (but only on PMU based ones AFAIK)
+    bool '   Backlight control for LCD screens' CONFIG_PMAC_BACKLIGHT
+  fi
+  if [ "$CONFIG_WORKSTATION_PPC" = "y" ]; then
+    bool 'Support for PowerMac floppy' CONFIG_MAC_FLOPPY
+    tristate 'Support for PowerMac serial ports' CONFIG_MAC_SERIAL
+    if [ "$CONFIG_MAC_SERIAL" = "y" ]; then
+      bool '   Support for console on serial port' CONFIG_SERIAL_CONSOLE
+    fi
+  fi
+  if [ "$CONFIG_MAC" = "y" ]; then
+    tristate 'Macintosh serial support' CONFIG_MAC_SCC
+  fi
+  if [ "$CONFIG_ADBMOUSE" = "y" ]; then
+    define_bool CONFIG_BUSMOUSE y
+  fi
+fi
+endmenu

Re: [PATCH] drivers/macintosh/Config.in

[Tony Mantler]

At 6:17 PM -0600 1/6/2001, Tom Rini wrote:
>Hey all.  I was wondering what both camps would think of a
>drivers/macintosh/Config.in?  It would simply a few things and remove some
>duplicated bits.  I've attached my first attempt at it, and everything should
>look the same as before (I did rename some of the ADB driver comments from
>the m68k side so they matched the others).
>
>Comments?  (We probably wouldn't see this until 2.5 anyways tho..)

Does the input layer work on the 68k drivers? I don't know that I've ever
heard of anyone testing it.

The patch looks fairly sane to me. If it breaks something, it's not very
hard to fix a config file.


Cheers - Tony 'Nicoya' Mantler :)


--
Tony "Nicoya" Mantler - Renaissance Nerd Extraordinaire - nicoya@apia.dhs.org
Winnipeg, Manitoba, Canada           --           http://nicoya.feline.pp.se/

** Sent via the linuxppc-dev mail list. See http://lists.linuxppc.org/

Re: [PATCH] drivers/macintosh/Config.in

[Tom Rini]

On Sun, Jan 07, 2001 at 02:57:30AM -0600, Tony Mantler wrote:
> At 6:17 PM -0600 1/6/2001, Tom Rini wrote:
> >Hey all.  I was wondering what both camps would think of a
> >drivers/macintosh/Config.in?  It would simply a few things and remove some
> >duplicated bits.  I've attached my first attempt at it, and everything should
> >look the same as before (I did rename some of the ADB driver comments from
> >the m68k side so they matched the others).
> >
> >Comments?  (We probably wouldn't see this until 2.5 anyways tho..)
>
> Does the input layer work on the 68k drivers? I don't know that I've ever
> heard of anyone testing it.

Well, it should.  It was in the menu :)

> The patch looks fairly sane to me. If it breaks something, it's not very
> hard to fix a config file.

Right.  I just wanna make sure everyone like the way it looks.  I also (may)
move things like MOL into that file.

--
Tom Rini (TR1265)
http://gate.crashing.org/~trini/

** Sent via the linuxppc-dev mail list. See http://lists.linuxppc.org/

Re: [PATCH] drivers/macintosh/Config.in

[Tony Mantler]

At 6:38 PM -0600 1/7/2001, Tom Rini wrote:
>On Sun, Jan 07, 2001 at 02:57:30AM -0600, Tony Mantler wrote:
[...]
>> Does the input layer work on the 68k drivers? I don't know that I've ever
>> heard of anyone testing it.
>
>Well, it should.  It was in the menu :)

Still doesn't mean anyone's tested it. ;)


>> The patch looks fairly sane to me. If it breaks something, it's not very
>> hard to fix a config file.
>
>Right.  I just wanna make sure everyone like the way it looks.  I also (may)
>move things like MOL into that file.

68k MOL might be an intersting project to play with sometime... Hmm... :)


Cheers - Tony 'Nicoya' Mantler :)


--
Tony "Nicoya" Mantler - Renaissance Nerd Extraordinaire - nicoya@apia.dhs.org
Winnipeg, Manitoba, Canada           --           http://nicoya.feline.pp.se/


** Sent via the linuxppc-dev mail list. See http://lists.linuxppc.org/

Re: [PATCH] drivers/macintosh/Config.in

[Ray Knight]

Tony Mantler wrote:
>
> At 6:17 PM -0600 1/6/2001, Tom Rini wrote:
> >Hey all.  I was wondering what both camps would think of a
> >drivers/macintosh/Config.in?  It would simply a few things and remove some
> >duplicated bits.  I've attached my first attempt at it, and everything should
> >look the same as before (I did rename some of the ADB driver comments from
> >the m68k side so they matched the others).
> >
> >Comments?  (We probably wouldn't see this until 2.5 anyways tho..)
>
> Does the input layer work on the 68k drivers? I don't know that I've ever
> heard of anyone testing it.
>
> The patch looks fairly sane to me. If it breaks something, it's not very
> hard to fix a config file.
>
> Cheers - Tony 'Nicoya' Mantler :)
>

The input layer doesn't currently compile on the m68k Macs.  (undefined
variables)  I didn't look to closely at it because right now I'm just
trying to get a 2.4.0 kernel that will boot.  I'll go back and take a
better look at that when I reach my goal of getting a bootable kernel on
an LC475.

--
Ray Knight
audilvr@speakeasy.org
Linux-Mac68k Developer

** Sent via the linuxppc-dev mail list. See http://lists.linuxppc.org/

Re: [PATCH] drivers/macintosh/Config.in

[Michel Dänzer]

Tom Rini wrote:

> I also (may) move things like MOL into that file.

We're still hoping to get MOL working on APUS anytime soon, and according to
the web page it should work on PReP and CHRP boxen.


Michel


--
Earthling Michel Dänzer (MrCooper)  \  CS student and free software enthusiast
Debian GNU/Linux (powerpc,i386) user \   member of XFree86 and the DRI project

** Sent via the linuxppc-dev mail list. See http://lists.linuxppc.org/

Re: [PATCH] drivers/macintosh/Config.in

[Tom Rini]

On Mon, Jan 08, 2001 at 10:56:05AM +0100, Michel D?nzer wrote:
> Tom Rini wrote:
>
> > I also (may) move things like MOL into that file.
>
> We're still hoping to get MOL working on APUS anytime soon, and according to
> the web page it should work on PReP and CHRP boxen.

Well, there's no distinction between PReP, CHRP and Pmac, config wise.  It would
be in if [ "$CONFIG_6xx" = "y" ]; then ... fi probably (I need to ask one of
the IBM folks if it would work on POWER3).

--
Tom Rini (TR1265)
http://gate.crashing.org/~trini/

** Sent via the linuxppc-dev mail list. See http://lists.linuxppc.org/