From: arnd@arndb.de
To: paulus@samba.org
Cc: linuxppc-dev@ozlabs.org
Subject: [patch 08/10] powerpc: multiplatformize 85xx Kconfig
Date: Tue, 12 Jun 2007 01:28:32 +0200 [thread overview]
Message-ID: <20070611233354.573564809@arndb.de> (raw)
In-Reply-To: 20070611232824.489103547@arndb.de
The various e500 platforms can be built in a single kernel,
as long as a small conflict in the header files is resolved.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Index: linux-2.6/arch/powerpc/platforms/85xx/Kconfig
===================================================================
--- linux-2.6.orig/arch/powerpc/platforms/85xx/Kconfig
+++ linux-2.6/arch/powerpc/platforms/85xx/Kconfig
@@ -1,28 +1,27 @@
-choice
- prompt "Machine Type"
- depends on PPC_85xx
- default MPC8540_ADS
-
config MPC8540_ADS
bool "Freescale MPC8540 ADS"
+ depends on PPC_85xx
select DEFAULT_UIMAGE
help
This option enables support for the MPC 8540 ADS board
config MPC8560_ADS
bool "Freescale MPC8560 ADS"
+ depends on PPC_85xx
select DEFAULT_UIMAGE
help
This option enables support for the MPC 8560 ADS board
config MPC85xx_CDS
bool "Freescale MPC85xx CDS"
+ depends on PPC_85xx
select DEFAULT_UIMAGE
help
This option enables support for the MPC85xx CDS board
config MPC85xx_MDS
bool "Freescale MPC85xx MDS"
+ depends on PPC_85xx
select DEFAULT_UIMAGE
# select QUICC_ENGINE
help
@@ -30,12 +29,11 @@ config MPC85xx_MDS
config MPC8544_DS
bool "Freescale MPC8544 DS"
+ depends on PPC_85xx
select DEFAULT_UIMAGE
help
This option enables support for the MPC8544 DS board
-endchoice
-
config MPC8540
bool
select PPC_UDBG_16550
Index: linux-2.6/arch/powerpc/platforms/85xx/mpc85xx_ads.h
===================================================================
--- linux-2.6.orig/arch/powerpc/platforms/85xx/mpc85xx_ads.h
+++ linux-2.6/arch/powerpc/platforms/85xx/mpc85xx_ads.h
@@ -29,14 +29,14 @@
#define MPC85xx_CPM_OFFSET (0x80000)
#define CPM_MAP_ADDR (get_immrbase() + MPC85xx_CPM_OFFSET)
-#define CPM_IRQ_OFFSET 60
+#define MPC85xxADS_CPM_IRQ_OFFSET 60
-#define SIU_INT_SMC1 ((uint)0x04+CPM_IRQ_OFFSET)
-#define SIU_INT_SMC2 ((uint)0x05+CPM_IRQ_OFFSET)
-#define SIU_INT_SCC1 ((uint)0x28+CPM_IRQ_OFFSET)
-#define SIU_INT_SCC2 ((uint)0x29+CPM_IRQ_OFFSET)
-#define SIU_INT_SCC3 ((uint)0x2a+CPM_IRQ_OFFSET)
-#define SIU_INT_SCC4 ((uint)0x2b+CPM_IRQ_OFFSET)
+#define SIU_INT_SMC1 ((uint)0x04+MPC85xxADS_CPM_IRQ_OFFSET)
+#define SIU_INT_SMC2 ((uint)0x05+MPC85xxADS_CPM_IRQ_OFFSET)
+#define SIU_INT_SCC1 ((uint)0x28+MPC85xxADS_CPM_IRQ_OFFSET)
+#define SIU_INT_SCC2 ((uint)0x29+MPC85xxADS_CPM_IRQ_OFFSET)
+#define SIU_INT_SCC3 ((uint)0x2a+MPC85xxADS_CPM_IRQ_OFFSET)
+#define SIU_INT_SCC4 ((uint)0x2b+MPC85xxADS_CPM_IRQ_OFFSET)
/* FCC1 Clock Source Configuration. These can be
* redefined in the board specific file.
Index: linux-2.6/arch/powerpc/platforms/85xx/mpc85xx_cds.h
===================================================================
--- linux-2.6.orig/arch/powerpc/platforms/85xx/mpc85xx_cds.h
+++ linux-2.6/arch/powerpc/platforms/85xx/mpc85xx_cds.h
@@ -36,7 +36,7 @@
#define PIRQ1A MPC85xx_IRQ_EXT11
#define NR_8259_INTS 16
-#define CPM_IRQ_OFFSET NR_8259_INTS
+#define MPC85xxCDS_CPM_IRQ_OFFSET NR_8259_INTS
#define MPC85xx_OPENPIC_IRQ_OFFSET 80
--
next prev parent reply other threads:[~2007-06-11 23:36 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-06-11 23:28 [patch 00/10] CPU selection Kconfig cleanup, take 2 arnd
2007-06-11 23:28 ` [patch 01/10] powerpc: split out CPU specific options into a new Kconfig file arnd
2007-06-12 4:02 ` Stephen Rothwell
2007-06-12 7:42 ` Arnd Bergmann
2007-06-12 11:12 ` Paul Mackerras
2007-06-12 12:42 ` Arnd Bergmann
2007-06-11 23:28 ` [patch 02/10] powerpc: Move CONFIG_PPC64 into CPU selection arnd
2007-06-12 6:33 ` Paul Mackerras
2007-06-12 8:08 ` Arnd Bergmann
2007-06-12 11:11 ` Paul Mackerras
2007-06-12 11:35 ` Segher Boessenkool
2007-06-12 21:32 ` Benjamin Herrenschmidt
2007-06-13 4:52 ` Segher Boessenkool
2007-06-13 0:42 ` Paul Mackerras
2007-06-13 4:57 ` Segher Boessenkool
2007-06-12 11:49 ` Arnd Bergmann
2007-06-11 23:28 ` [patch 03/10] powerpc: move 82xx/83xx/86xx Kconfig options to platform selection arnd
2007-06-11 23:28 ` [patch 04/10] powerpc: rename add_bridge to avoid namespace clashes arnd
2007-06-12 4:11 ` Stephen Rothwell
2007-06-11 23:28 ` [patch 05/10] powerpc: Multiplatformize 8{2,3,6}xx configuration arnd
2007-06-11 23:28 ` [patch 06/10] powerpc: multiplatformize embedded6xx Kconfig arnd
2007-06-12 4:15 ` Stephen Rothwell
2007-06-12 4:16 ` Stephen Rothwell
2007-06-12 5:59 ` Kumar Gala
2007-06-12 7:46 ` Arnd Bergmann
2007-06-11 23:28 ` [patch 07/10] powerpc: multiplatformize 52xx configuration arnd
2007-06-11 23:28 ` arnd [this message]
2007-06-11 23:28 ` [patch 09/10] powerpc: autoselect PPC_MULTIPLATFORM arnd
2007-06-11 23:28 ` [patch 10/10] powerpc: autoselect optimal -mcpu= flag by platform 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=20070611233354.573564809@arndb.de \
--to=arnd@arndb.de \
--cc=linuxppc-dev@ozlabs.org \
--cc=paulus@samba.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.