Skip to contentSkip to conversation

Fixes to MVME5100 support in 2.6.5

PATCH In review Tom Armistead 2 participants 2 messages Apr 22, 2004 – Apr 26, 2004

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Fixes to MVME5100 support in 2.6.5

This patch corrects problems of compiling and running the 2.6 kernel on
the MVME5100 board. The existing MVME5100 platform support in 2.6
does not compile and run due to a moved include file (pplus.h) and a changed interface to openpic_init(). This patch corrects those problems.

Thanks,
Tom Armistead

============

diff -uprN origlinux-2.6.5/arch/ppc/platforms/mvme5100_pci.c linux-2.6.5/arch/ppc/platforms/mvme5100_pci.c
--- origlinux-2.6.5/arch/ppc/platforms/mvme5100_pci.c Sun Apr 4
06:36:18 2004
+++ linux-2.6.5/arch/ppc/platforms/mvme5100_pci.c Fri Apr 16
16:26:02 2004
@@ -22,7 +22,7 @@
#include <asm/machdep.h>
#include <asm/pci-bridge.h>
#include <platforms/mvme5100.h>
-#include <asm/pplus.h>
+#include "pplus.h"

static inline int
mvme5100_map_irq(struct pci_dev *dev, unsigned char idsel, unsigned
char pin)
diff -uprN origlinux-2.6.5/arch/ppc/platforms/mvme5100_setup.c linux-2.6.5/arch/ppc/platforms/mvme5100_setup.c
--- origlinux-2.6.5/arch/ppc/platforms/mvme5100_setup.c Sun Apr 4 06:36:54 2004
+++ linux-2.6.5/arch/ppc/platforms/mvme5100_setup.c Fri Apr 16
16:27:27 2004
@@ -43,7 +43,7 @@
#include <asm/todc.h>
#include <asm/pci-bridge.h>
#include <asm/bootinfo.h>
-#include <asm/pplus.h>
+#include "pplus.h"

extern char cmd_line[];

@@ -137,14 +137,14 @@ mvme5100_init_IRQ(void)

                ppc_md.progress("init_irq: enter", 0);

#ifdef CONFIG_MVME5100_IPMC761_PRESENT
- openpic_init(1, NUM_8259_INTERRUPTS, NULL, -1);
+ openpic_init(NUM_8259_INTERRUPTS);

        for(i=0; i < NUM_8259_INTERRUPTS; i++)
                irq_desc[i].handler = &i8259_pic;

        i8259_init(NULL);

#else
- openpic_init(1, 0, NULL, -1);
+ openpic_init(0);
#endif

if ( ppc_md.progress )

#1 lore raw
Quoted 6 lines · Tom Armistead

This patch corrects problems of compiling and running the 2.6 kernel on
the MVME5100 board. The existing MVME5100 platform support in 2.6
does not compile and run due to a moved include file (pplus.h) and a changed interface to openpic_init(). This patch corrects those problems.

Have you booted an MVME5100 after these changes as well? The mvme5100_openpic_initsenses table looks like it needs to be updated still. For a guide to how it should all look, if you've got the hw and time, please look how the PowerPlus code was updated recently (in BK, the key is [email protected]|ChangeSet|20040311200618|42037, currently changeset 1.1557.88.1).

Signature · 2 lines
Tom Rini
http://gate.crashing.org/~trini/