From 3b7e21a679be8bf8dca7c6a2f215631f0f6eabdd Mon Sep 17 00:00:00 2001
From: Daniel Dickinson <crazycshore@gmail.com>
Date: Mon, 10 May 2010 17:10:47 +0000
Subject: [PATCH] brcm-2.4: Fixed preinit and failsafe switch configuration

SVN-Revision: 21417
---
 .gitignore                                           |  3 ---
 .../lib/preinit/05_failsafe_config_switch_brcm       | 10 ++++++++++
 .../lib/preinit/15_set_preinit_interface_brcm        |  5 +++--
 .../base-files/lib/preinit/20_failsafe_net_echo      | 12 ++++++++++++
 4 files changed, 25 insertions(+), 5 deletions(-)
 create mode 100644 target/linux/brcm-2.4/base-files/lib/preinit/05_failsafe_config_switch_brcm
 create mode 100644 target/linux/brcm-2.4/base-files/lib/preinit/20_failsafe_net_echo

diff --git a/.gitignore b/.gitignore
index e3479758d0e..6142076be2e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,6 @@
 .*.swp
 /env
 /dl
-/.config
 /.config.old
 /bin
 /build_dir
@@ -9,7 +8,5 @@
 /tmp
 /logs
 /feeds
-/feeds.conf
-/files
 /package/feeds
 /package/openwrt-packages
diff --git a/target/linux/brcm-2.4/base-files/lib/preinit/05_failsafe_config_switch_brcm b/target/linux/brcm-2.4/base-files/lib/preinit/05_failsafe_config_switch_brcm
new file mode 100644
index 00000000000..0bfce5f1eff
--- /dev/null
+++ b/target/linux/brcm-2.4/base-files/lib/preinit/05_failsafe_config_switch_brcm
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+failsafe_config_switch() {
+	[ -d /proc/switch/eth0 ] && [ "$ifname" = "eth0" ] && {
+		echo "0 1 2 3 4 ${cpu_port:-5u*}" > /proc/switch/eth0/vlan/0/ports
+	}
+}
+
+boot_hook_add failsafe failsafe_config_switch
+
diff --git a/target/linux/brcm-2.4/base-files/lib/preinit/15_set_preinit_interface_brcm b/target/linux/brcm-2.4/base-files/lib/preinit/15_set_preinit_interface_brcm
index 1bef26bf00a..fdc7c71ca7e 100644
--- a/target/linux/brcm-2.4/base-files/lib/preinit/15_set_preinit_interface_brcm
+++ b/target/linux/brcm-2.4/base-files/lib/preinit/15_set_preinit_interface_brcm
@@ -30,9 +30,10 @@ preinit_net_echo() {
 			echo "$port ${cpu_port:-5u*}" > /proc/switch/eth0/vlan/0/ports
 			port_net_echo $1
 		}; done
+		
+		echo "0 ${cpu_port:-5u*}" > /proc/switch/eth0/vlan/0/ports
+		
 	} || port_net_echo $1
-
-	preinit_ip_deconfig
 }
 
 
diff --git a/target/linux/brcm-2.4/base-files/lib/preinit/20_failsafe_net_echo b/target/linux/brcm-2.4/base-files/lib/preinit/20_failsafe_net_echo
new file mode 100644
index 00000000000..f030cb28371
--- /dev/null
+++ b/target/linux/brcm-2.4/base-files/lib/preinit/20_failsafe_net_echo
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+indicate_failsafe() {
+	preinit_net_echo() {
+		port_net_echo $1
+	}
+	echo "- failsafe -"
+	preinit_net_echo "Entering Failsafe!\n"
+	indicate_failsafe_led
+}
+
+