add a workaround preventing libtool from hardcoding library path in shared libs

[openwrt.git] / target / linux / ixp4xx / patches-2.6.26 / 500-usr8200_support.patch

diff --git a/target/linux/ixp4xx/patches-2.6.26/500-usr8200_support.patch b/target/linux/ixp4xx/patches-2.6.26/500-usr8200_support.patch
index ef818c7..ff7ffb1 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.26/500-usr8200_support.patch
+++ b/target/linux/ixp4xx/patches-2.6.26/500-usr8200_support.patch
@@ -17,25 +17,25 @@
        select PCI
 --- a/arch/arm/mach-ixp4xx/Makefile
 +++ b/arch/arm/mach-ixp4xx/Makefile
        select PCI
 --- a/arch/arm/mach-ixp4xx/Makefile
 +++ b/arch/arm/mach-ixp4xx/Makefile

-@@ -25,6 +25,7 @@ obj-pci-$(CONFIG_MACH_WRT300NV2)             += wrt
+@@ -24,6 +24,7 @@ obj-pci-$(CONFIG_MACH_COMPEX)                += ixdp42
+ obj-pci-$(CONFIG_MACH_WRT300NV2)              += wrt300nv2-pci.o

  obj-pci-$(CONFIG_MACH_AP1000)         += ixdp425-pci.o
  obj-pci-$(CONFIG_MACH_TW5334)         += tw5334-pci.o
  obj-pci-$(CONFIG_MACH_AP1000)         += ixdp425-pci.o
  obj-pci-$(CONFIG_MACH_TW5334)         += tw5334-pci.o

- obj-pci-$(CONFIG_MACH_MI424WR)                += mi424wr-pci.o

 +obj-pci-$(CONFIG_MACH_USR8200)                += usr8200-pci.o
  
  obj-y += common.o
  
 +obj-pci-$(CONFIG_MACH_USR8200)                += usr8200-pci.o
  
  obj-y += common.o
  

-@@ -48,6 +49,7 @@ obj-$(CONFIG_MACH_WRT300NV2) += wrt300nv
+@@ -46,6 +47,7 @@ obj-$(CONFIG_MACH_COMPEX)    += compex-setu
+ obj-$(CONFIG_MACH_WRT300NV2)  += wrt300nv2-setup.o

  obj-$(CONFIG_MACH_AP1000)     += ap1000-setup.o
  obj-$(CONFIG_MACH_TW5334)     += tw5334-setup.o
  obj-$(CONFIG_MACH_AP1000)     += ap1000-setup.o
  obj-$(CONFIG_MACH_TW5334)     += tw5334-setup.o

- obj-$(CONFIG_MACH_MI424WR)    += mi424wr-setup.o

 +obj-$(CONFIG_MACH_USR8200)    += usr8200-setup.o
  
  obj-$(CONFIG_PCI)             += $(obj-pci-$(CONFIG_PCI)) common-pci.o
  obj-$(CONFIG_IXP4XX_QMGR)     += ixp4xx_qmgr.o
 --- /dev/null
 +++ b/arch/arm/mach-ixp4xx/usr8200-pci.c
 +obj-$(CONFIG_MACH_USR8200)    += usr8200-setup.o
  
  obj-$(CONFIG_PCI)             += $(obj-pci-$(CONFIG_PCI)) common-pci.o
  obj-$(CONFIG_IXP4XX_QMGR)     += ixp4xx_qmgr.o
 --- /dev/null
 +++ b/arch/arm/mach-ixp4xx/usr8200-pci.c

-@@ -0,0 +1,78 @@
+@@ -0,0 +1,79 @@

 +/*
 + * arch/arch/mach-ixp4xx/usr8200-pci.c
 + *
 +/*
 + * arch/arch/mach-ixp4xx/usr8200-pci.c
 + *


@@ -62,8 +62,9 @@
 +#include <linux/init.h>
 +#include <linux/irq.h>
 +
 +#include <linux/init.h>
 +#include <linux/irq.h>
 +

++#include <asm/irq.h>

 +#include <asm/mach-types.h>
 +#include <asm/mach-types.h>

-+#include <mach/hardware.h>
++#include <asm/hardware.h>

 +
 +#include <asm/mach/pci.h>
 +
 +
 +#include <asm/mach/pci.h>
 +


@@ -116,7 +117,7 @@
 +subsys_initcall(usr8200_pci_init);
 --- /dev/null
 +++ b/arch/arm/mach-ixp4xx/usr8200-setup.c
 +subsys_initcall(usr8200_pci_init);
 --- /dev/null
 +++ b/arch/arm/mach-ixp4xx/usr8200-setup.c

-@@ -0,0 +1,211 @@
+@@ -0,0 +1,212 @@

 +/*
 + * arch/arm/mach-ixp4xx/usr8200-setup.c
 + *
 +/*
 + * arch/arm/mach-ixp4xx/usr8200-setup.c
 + *


@@ -145,7 +146,7 @@
 +#include <linux/leds.h>
 +
 +#include <asm/setup.h>
 +#include <linux/leds.h>
 +
 +#include <asm/setup.h>

-+#include <mach/hardware.h>
++#include <asm/hardware.h>

 +#include <asm/irq.h>
 +#include <asm/mach-types.h>
 +#include <asm/mach/arch.h>
 +#include <asm/irq.h>
 +#include <asm/mach-types.h>
 +#include <asm/mach/arch.h>


@@ -285,6 +286,7 @@
 +static struct platform_device usr8200_rtc = {
 +      .name           = "rtc7301",
 +      .id             = 0,
 +static struct platform_device usr8200_rtc = {
 +      .name           = "rtc7301",
 +      .id             = 0,

++      .num_resources  = 1,

 +      .resource       = &usr8200_rtc_resources,
 +};
 +
 +      .resource       = &usr8200_rtc_resources,
 +};
 +


@@ -328,8 +330,8 @@
 +      .boot_params    = 0x0100,
 +      .init_machine   = usr8200_init,
 +MACHINE_END
 +      .boot_params    = 0x0100,
 +      .init_machine   = usr8200_init,
 +MACHINE_END

---- a/arch/arm/mach-ixp4xx/include/mach/uncompress.h
-+++ b/arch/arm/mach-ixp4xx/include/mach/uncompress.h
+--- a/include/asm-arm/arch-ixp4xx/uncompress.h
++++ b/include/asm-arm/arch-ixp4xx/uncompress.h

 @@ -43,7 +43,7 @@ static __inline__ void __arch_decomp_set
        if (machine_is_adi_coyote() || machine_is_gtwx5715() ||
                         machine_is_gateway7001() || machine_is_wg302v2() ||
 @@ -43,7 +43,7 @@ static __inline__ void __arch_decomp_set
        if (machine_is_adi_coyote() || machine_is_gtwx5715() ||
                         machine_is_gateway7001() || machine_is_wg302v2() ||