Merge aruba support

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@2940 3c298f89-4303-0410-b956-a3cf2f4a3e73

7 files changed, 67 insertions, 0 deletions

diff --git a/openwrt/target/linux/package/base-files/files/aruba-2.6/etc/config/network b/openwrt/target/linux/package/base-files/files/aruba-2.6/etc/config/network
new file mode 100644
index 0000000000..f60332cd8c
--- /dev/null
+++ b/openwrt/target/linux/package/base-files/files/aruba-2.6/etc/config/network
@@ -0,0 +1,5 @@
+# Network configuration file
+
+## LAN configuration
+lan_ifname="eth0"
+lan_proto="dhcp"
diff --git a/openwrt/target/linux/package/base-files/files/aruba-2.6/etc/init.d/S00aruba b/openwrt/target/linux/package/base-files/files/aruba-2.6/etc/init.d/S00aruba
new file mode 100755
index 0000000000..9836de423b
--- /dev/null
+++ b/openwrt/target/linux/package/base-files/files/aruba-2.6/etc/init.d/S00aruba
@@ -0,0 +1,4 @@
+#!/bin/sh
+mount none /proc -t proc
+mount_root failsafe
+mount -o remount,rw /dev/root /
diff --git a/openwrt/target/linux/package/base-files/files/aruba-2.6/etc/init.d/S40network b/openwrt/target/linux/package/base-files/files/aruba-2.6/etc/init.d/S40network
new file mode 100755
index 0000000000..df7c6b3515
--- /dev/null
+++ b/openwrt/target/linux/package/base-files/files/aruba-2.6/etc/init.d/S40network
@@ -0,0 +1,16 @@
+#!/bin/sh
+. /etc/functions.sh
+[ "$FAILSAFE" != "true" -a -e /etc/config/network ] && . /etc/config/network
+case "$1" in
+  start|restart)
+    ifup lan
+    ifup wan
+    ifup wifi
+    wifi up
+
+    for route in $(nvram get static_route); do {
+      eval "set $(echo $route | sed 's/:/ /g')"
+      $DEBUG route add -net $1 netmask $2 gw $3 metric $4 dev $5
+    } done
+    ;;
+esac
diff --git a/openwrt/target/linux/package/base-files/files/aruba-2.6/etc/inittab b/openwrt/target/linux/package/base-files/files/aruba-2.6/etc/inittab
new file mode 100644
index 0000000000..aab2df9562
--- /dev/null
+++ b/openwrt/target/linux/package/base-files/files/aruba-2.6/etc/inittab
@@ -0,0 +1,3 @@
+::sysinit:/etc/init.d/rcS
+::shutdown:/sbin/halt
+tts/0::askfirst:/bin/ash --login
diff --git a/openwrt/target/linux/package/base-files/files/aruba-2.6/etc/ipkg.conf b/openwrt/target/linux/package/base-files/files/aruba-2.6/etc/ipkg.conf
new file mode 100644
index 0000000000..a83c95945c
--- /dev/null
+++ b/openwrt/target/linux/package/base-files/files/aruba-2.6/etc/ipkg.conf
@@ -0,0 +1,3 @@
+src aruba http://lotus/~mbaker/packages
+dest root /
+dest ram /tmp
diff --git a/openwrt/target/linux/package/base-files/files/aruba-2.6/etc/network.overrides b/openwrt/target/linux/package/base-files/files/aruba-2.6/etc/network.overrides
new file mode 100644
index 0000000000..e857d5b5f1
--- /dev/null
+++ b/openwrt/target/linux/package/base-files/files/aruba-2.6/etc/network.overrides
@@ -0,0 +1,26 @@
+# NVRAM overrides
+#
+# This file handles the NVRAM quirks of various hardware.
+# THIS FILE IS NOT A REPLACEMENT FOR NVRAM
+
+# Load sysconf defaults
+[ -f /etc/sysconf ] && . /etc/sysconf
+
+DEFAULT_lan_proto="static"
+DEFAULT_lan_ifname="br0"
+DEFAULT_lan_ifnames="eth0"
+DEFAULT_lan_ipaddr=${BR2_SYSCONF_FAILSAFE_IP:-"192.168.1.1"}
+DEFAULT_lan_netmask=${BR2_SYSCONF_FAILSAFE_NETMASK:-"255.255.255.0"}
+DEFAULT_lan_hwaddr=${BR2_SYSCONF_FAILSAFE_MAC:-"00:0B:AD:0A:DD:00"}
+
+# failsafe if reset is held
+[ "$FAILSAFE" = "true" ] && {
+  echo "### YOU ARE IN FAILSAFE MODE ####"
+  lan_ifname=${DEFAULT_lan_proto}
+  lan_ifnames=${FAILSAFE_ifnames:-${DEFAULT_lan_ifnames}}
+  lan_ipaddr=$DEFAULT_lan_ipaddr
+  lan_netmask=$DEFAULT_lan_netmask
+  lan_hwaddr=$DEFAULT_lan_hwaddr
+  wan_ifname="none"
+  wifi_ifname="none"
+}
diff --git a/openwrt/target/linux/package/madwifi/patches/100-kernel_cflags.patch b/openwrt/target/linux/package/madwifi/patches/100-kernel_cflags.patch
index cfd4e9ac52..9cfec520b6 100644
--- a/openwrt/target/linux/package/madwifi/patches/100-kernel_cflags.patch
+++ b/openwrt/target/linux/package/madwifi/patches/100-kernel_cflags.patch
@@ -20,3 +20,13 @@ diff -urN madwifi.old/hal/public/mips-le-elf.inc madwifi.dev/hal/public/mips-le-
 -COPTS+=	-G 0 -EL -mno-abicalls -fno-pic -mips2 -Wa,--trap \
 +COPTS+=	-G 0 -mno-abicalls -fno-pic -mips32 -Wa,--trap \
  	-fno-strict-aliasing -fno-common -fomit-frame-pointer -mlong-calls
+diff -urN madwifi.old/hal/public/mips-be-elf.inc madwifi.dev/hal/public/mips-be-elf.inc
+--- madwifi.old/hal/public/mips-be-elf.inc.orig	2005-02-22 06:17:25.000000000 -0800
++++ madwifi.dev/hal/public/mips-be-elf.inc	2005-10-06 15:44:01.000000000 -0700
+@@ -66,5 +66,5 @@
+ 
+ LDOPTS=	-EB
+ COPTS+=	-DAH_BYTE_ORDER=AH_BIG_ENDIAN
+-COPTS+=	-G 0 -EB -mno-abicalls -fno-pic -mips2 -Wa,--trap \
++COPTS+=	-G 0 -mno-abicalls -fno-pic -mips32 -Wa,--trap \
+ 	-fno-strict-aliasing -fno-common -fomit-frame-pointer -mlong-calls