* [PATCH] fix build of ibmstb4 and ibmstbx25
@ 2003-09-24 3:04 Andreas Oberritter
2003-09-24 17:17 ` Tom Rini
0 siblings, 1 reply; 6+ messages in thread
From: Andreas Oberritter @ 2003-09-24 3:04 UTC (permalink / raw)
To: Tom Rini; +Cc: linuxppc-dev
[-- 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
+ }
};
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] fix build of ibmstb4 and ibmstbx25
2003-09-24 3:04 [PATCH] fix build of ibmstb4 and ibmstbx25 Andreas Oberritter
@ 2003-09-24 17:17 ` Tom Rini
2003-09-24 21:00 ` Andreas Oberritter
0 siblings, 1 reply; 6+ messages in thread
From: Tom Rini @ 2003-09-24 17:17 UTC (permalink / raw)
To: Andreas Oberritter; +Cc: linuxppc-dev
On Wed, Sep 24, 2003 at 05:04:49AM +0200, Andreas Oberritter wrote:
> 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.
Applied. Does this mean you have the HW and can test things?
> 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. :)
I don't know, I always use bk diffs. Perhaps you didn't do a 'bk edit'
before hand?
--
Tom Rini
http://gate.crashing.org/~trini/
** Sent via the linuxppc-dev mail list. See http://lists.linuxppc.org/
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] fix build of ibmstb4 and ibmstbx25
2003-09-24 17:17 ` Tom Rini
@ 2003-09-24 21:00 ` Andreas Oberritter
2003-09-24 21:19 ` Matt Porter
0 siblings, 1 reply; 6+ messages in thread
From: Andreas Oberritter @ 2003-09-24 21:00 UTC (permalink / raw)
To: Tom Rini; +Cc: linuxppc-dev
On Wed, 2003-09-24 at 19:17, Tom Rini wrote:
> On Wed, Sep 24, 2003 at 05:04:49AM +0200, Andreas Oberritter wrote:
>
> > 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.
>
> Applied. Does this mean you have the HW and can test things?
Thanks!
Yes, I have a set-top-box using the stb4500. I don't have an stbx25xx
yet, but there are or will be some interesting boxes on the market using
it.
I found two more bugs in linuxppc-2.4:
ppc405_wdt.c is missing, but it is available as a config option.
embed_config.c contains an #endif below #include <asm/io.h> without a
matching #if.
Unfortunately I can't send patches at the moment because my harddisk
died partially this morning...
Btw, thanks for applying the dbox2 patches! Will the watchdog code be
merged in before 2.4.23, too?
Regards,
Andreas
** Sent via the linuxppc-dev mail list. See http://lists.linuxppc.org/
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] fix build of ibmstb4 and ibmstbx25
2003-09-24 21:00 ` Andreas Oberritter
@ 2003-09-24 21:19 ` Matt Porter
2003-09-24 21:32 ` Tom Rini
0 siblings, 1 reply; 6+ messages in thread
From: Matt Porter @ 2003-09-24 21:19 UTC (permalink / raw)
To: Andreas Oberritter; +Cc: Tom Rini, linuxppc-dev
On Wed, Sep 24, 2003 at 11:00:07PM +0200, Andreas Oberritter wrote:
>
> On Wed, 2003-09-24 at 19:17, Tom Rini wrote:
> > On Wed, Sep 24, 2003 at 05:04:49AM +0200, Andreas Oberritter wrote:
> >
> > > 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.
> >
> > Applied. Does this mean you have the HW and can test things?
>
> Thanks!
>
> Yes, I have a set-top-box using the stb4500. I don't have an stbx25xx
> yet, but there are or will be some interesting boxes on the market using
> it.
>
> I found two more bugs in linuxppc-2.4:
>
> ppc405_wdt.c is missing, but it is available as a config option.
This one is in my queue to cleanup up and verify on 44x. It
probably got missed since there aren't many users.
> embed_config.c contains an #endif below #include <asm/io.h> without a
> matching #if.
This fix is in a set of mismerge fixes I'm going to push RSN.
> Unfortunately I can't send patches at the moment because my harddisk
> died partially this morning...
>
> Btw, thanks for applying the dbox2 patches! Will the watchdog code be
> merged in before 2.4.23, too?
I was going to clean it up first.
-Matt
** Sent via the linuxppc-dev mail list. See http://lists.linuxppc.org/
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] fix build of ibmstb4 and ibmstbx25
2003-09-24 21:19 ` Matt Porter
@ 2003-09-24 21:32 ` Tom Rini
2003-09-24 21:53 ` Matt Porter
0 siblings, 1 reply; 6+ messages in thread
From: Tom Rini @ 2003-09-24 21:32 UTC (permalink / raw)
To: Matt Porter; +Cc: Andreas Oberritter, linuxppc-dev
On Wed, Sep 24, 2003 at 02:19:46PM -0700, Matt Porter wrote:
> On Wed, Sep 24, 2003 at 11:00:07PM +0200, Andreas Oberritter wrote:
> >
> > On Wed, 2003-09-24 at 19:17, Tom Rini wrote:
> > > On Wed, Sep 24, 2003 at 05:04:49AM +0200, Andreas Oberritter wrote:
> > >
> > > > 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.
> > >
> > > Applied. Does this mean you have the HW and can test things?
> >
> > Thanks!
> >
> > Yes, I have a set-top-box using the stb4500. I don't have an stbx25xx
> > yet, but there are or will be some interesting boxes on the market using
> > it.
> >
> > I found two more bugs in linuxppc-2.4:
> >
> > ppc405_wdt.c is missing, but it is available as a config option.
>
> This one is in my queue to cleanup up and verify on 44x. It
> probably got missed since there aren't many users.
>
> > embed_config.c contains an #endif below #include <asm/io.h> without a
> > matching #if.
>
> This fix is in a set of mismerge fixes I'm going to push RSN.
>
> > Unfortunately I can't send patches at the moment because my harddisk
> > died partially this morning...
> >
> > Btw, thanks for applying the dbox2 patches! Will the watchdog code be
> > merged in before 2.4.23, too?
>
> I was going to clean it up first.
I think he meant the dbox2 wdt changes. Actually, I was hoping that you
would post the driver + needed changes to arch/ppc to lkml and see if
anyone comments on the code.
those
--
Tom Rini
http://gate.crashing.org/~trini/
** Sent via the linuxppc-dev mail list. See http://lists.linuxppc.org/
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] fix build of ibmstb4 and ibmstbx25
2003-09-24 21:32 ` Tom Rini
@ 2003-09-24 21:53 ` Matt Porter
0 siblings, 0 replies; 6+ messages in thread
From: Matt Porter @ 2003-09-24 21:53 UTC (permalink / raw)
To: Tom Rini; +Cc: Matt Porter, Andreas Oberritter, linuxppc-dev
On Wed, Sep 24, 2003 at 02:32:12PM -0700, Tom Rini wrote:
> On Wed, Sep 24, 2003 at 02:19:46PM -0700, Matt Porter wrote:
> > On Wed, Sep 24, 2003 at 11:00:07PM +0200, Andreas Oberritter wrote:
> > > ppc405_wdt.c is missing, but it is available as a config option.
<snip>
> > I was going to clean it up first.
>
> I think he meant the dbox2 wdt changes. Actually, I was hoping that you
> would post the driver + needed changes to arch/ppc to lkml and see if
> anyone comments on the code.
> those
Oh good, I saw the ppc405_wdt.c referenced above and figured he was
still talking about that. :)
-Matt
** Sent via the linuxppc-dev mail list. See http://lists.linuxppc.org/
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2003-09-24 21:53 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2003-09-24 3:04 [PATCH] fix build of ibmstb4 and ibmstbx25 Andreas Oberritter
2003-09-24 17:17 ` 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
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).