From: John Crispin <john@openwrt.org>
Date: Tue, 30 Mar 2010 21:06:27 +0000 (+0000)
Subject: [ifxmips] prepare kernel for voip
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;h=b32ead4bfb6ed969b75a7e65a98319878da28b5e

[ifxmips] prepare kernel for voip

SVN-Revision: 20613
---

diff --git a/target/linux/ifxmips/Makefile b/target/linux/ifxmips/Makefile
index addeef6810..b82f78263f 100644
--- a/target/linux/ifxmips/Makefile
+++ b/target/linux/ifxmips/Makefile
@@ -16,7 +16,8 @@ LINUX_VERSION:=2.6.30.10
 CFLAGS=-Os -pipe -mips32r2 -mtune=mips32r2 -funit-at-a-time
 
 include $(INCLUDE_DIR)/target.mk
-DEFAULT_PACKAGES+=kmod-pppoa ppp-mod-pppoa linux-atm atm-tools br2684ctl ifxmips-dsl-api ifxmips-dsl-control
+DEFAULT_PACKAGES+=uboot-lantiq
+#kmod-pppoa ppp-mod-pppoa linux-atm atm-tools br2684ctl ifxmips-dsl-api ifxmips-dsl-control ifx-tapidemo
 
 define Target/Description
 	Build firmware images for Infineon Mips Controllers
diff --git a/target/linux/ifxmips/extract.py b/target/linux/ifxmips/extract.py
new file mode 100755
index 0000000000..91b4a578d6
--- /dev/null
+++ b/target/linux/ifxmips/extract.py
@@ -0,0 +1,9 @@
+#!/usr/bin/python
+from sys import stdin, stdout
+while True:
+	c = stdin.read(2)
+	if len(c) < 2:
+		break
+	n1, n2 = ord(c[0]), ord(c[1])
+	stdout.write(chr(((n2 & 15) << 4) + ((n2 & 240) >> 4)))
+	stdout.write(chr(((n1 & 15) << 4) + ((n1 & 240) >> 4)))
diff --git a/target/linux/ifxmips/extract.sh b/target/linux/ifxmips/extract.sh
new file mode 100755
index 0000000000..4024969d1f
--- /dev/null
+++ b/target/linux/ifxmips/extract.sh
@@ -0,0 +1,36 @@
+#!/bin/sh
+
+DIR="$1/"
+FILE="$1/$2"
+
+echo "This tool downloads the arcor a800 firmware release and extracts the voip firmware for the danube."
+echo "Please only do so if it is legal in your country"
+
+[ ! -f ${FILE} ] && {
+	echo ${FILE} is missing
+	exit 1
+}
+
+[ ! -f ${DIR}bbd.crypt ] && {
+	dd if=${FILE} of=${DIR}bbd.crypt bs=1 skip=104 count=1472302
+}
+
+[ ! -f ${DIR}dsl_a.bin ] && {
+	dd if=${FILE} of=${DIR}dsl1.lzma bs=1 skip=2168832 count=150724
+	lzma d ${DIR}dsl2.lzma ${DIR}dsl_a.bin
+}
+
+[ ! -f ${DIR}dsl_b.bin ] && {
+	dd if=${FILE} of=${DIR}dsl2.lzma bs=1 skip=2320384 count=148343
+	lzma d ${DIR}dsl1.lzma ${DIR}dsl_b.bin
+}
+
+[ ! -f ${DIR}voip.bin ] && {
+	dd if=${FILE} of=${DIR}voip.lzma bs=1 skip=2468864 count=452105
+	lzma d ${DIR}voip.lzma ${DIR}voip.bin
+}
+exit 0
+
+# get lzma offsets
+# hexdump -C arcor_A800_452CPW_FW_1.02.206\(20081201\).bin | grep "5d 00 00 80"
+# hexdump -C arcor_A800_452CPW_FW_1.02.206\(20081201\).bin | grep "00 d5 08 00"
diff --git a/target/linux/ifxmips/files/arch/mips/ifxmips/Makefile b/target/linux/ifxmips/files/arch/mips/ifxmips/Makefile
index 9710645b99..c330be6344 100644
--- a/target/linux/ifxmips/files/arch/mips/ifxmips/Makefile
+++ b/target/linux/ifxmips/files/arch/mips/ifxmips/Makefile
@@ -1 +1 @@
-obj-y := reset.o prom.o setup.o irq.o dma-core.o pmu.o board.o clock.o gpio.o
+obj-y := reset.o prom.o setup.o irq.o dma-core.o pmu.o board.o clock.o gpio.o timer.o
diff --git a/target/linux/ifxmips/files/arch/mips/ifxmips/timer.c b/target/linux/ifxmips/files/arch/mips/ifxmips/timer.c
index d05df2283c..31e606c85a 100644
--- a/target/linux/ifxmips/files/arch/mips/ifxmips/timer.c
+++ b/target/linux/ifxmips/files/arch/mips/ifxmips/timer.c
@@ -13,11 +13,11 @@
 #include <asm/irq.h>
 #include <asm/div64.h>
 
-#include <asm/ifxmips/ifxmips.h>
-#include <asm/ifxmips/ifxmips_irq.h>
-#include <asm/mach-ifxmips/cgu.h>
-#include <asm/ifxmips/ifxmips_gptu.h>
-#include <asm/ifxmips/ifxmips_pmu.h>
+#include <ifxmips.h>
+#include <ifxmips_irq.h>
+#include <ifxmips_cgu.h>
+#include <ifxmips_gptu.h>
+#include <ifxmips_pmu.h>
 
 #define MAX_NUM_OF_32BIT_TIMER_BLOCKS	6