aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
Diffstat (limited to 'target')
-rw-r--r--target/linux/generic-2.6/patches-2.6.30/251-atm.patch (renamed from target/linux/ifxmips/patches-2.6.30/201-atm.patch)12
-rw-r--r--target/linux/ifxmips/Makefile5
-rw-r--r--target/linux/ifxmips/base-files/etc/config/network3
-rw-r--r--target/linux/ifxmips/files/arch/mips/include/asm/mach-ifxmips/ifxmips_irq.h1
-rw-r--r--target/linux/ifxmips/patches-2.6.30/400-atm_hack.patch48
5 files changed, 53 insertions, 16 deletions
diff --git a/target/linux/ifxmips/patches-2.6.30/201-atm.patch b/target/linux/generic-2.6/patches-2.6.30/251-atm.patch
index bbf013dc38..07da344259 100644
--- a/target/linux/ifxmips/patches-2.6.30/201-atm.patch
+++ b/target/linux/generic-2.6/patches-2.6.30/251-atm.patch
@@ -12,15 +12,3 @@ Index: linux-2.6.28.10/include/linux/atm.h
/* extra params for ABR */
unsigned int icr; /* Initial Cell Rate (24-bit) */
unsigned int tbe; /* Transient Buffer Exposure (24-bit) */
-Index: linux-2.6.28.10/kernel/time/timekeeping.c
-===================================================================
---- linux-2.6.28.10.orig/kernel/time/timekeeping.c 2009-09-02 15:41:06.000000000 +0200
-+++ linux-2.6.28.10/kernel/time/timekeeping.c 2009-09-02 15:41:23.000000000 +0200
-@@ -43,6 +43,7 @@
- * used instead.
- */
- struct timespec xtime __attribute__ ((aligned (16)));
-+EXPORT_SYMBOL(xtime);
- struct timespec wall_to_monotonic __attribute__ ((aligned (16)));
- static unsigned long total_sleep_time; /* seconds */
-
diff --git a/target/linux/ifxmips/Makefile b/target/linux/ifxmips/Makefile
index e728921489..14ee8831f0 100644
--- a/target/linux/ifxmips/Makefile
+++ b/target/linux/ifxmips/Makefile
@@ -13,9 +13,10 @@ FEATURES:=squashfs jffs2 atm
LINUX_VERSION:=2.6.30.9
+CFLAGS=-Os -pipe -mips32r2 -mtune=mips32r2 -funit-at-a-time
+
include $(INCLUDE_DIR)/target.mk
-DEFAULT_PACKAGES+=uboot-ifxmips
-#kmod-pppoa ppp-mod-pppoa linux-atm atm-tools br2684ctl kmod-ifxmips-atm
+DEFAULT_PACKAGES+=kmod-pppoa ppp-mod-pppoa linux-atm atm-tools br2684ctl ifxmips-dsl-api ifxmips-dsl-control
define Target/Description
Build firmware images for Infineon Mips Controllers
diff --git a/target/linux/ifxmips/base-files/etc/config/network b/target/linux/ifxmips/base-files/etc/config/network
index 8f5624b4af..183e6bf34c 100644
--- a/target/linux/ifxmips/base-files/etc/config/network
+++ b/target/linux/ifxmips/base-files/etc/config/network
@@ -23,5 +23,4 @@ config interface wan
option proto pppoe
option username ""
option password ""
- option defaultroute 0
- option unit 1
+ option unit 0
diff --git a/target/linux/ifxmips/files/arch/mips/include/asm/mach-ifxmips/ifxmips_irq.h b/target/linux/ifxmips/files/arch/mips/include/asm/mach-ifxmips/ifxmips_irq.h
index f84fdcb120..f3cb99c2bb 100644
--- a/target/linux/ifxmips/files/arch/mips/include/asm/mach-ifxmips/ifxmips_irq.h
+++ b/target/linux/ifxmips/files/arch/mips/include/asm/mach-ifxmips/ifxmips_irq.h
@@ -35,6 +35,7 @@
#define IFXMIPS_SSC_RIR (INT_NUM_IM0_IRL0 + 14)
#define IFXMIPS_SSC_EIR (INT_NUM_IM0_IRL0 + 16)
+#define IFXMIPS_MEI_DYING_GASP_INT (INT_NUM_IM1_IRL0 + 21)
#define IFXMIPS_MEI_INT (INT_NUM_IM1_IRL0 + 23)
#define IFXMIPS_TIMER6_INT (INT_NUM_IM1_IRL0 + 23)
diff --git a/target/linux/ifxmips/patches-2.6.30/400-atm_hack.patch b/target/linux/ifxmips/patches-2.6.30/400-atm_hack.patch
new file mode 100644
index 0000000000..c14d1399db
--- /dev/null
+++ b/target/linux/ifxmips/patches-2.6.30/400-atm_hack.patch
@@ -0,0 +1,48 @@
+Index: linux-2.6.30.9/arch/mips/mm/cache.c
+===================================================================
+--- linux-2.6.30.9.orig/arch/mips/mm/cache.c 2009-11-01 16:10:29.000000000 +0100
++++ linux-2.6.30.9/arch/mips/mm/cache.c 2009-11-01 16:11:56.000000000 +0100
+@@ -52,6 +52,8 @@
+ void (*_dma_cache_inv)(unsigned long start, unsigned long size);
+
+ EXPORT_SYMBOL(_dma_cache_wback_inv);
++EXPORT_SYMBOL(_dma_cache_wback);
++EXPORT_SYMBOL(_dma_cache_inv);
+
+ #endif /* CONFIG_DMA_NONCOHERENT */
+
+Index: linux-2.6.30.9/net/atm/proc.c
+===================================================================
+--- linux-2.6.30.9.orig/net/atm/proc.c 2009-11-01 16:34:42.000000000 +0100
++++ linux-2.6.30.9/net/atm/proc.c 2009-11-01 16:35:59.000000000 +0100
+@@ -151,7 +151,7 @@
+
+ static void pvc_info(struct seq_file *seq, struct atm_vcc *vcc)
+ {
+- static const char *class_name[] = { "off","UBR","CBR","VBR","ABR" };
++ static const char *class_name[] = { "off","UBR","CBR","NTR-VBR","ABR","ANY","RT-VBR","UBR+","GFR" };
+ static const char *aal_name[] = {
+ "---", "1", "2", "3/4", /* 0- 3 */
+ "???", "5", "???", "???", /* 4- 7 */
+Index: linux-2.6.30.9/net/atm/common.c
+===================================================================
+--- linux-2.6.30.9.orig/net/atm/common.c 2009-11-01 16:38:12.000000000 +0100
++++ linux-2.6.30.9/net/atm/common.c 2009-11-01 16:47:06.000000000 +0100
+@@ -56,12 +56,17 @@
+ write_unlock_irq(&vcc_sklist_lock);
+ }
+
++struct sk_buff* (*ifx_atm_alloc_tx)(struct atm_vcc *, unsigned int) = NULL;
++EXPORT_SYMBOL(ifx_atm_alloc_tx);
+
+ static struct sk_buff *alloc_tx(struct atm_vcc *vcc,unsigned int size)
+ {
+ struct sk_buff *skb;
+ struct sock *sk = sk_atm(vcc);
+
++ if (ifx_atm_alloc_tx != NULL)
++ return ifx_atm_alloc_tx(vcc, size);
++
+ if (atomic_read(&sk->sk_wmem_alloc) && !atm_may_send(vcc, size)) {
+ pr_debug("Sorry: wmem_alloc = %d, size = %d, sndbuf = %d\n",
+ atomic_read(&sk->sk_wmem_alloc), size,