]> pilppa.org Git - familiar-h63xx-build.git/blob - org.handhelds.familiar/packages/linux/nslu2-kernel/2.6.13/50-nslu2-arch.patch
OE tree imported from monotone branch org.openembedded.oz354fam083 at revision 8b12e3...
[familiar-h63xx-build.git] / org.handhelds.familiar / packages / linux / nslu2-kernel / 2.6.13 / 50-nslu2-arch.patch
1 --- linux-2.6.11/arch/arm/boot/compressed/head.S        2005-06-17 17:51:27.245788998 -0700
2 +++ linux-2.6.11/arch/arm/boot/compressed/head.S        2005-06-17 17:54:45.041806429 -0700
3 @@ -37,6 +37,7 @@
4      defined(CONFIG_ARCH_INTEGRATOR) || \
5      defined(CONFIG_ARCH_PXA) || \
6      defined(CONFIG_ARCH_IXP4XX) || \
7 +    defined(CONFIG_ARCH_NSLU2) || \
8      defined(CONFIG_ARCH_IXP2000) || \
9      defined(CONFIG_ARCH_LH7A40X) || \
10      defined(CONFIG_ARCH_OMAP)
11 --- linux-2.6.11/.pc/2.6.patch/arch/arm/boot/compressed/head-xscale.S   2005-03-01 23:37:52.000000000 -0800
12 +++ linux-2.6.11/arch/arm/boot/compressed/head-xscale.S 2005-06-17 17:51:32.546985425 -0700
13 @@ -47,3 +47,8 @@
14                 orr     r7, r7, #(MACH_TYPE_GTWX5715 & 0xff00)
15  #endif
16  
17 +#ifdef CONFIG_ARCH_NSLU2
18 +               mov     r7, #(MACH_TYPE_NSLU2 & 0xff)
19 +               orr     r7, r7, #(MACH_TYPE_NSLU2 & 0xff00)
20 +#endif
21 +
22 --- linux-2.6.11/.pc/2.6.patch/arch/arm/mach-ixp4xx/Kconfig     2005-06-17 17:51:27.365770810 -0700
23 +++ linux-2.6.11/arch/arm/mach-ixp4xx/Kconfig   2005-06-17 17:51:32.560983303 -0700
24 @@ -43,6 +43,12 @@
25           IXDP465 Development Platform (Also known as BMP).
26           For more information on this platform, see <file:Documentation/arm/IXP4xx>.
27  
28 +config ARCH_NSLU2
29 +       bool "NSLU2"
30 +       help
31 +         Say 'Y' here if you want your kernel to support Linksys's 
32 +         NSLU2 NAS device. For more information on this platform, 
33 +         see http://www.nslu2-linux.org
34  
35  #
36  # IXCDP1100 is the exact same HW as IXDP425, but with a different machine 
37 --- linux-2.6.11/.pc/2.6.patch/arch/arm/tools/mach-types        2005-06-17 17:51:27.423762020 -0700
38 +++ linux-2.6.11/arch/arm/tools/mach-types      2005-06-17 17:51:32.564982697 -0700
39 @@ -604,7 +604,7 @@
40  roverp7                        MACH_ROVERP7            ROVERP7                 594
41  pr818s                 MACH_PR818S             PR818S                  595
42  trxpro                 MACH_TRXPRO             TRXPRO                  596
43 -nslu2                  MACH_NSLU2              NSLU2                   597
44 +nslu2                  ARCH_NSLU2              NSLU2                   597
45  e400                   MACH_E400               E400                    598
46  trab                   MACH_TRAB               TRAB                    599
47  cmc_pu2                        MACH_CMC_PU2            CMC_PU2                 600
48 --- linux-2.6.11/.pc/2.6.patch/drivers/mtd/maps/ixp4xx.c        2005-03-01 23:37:30.000000000 -0800
49 +++ linux-2.6.11/drivers/mtd/maps/ixp4xx.c      2005-06-17 17:51:32.566982394 -0700
50 @@ -94,7 +94,11 @@
51         struct resource *res;
52  };
53  
54 +#ifdef CONFIG_ARCH_NSLU2
55 +static const char *probes[] = { "cmdlinepart", "RedBoot", "NSLU2", NULL };
56 +#else
57  static const char *probes[] = { "RedBoot", "cmdlinepart", NULL };
58 +#endif
59  
60  static int ixp4xx_flash_remove(struct device *_dev)
61  {
62 --- linux-2.6.11/.pc/2.6.patch/include/asm-arm/arch-ixp4xx/hardware.h   2005-03-01 23:37:51.000000000 -0800
63 +++ linux-2.6.11/include/asm-arm/arch-ixp4xx/hardware.h 2005-06-17 17:51:32.567982242 -0700
64 @@ -44,5 +44,6 @@
65  #include "ixdp425.h"
66  #include "coyote.h"
67  #include "prpmc1100.h"
68 +#include "nslu2.h"
69  
70  #endif  /* _ASM_ARCH_HARDWARE_H */
71 --- linux-2.6.11/.pc/2.6.patch/include/asm-arm/arch-ixp4xx/irqs.h       2005-03-01 23:38:12.000000000 -0800
72 +++ linux-2.6.11/include/asm-arm/arch-ixp4xx/irqs.h     2005-06-17 17:51:32.568982091 -0700
73 @@ -93,4 +93,11 @@
74  #define        IRQ_COYOTE_PCI_SLOT1    IRQ_IXP4XX_GPIO11
75  #define        IRQ_COYOTE_IDE          IRQ_IXP4XX_GPIO5
76  
77 +/*
78 + * NSLU2 board IRQs
79 + */
80 +#define        IRQ_NSLU2_PCI_INTA      IRQ_IXP4XX_GPIO11
81 +#define        IRQ_NSLU2_PCI_INTB      IRQ_IXP4XX_GPIO10
82 +#define        IRQ_NSLU2_PCI_INTC      IRQ_IXP4XX_GPIO9
83 +
84  #endif