From: arnd@arndb•de
To: paulus@samba•org
Cc: linuxppc-dev@ozlabs•org
Subject: [patch 8/9] fix conflicting mpc85xx board headers
Date: Sat, 16 Jun 2007 02:05:19 +0200 [thread overview]
Message-ID: <20070616000619.096176701@arndb.de> (raw)
In-Reply-To: 20070616000511.712667424@arndb.de
In order to allow multiplatform kernels, we can not have header
files that define the same symbols. Probably these board specific
headers should just go away entirely, but for the easiest fix
is to rename the conflicting symbols.
Signed-off-by: Arnd Bergmann <arnd@arndb•de>
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-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 ` [patch 7/9] disallow building powermac and tsi108 " arnd
2007-06-17 14:35 ` Kumar Gala
2007-06-17 15:32 ` Arnd Bergmann
2007-06-16 0:05 ` arnd [this message]
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=20070616000619.096176701@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