From: Andreas Oberritter <obi@saftware.de>
To: Tom Rini <trini@kernel.crashing.org>
Cc: linuxppc-dev@lists.linuxppc.org
Subject: [PATCH] fix build of ibmstb4 and ibmstbx25
Date: 24 Sep 2003 05:04:49 +0200 [thread overview]
Message-ID: <1064372689.822.13.camel@shiva.eth.saftware.de> (raw)
[-- Attachment #1: Type: text/plain, Size: 473 bytes --]
Hi Tom,
config.in.diff adds two missing '$' for config variables in
arch/ppc/config.in and the two other patches update the ocp definitions
for the stb4xxx and stbx25xx CPUs, so they can be built again. I used
linuxppc_2_4_devel, but they are needed for linuxppc-2.4, too.
Any idea why my changes to config.in were visible with bk difftool but
not with bk diffs? It's the first time I tried to use bk for creating
patches and I really don't like it. :)
Regards,
Andreas
[-- Attachment #2: config.in.diff --]
[-- Type: text/plain, Size: 632 bytes --]
--- linuxppc_2_4_devel/arch/ppc/config.in.orig 2003-09-24 04:55:03.000000000 +0200
+++ linuxppc_2_4_devel/arch/ppc/config.in 2003-09-24 04:53:03.000000000 +0200
@@ -386,8 +386,8 @@
#
if [ "$CONFIG_405GP" = "y" -o "$CONFIG_405EP" = "y" -o \
"$CONFIG_NP405H" = "y" -o "$CONFIG_NP405L" = "y" -o \
- "$CONFIG_NP405GS" = "y" -o "CONFIG_STB03xxx" = "y" -o \
- "$CONFIG_405LP" = "y" -o "CONFIG_405GPR" = "y" ]; then
+ "$CONFIG_NP405GS" = "y" -o "$CONFIG_STB03xxx" = "y" -o \
+ "$CONFIG_405LP" = "y" -o "$CONFIG_405GPR" = "y" ]; then
define_bool CONFIG_IBM_OCP y
define_bool CONFIG_405 y
fi
[-- Attachment #3: ibmstb4.c.diff --]
[-- Type: text/plain, Size: 2009 bytes --]
===== ibmstb4.c 1.6 vs edited =====
--- 1.6/arch/ppc/platforms/ibmstb4.c Wed Aug 7 21:18:05 2002
+++ edited/ibmstb4.c Wed Sep 24 04:41:33 2003
@@ -40,20 +40,62 @@
*
*/
-#include <linux/config.h>
-#include <linux/module.h>
+#include <linux/init.h>
#include <platforms/ibmstb4.h>
#include <asm/ocp.h>
-struct ocp_def core_ocp[] = {
- {UART, UART0_IO_BASE, UART0_INT,IBM_CPM_UART0},
- {UART, UART1_IO_BASE, UART1_INT, IBM_CPM_UART1},
- {UART, UART2_IO_BASE, UART2_INT, IBM_CPM_UART2},
- {IIC, IIC0_BASE, IIC0_IRQ, IBM_CPM_IIC0},
- {IIC, IIC1_BASE, IIC1_IRQ, IBM_CPM_IIC1},
- {GPIO, GPIO0_BASE, OCP_IRQ_NA, IBM_CPM_GPIO0},
- {IDE, IDE0_BASE, IDE0_IRQ, OCP_CPM_NA},
- {USB, USB0_BASE, USB0_IRQ, IBM_CPM_USB0},
- {OCP_NULL_TYPE, 0x0, OCP_IRQ_NA, OCP_CPM_NA},
-
+struct ocp_def core_ocp[] __initdata = {
+ { .vendor = OCP_VENDOR_IBM,
+ .function = OCP_FUNC_16550,
+ .index = 0,
+ .paddr = UART0_IO_BASE,
+ .irq = UART0_INT,
+ .pm = IBM_CPM_UART0,
+ },
+ { .vendor = OCP_VENDOR_IBM,
+ .function = OCP_FUNC_16550,
+ .index = 1,
+ .paddr = UART1_IO_BASE,
+ .irq = UART1_INT,
+ .pm = IBM_CPM_UART2,
+ },
+ { .vendor = OCP_VENDOR_IBM,
+ .function = OCP_FUNC_16550,
+ .index = 2,
+ .paddr = UART2_IO_BASE,
+ .irq = UART2_INT,
+ .pm = IBM_CPM_UART2,
+ },
+ { .vendor = OCP_VENDOR_IBM,
+ .function = OCP_FUNC_IIC,
+ .paddr = IIC0_BASE,
+ .irq = IIC0_IRQ,
+ .pm = IBM_CPM_IIC0,
+ },
+ { .vendor = OCP_VENDOR_IBM,
+ .function = OCP_FUNC_IIC,
+ .paddr = IIC1_BASE,
+ .irq = IIC1_IRQ,
+ .pm = IBM_CPM_IIC1,
+ },
+ { .vendor = OCP_VENDOR_IBM,
+ .function = OCP_FUNC_GPIO,
+ .paddr = GPIO0_BASE,
+ .irq = OCP_IRQ_NA,
+ .pm = IBM_CPM_GPIO0,
+ },
+ { .vendor = OCP_VENDOR_IBM,
+ .function = OCP_FUNC_IDE,
+ .paddr = IDE0_BASE,
+ .irq = IDE0_IRQ,
+ .pm = OCP_CPM_NA,
+ },
+ { .vendor = OCP_VENDOR_IBM,
+ .function = OCP_FUNC_USB,
+ .paddr = USB0_BASE,
+ .irq = USB0_IRQ,
+ .pm = OCP_CPM_NA,
+ },
+ { .vendor = OCP_VENDOR_INVALID,
+ }
};
[-- Attachment #4: ibmstbx25.c.diff --]
[-- Type: text/plain, Size: 1489 bytes --]
===== ibmstbx25.c 1.2 vs edited =====
--- 1.2/arch/ppc/platforms/ibmstbx25.c Wed Aug 7 21:18:06 2002
+++ edited/ibmstbx25.c Wed Sep 24 04:42:50 2003
@@ -34,17 +34,44 @@
*
*/
-#include <linux/config.h>
-#include <linux/module.h>
+#include <linux/init.h>
#include <platforms/ibmstbx25.h>
#include <asm/ocp.h>
-struct ocp_def core_ocp[] = {
- {UART, UART0_IO_BASE, UART0_INT,IBM_CPM_UART0},
- {UART, UART1_IO_BASE, UART1_INT, IBM_CPM_UART1},
- {UART, UART2_IO_BASE, UART2_INT, IBM_CPM_UART2},
- {IIC, IIC0_BASE, IIC0_IRQ, IBM_CPM_IIC0},
- {GPIO, GPIO0_BASE, OCP_IRQ_NA, IBM_CPM_GPIO0},
- {OCP_NULL_TYPE, 0x0, OCP_IRQ_NA, OCP_CPM_NA},
-
+struct ocp_def core_ocp[] __initdata = {
+ { .vendor = OCP_VENDOR_IBM,
+ .function = OCP_FUNC_16550,
+ .index = 0,
+ .paddr = UART0_IO_BASE,
+ .irq = UART0_INT,
+ .pm = IBM_CPM_UART0,
+ },
+ { .vendor = OCP_VENDOR_IBM,
+ .function = OCP_FUNC_16550,
+ .index = 1,
+ .paddr = UART1_IO_BASE,
+ .irq = UART1_INT,
+ .pm = IBM_CPM_UART1,
+ },
+ { .vendor = OCP_VENDOR_IBM,
+ .function = OCP_FUNC_16550,
+ .index = 2,
+ .paddr = UART2_IO_BASE,
+ .irq = UART2_INT,
+ .pm = IBM_CPM_UART2,
+ },
+ { .vendor = OCP_VENDOR_IBM,
+ .function = OCP_FUNC_IIC,
+ .paddr = IIC0_BASE,
+ .irq = IIC0_IRQ,
+ .pm = IBM_CPM_IIC0,
+ },
+ { .vendor = OCP_VENDOR_IBM,
+ .function = OCP_FUNC_GPIO,
+ .paddr = GPIO0_BASE,
+ .irq = OCP_IRQ_NA,
+ .pm = IBM_CPM_GPIO0,
+ },
+ { .vendor = OCP_VENDOR_INVALID
+ }
};
next reply other threads:[~2003-09-24 3:04 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2003-09-24 3:04 Andreas Oberritter [this message]
2003-09-24 17:17 ` [PATCH] fix build of ibmstb4 and ibmstbx25 Tom Rini
2003-09-24 21:00 ` Andreas Oberritter
2003-09-24 21:19 ` Matt Porter
2003-09-24 21:32 ` Tom Rini
2003-09-24 21:53 ` Matt Porter
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=1064372689.822.13.camel@shiva.eth.saftware.de \
--to=obi@saftware.de \
--cc=linuxppc-dev@lists.linuxppc.org \
--cc=trini@kernel.crashing.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 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).