public inbox for linuxppc-dev@ozlabs.org 
 help / color / mirror / Atom feed
From: arnd@arndb•de
To: paulus@samba•org
Cc: linuxppc-dev@ozlabs•org
Subject: [patch 7/9] disallow building powermac and tsi108 without PCI
Date: Sat, 16 Jun 2007 02:05:18 +0200	[thread overview]
Message-ID: <20070616000618.965439750@arndb.de> (raw)
In-Reply-To: 20070616000511.712667424@arndb.de

The TSI108 code and the 32 bit powermac and chrp platforms
have dependency on PCI that is not easy or desirable to get rid
of.

The easiest fix is to always select CONFIG_PCI if one of those
platforms is enabled.

Signed-off-by: Arnd Bergmann <arnd@arndb•de>

Index: linux-2.6/arch/powerpc/platforms/embedded6xx/Kconfig
===================================================================
--- linux-2.6.orig/arch/powerpc/platforms/embedded6xx/Kconfig
+++ linux-2.6/arch/powerpc/platforms/embedded6xx/Kconfig
@@ -18,6 +18,7 @@ config LINKSTATION
 
 config MPC7448HPC2
 	bool "Freescale MPC7448HPC2(Taiga)"
+	select PCI
 	select TSI108_BRIDGE
 	select DEFAULT_UIMAGE
 	select PPC_UDBG_16550
@@ -31,6 +32,7 @@ config PPC_HOLLY
 	select TSI108_BRIDGE
 	select PPC_UDBG_16550
 	select CPU_7xx
+	select PCI
 	help
 	  Select PPC_HOLLY if configuring for an IBM 750GX/CL Eval
 	  Board with TSI108/9 bridge (Hickory/Holly)
Index: linux-2.6/arch/powerpc/platforms/powermac/Kconfig
===================================================================
--- linux-2.6.orig/arch/powerpc/platforms/powermac/Kconfig
+++ linux-2.6/arch/powerpc/platforms/powermac/Kconfig
@@ -2,6 +2,7 @@ config PPC_PMAC
 	bool "Apple PowerMac based machines"
 	depends on PPC_MULTIPLATFORM
 	select MPIC
+	select PCI
 	select PPC_INDIRECT_PCI if PPC32
 	select PPC_MPC106 if PPC32
 	select PPC_NATIVE
Index: linux-2.6/arch/powerpc/Kconfig
===================================================================
--- linux-2.6.orig/arch/powerpc/Kconfig
+++ linux-2.6/arch/powerpc/Kconfig
@@ -435,7 +435,7 @@ config MCA
 config PCI
 	bool "PCI support" if 40x || CPM2 || PPC_83xx || PPC_85xx || PPC_86xx \
 		|| PPC_MPC52xx || (EMBEDDED && (PPC_PSERIES || PPC_ISERIES)) \
-		|| MPC7448HPC2 || PPC_PS3 || PPC_HOLLY
+		|| PPC_PS3
 	default y if !40x && !CPM2 && !8xx && !PPC_83xx \
 		&& !PPC_85xx && !PPC_86xx
 	default PCI_PERMEDIA if !4xx && !CPM2 && !8xx
Index: linux-2.6/arch/powerpc/platforms/chrp/Kconfig
===================================================================
--- linux-2.6.orig/arch/powerpc/platforms/chrp/Kconfig
+++ linux-2.6/arch/powerpc/platforms/chrp/Kconfig
@@ -8,4 +8,5 @@ config PPC_CHRP
 	select PPC_MPC106
 	select PPC_UDBG_16550
 	select PPC_NATIVE
+	select PCI
 	default y
Index: linux-2.6/arch/powerpc/platforms/chrp/Makefile
===================================================================
--- linux-2.6.orig/arch/powerpc/platforms/chrp/Makefile
+++ linux-2.6/arch/powerpc/platforms/chrp/Makefile
@@ -1,4 +1,3 @@
-obj-y				+= setup.o time.o pegasos_eth.o
-obj-$(CONFIG_PCI)		+= pci.o
+obj-y				+= setup.o time.o pegasos_eth.o pci.o
 obj-$(CONFIG_SMP)		+= smp.o
 obj-$(CONFIG_NVRAM)		+= nvram.o

--

  parent reply	other threads:[~2007-06-16  0:09 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20070616000511.712667424@arndb.de>
2007-06-16  0:05 ` [patch 1/9] move 82xx/83xx/86xx Kconfig options to platform selection arnd
2007-06-17 14:42   ` Kumar Gala
2007-07-11 15:35   ` Mark A. Greer
2007-07-11 20:33     ` Arnd Bergmann
2007-07-11 21:19       ` Segher Boessenkool
2007-07-11 23:47       ` Mark A. Greer
2007-06-16  0:05 ` [patch 2/9] autoselect optimal -mcpu= flag by platform arnd
2007-06-17 14:29   ` Kumar Gala
2007-06-17 16:11     ` Segher Boessenkool
2007-06-17 17:20     ` Arnd Bergmann
2007-06-17 17:46       ` Segher Boessenkool
2007-06-29  5:58   ` Paul Mackerras
2007-06-16  0:05 ` [patch 3/9] rename add_bridge to avoid namespace clashes arnd
2007-06-16  0:05 ` [patch 4/9] mpc82xx_ads build fix arnd
2007-06-16  7:37   ` Stephen Rothwell
2007-06-16  9:33     ` [updated PATCH] " Arnd Bergmann
2007-06-16  0:05 ` [patch 5/9] kill isa_{io,mem}_base definitions for !PCI arnd
2007-06-17 14:33   ` Kumar Gala
2007-06-17 15:32     ` Arnd Bergmann
2007-06-16  0:05 ` [patch 6/9] fix building without PCI arnd
2007-06-16  0:05 ` arnd [this message]
2007-06-17 14:35   ` [patch 7/9] disallow building powermac and tsi108 " Kumar Gala
2007-06-17 15:32     ` Arnd Bergmann
2007-06-16  0:05 ` [patch 8/9] fix conflicting mpc85xx board headers arnd
2007-06-16  0:05 ` [patch 9/9] enable multiplatform support for embedded boards arnd

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=20070616000618.965439750@arndb.de \
    --to=arnd@arndb$(echo .)de \
    --cc=linuxppc-dev@ozlabs$(echo .)org \
    --cc=paulus@samba$(echo .)org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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