From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
To: Olaf Hering <olh@suse.de>
Cc: Andrew Morton <akpm@osdl.org>, linuxppc-dev@ozlabs.org
Subject: Re: [PATCH] hide pmac specific drivers if CONFIG_ADB is not set
Date: Sun, 23 Oct 2005 09:05:46 +1000 [thread overview]
Message-ID: <1130022347.7919.39.camel@gaston> (raw)
In-Reply-To: <20051022213037.GA6097@suse.de>
On Sat, 2005-10-22 at 23:30 +0200, Olaf Hering wrote:
> This started out as a fix for https://bugzilla.novell.com/show_bug.cgi?id=119606
>
> Hiding a few pmac specific drivers when ADB is disabled can not hurt:
>
> AGP_UNINORTH exist only on systems with ADB_PMU
No. SMU machines too
> I2C_KEYWEST is used by sound
Same comment. PMU and SMU based machines. Be careful of not breaking
ppc64 here :) I think those changes are definitely not welcome now. Wait
for the big ppc/ppc64 merge that's coming, a lot of stuff will be
consolidated and these will be much easier to do. Also, I'm seriously
considering removing the user setting for "CUDA based machiens" vs. "PMU
based machines". I may instead just enable machine generations
(PowerSurge, PowerStar, Gossamer, Core99, MacRISC2, MacRISC4)
> MACE exists only on systems with ADB_CUDA
Hrm... No old laptop with Mace ? Yah, I think that's ok.
> BMAC exists on old and new Macs
Yah, Cuda and PMU based.
> SCSI_MESH exists on old Macs, but the PB Lombard has an external connector
> SERIAL_PMACZILOG exists on old and new Macs
> BLK_DEV_IDE_PMAC exists on old and new Macs
You missed SMU again...
> APPLE_AIRPORT exist only on systems with ADB_PMU
> FB_CONTROL exists only on old Macs
> FB_PLATINUM exists only on old Macs
> FB_VALKYRIE exists only on old Macs
> FB_CT65550 exists only on old Macs
No, it's on old laptops which are PMU based
Anyway, I'm not fan of this patch at all. We should do that properly in
a different way after the merge.
Ben.
>
> Signed-off-by: Olaf Hering <olh@suse.de>
>
> drivers/char/agp/Kconfig | 2 +-
> drivers/i2c/busses/Kconfig | 2 +-
> drivers/ide/Kconfig | 2 +-
> drivers/net/Kconfig | 4 ++--
> drivers/net/wireless/Kconfig | 2 +-
> drivers/scsi/Kconfig | 4 ++--
> drivers/serial/Kconfig | 2 +-
> drivers/video/Kconfig | 8 ++++----
> 8 files changed, 13 insertions(+), 13 deletions(-)
>
> Index: linux-2.6.14-rc5/drivers/char/agp/Kconfig
> ===================================================================
> --- linux-2.6.14-rc5.orig/drivers/char/agp/Kconfig
> +++ linux-2.6.14-rc5/drivers/char/agp/Kconfig
> @@ -147,7 +147,7 @@ config AGP_ALPHA_CORE
>
> config AGP_UNINORTH
> tristate "Apple UniNorth & U3 AGP support"
> - depends on AGP && PPC_PMAC
> + depends on AGP && PPC_PMAC && ADB_PMU
> help
> This option gives you AGP support for Apple machines with a
> UniNorth or U3 (Apple G5) bridge.
> Index: linux-2.6.14-rc5/drivers/i2c/busses/Kconfig
> ===================================================================
> --- linux-2.6.14-rc5.orig/drivers/i2c/busses/Kconfig
> +++ linux-2.6.14-rc5/drivers/i2c/busses/Kconfig
> @@ -237,7 +237,7 @@ config I2C_IXP2000
>
> config I2C_KEYWEST
> tristate "Powermac Keywest I2C interface"
> - depends on I2C && PPC_PMAC
> + depends on I2C && PPC_PMAC && (ADB_CUDA || ADB_PMU)
> help
> This supports the use of the I2C interface in the combo-I/O
> chip on recent Apple machines. Say Y if you have such a machine.
> Index: linux-2.6.14-rc5/drivers/net/Kconfig
> ===================================================================
> --- linux-2.6.14-rc5.orig/drivers/net/Kconfig
> +++ linux-2.6.14-rc5/drivers/net/Kconfig
> @@ -178,7 +178,7 @@ source "drivers/net/arm/Kconfig"
>
> config MACE
> tristate "MACE (Power Mac ethernet) support"
> - depends on NET_ETHERNET && PPC_PMAC && PPC32
> + depends on NET_ETHERNET && PPC_PMAC && PPC32 && ADB_CUDA
> select CRC32
> help
> Power Macintoshes and clones with Ethernet built-in on the
> @@ -201,7 +201,7 @@ config MACE_AAUI_PORT
>
> config BMAC
> tristate "BMAC (G3 ethernet) support"
> - depends on NET_ETHERNET && PPC_PMAC && PPC32
> + depends on NET_ETHERNET && PPC_PMAC && PPC32 && (ADB_CUDA || ADB_PMU)
> select CRC32
> help
> Say Y for support of BMAC Ethernet interfaces. These are used on G3
> Index: linux-2.6.14-rc5/drivers/scsi/Kconfig
> ===================================================================
> --- linux-2.6.14-rc5.orig/drivers/scsi/Kconfig
> +++ linux-2.6.14-rc5/drivers/scsi/Kconfig
> @@ -1529,7 +1529,7 @@ config SCSI_DEBUG
>
> config SCSI_MESH
> tristate "MESH (Power Mac internal SCSI) support"
> - depends on PPC32 && PPC_PMAC && SCSI
> + depends on PPC32 && PPC_PMAC && SCSI && (ADB_CUDA || ADB_PMU)
> help
> Many Power Macintoshes and clones have a MESH (Macintosh Enhanced
> SCSI Hardware) SCSI bus adaptor (the 7200 doesn't, but all of the
> @@ -1560,7 +1560,7 @@ config SCSI_MESH_RESET_DELAY_MS
>
> config SCSI_MAC53C94
> tristate "53C94 (Power Mac external SCSI) support"
> - depends on PPC32 && PPC_PMAC && SCSI
> + depends on PPC32 && PPC_PMAC && SCSI && ADB_CUDA
> help
> On Power Macintoshes (and clones) with two SCSI buses, the external
> SCSI bus is usually controlled by a 53C94 SCSI bus adaptor. Older
> Index: linux-2.6.14-rc5/drivers/serial/Kconfig
> ===================================================================
> --- linux-2.6.14-rc5.orig/drivers/serial/Kconfig
> +++ linux-2.6.14-rc5/drivers/serial/Kconfig
> @@ -651,7 +651,7 @@ config SERIAL_68360
>
> config SERIAL_PMACZILOG
> tristate "PowerMac z85c30 ESCC support"
> - depends on PPC_OF && PPC_PMAC
> + depends on PPC_OF && PPC_PMAC && (ADB_CUDA || ADB_PMU)
> select SERIAL_CORE
> help
> This driver supports the Zilog z85C30 serial ports found on
> Index: linux-2.6.14-rc5/drivers/ide/Kconfig
> ===================================================================
> --- linux-2.6.14-rc5.orig/drivers/ide/Kconfig
> +++ linux-2.6.14-rc5/drivers/ide/Kconfig
> @@ -744,7 +744,7 @@ endif
>
> config BLK_DEV_IDE_PMAC
> bool "Builtin PowerMac IDE support"
> - depends on PPC_PMAC && IDE=y
> + depends on PPC_PMAC && IDE=y && (ADB_CUDA || ADB_PMU)
> help
> This driver provides support for the built-in IDE controller on
> most of the recent Apple Power Macintoshes and PowerBooks.
> Index: linux-2.6.14-rc5/drivers/net/wireless/Kconfig
> ===================================================================
> --- linux-2.6.14-rc5.orig/drivers/net/wireless/Kconfig
> +++ linux-2.6.14-rc5/drivers/net/wireless/Kconfig
> @@ -281,7 +281,7 @@ config HERMES
>
> config APPLE_AIRPORT
> tristate "Apple Airport support (built-in)"
> - depends on PPC_PMAC && HERMES
> + depends on PPC_PMAC && HERMES && ADB_PMU
> help
> Say Y here to support the Airport 802.11b wireless Ethernet hardware
> built into the Macintosh iBook and other recent PowerPC-based
> Index: linux-2.6.14-rc5/drivers/video/Kconfig
> ===================================================================
> --- linux-2.6.14-rc5.orig/drivers/video/Kconfig
> +++ linux-2.6.14-rc5/drivers/video/Kconfig
> @@ -359,7 +359,7 @@ config FB_OF
>
> config FB_CONTROL
> bool "Apple \"control\" display support"
> - depends on (FB = y) && PPC_PMAC
> + depends on (FB = y) && PPC_PMAC && ADB_CUDA
> select FB_CFB_FILLRECT
> select FB_CFB_COPYAREA
> select FB_CFB_IMAGEBLIT
> @@ -371,7 +371,7 @@ config FB_CONTROL
>
> config FB_PLATINUM
> bool "Apple \"platinum\" display support"
> - depends on (FB = y) && PPC_PMAC
> + depends on (FB = y) && PPC_PMAC && ADB_CUDA
> select FB_CFB_FILLRECT
> select FB_CFB_COPYAREA
> select FB_CFB_IMAGEBLIT
> @@ -383,7 +383,7 @@ config FB_PLATINUM
>
> config FB_VALKYRIE
> bool "Apple \"valkyrie\" display support"
> - depends on (FB = y) && (MAC || PPC_PMAC)
> + depends on (FB = y) && (MAC || (PPC_PMAC && ADB_CUDA))
> select FB_CFB_FILLRECT
> select FB_CFB_COPYAREA
> select FB_CFB_IMAGEBLIT
> @@ -395,7 +395,7 @@ config FB_VALKYRIE
>
> config FB_CT65550
> bool "Chips 65550 display support"
> - depends on (FB = y) && PPC
> + depends on (FB = y) && PPC_PMAC && ADB_CUDA
> select FB_CFB_FILLRECT
> select FB_CFB_COPYAREA
> select FB_CFB_IMAGEBLIT
next prev parent reply other threads:[~2005-10-22 23:10 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-10-22 21:30 [PATCH] hide pmac specific drivers if CONFIG_ADB is not set Olaf Hering
2005-10-22 23:05 ` Benjamin Herrenschmidt [this message]
2005-10-23 8:12 ` Olaf Hering
2005-10-23 8:22 ` Benjamin Herrenschmidt
2005-10-23 8:23 ` Geert Uytterhoeven
2005-10-23 8:23 ` Benjamin Herrenschmidt
2005-10-23 17:44 ` Brad Boyer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1130022347.7919.39.camel@gaston \
--to=benh@kernel.crashing.org \
--cc=akpm@osdl.org \
--cc=linuxppc-dev@ozlabs.org \
--cc=olh@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).