From 56bc02a305ae8d8a7e927622d924cdab56d4f012 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Mon, 25 Jan 2010 17:11:17 +0000
Subject: add preinit modularization work by Daniel Dickinson (cshore)

SVN-Revision: 19331
---
 target/linux/ar71xx/base-files/etc/preinit.arch    | 56 ----------------------
 .../base-files/lib/preinit/05_enable_leds_ar71xx   | 16 +++++++
 .../base-files/lib/preinit/05_set_iface_mac_ar71xx | 39 +++++++++++++++
 .../lib/preinit/05_set_preinit_iface_ar71xx        | 16 +++++++
 4 files changed, 71 insertions(+), 56 deletions(-)
 delete mode 100644 target/linux/ar71xx/base-files/etc/preinit.arch
 create mode 100644 target/linux/ar71xx/base-files/lib/preinit/05_enable_leds_ar71xx
 create mode 100644 target/linux/ar71xx/base-files/lib/preinit/05_set_iface_mac_ar71xx
 create mode 100644 target/linux/ar71xx/base-files/lib/preinit/05_set_preinit_iface_ar71xx

(limited to 'target/linux/ar71xx/base-files')

diff --git a/target/linux/ar71xx/base-files/etc/preinit.arch b/target/linux/ar71xx/base-files/etc/preinit.arch
deleted file mode 100644
index f770ca3714..0000000000
--- a/target/linux/ar71xx/base-files/etc/preinit.arch
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# Copyright (C) 2009 OpenWrt.org
-#
-
-. /lib/ar71xx.sh
-
-fetch_mac_from_mtd() {
-	local mtd_part=$1
-	local lan_env=$2
-	local wan_env=$3
-	local mtd mac
-
-	mtd=$(grep $mtd_part /proc/mtd | cut -d: -f1)
-	[ -z $mtd ] && return
-
-	mac=$(grep $lan_env /dev/$mtd | cut -d= -f2)
-	[ ! -z $mac ] && ifconfig eth0 hw ether $mac 2>/dev/null
-
-	mac=$(grep $wan_env /dev/$mtd | cut -d= -f2)
-	[ ! -z $mac ] && ifconfig eth1 hw ether $mac 2>/dev/null
-}
-
-preinit_load_modules() {
-	insmod input-core
-	insmod input-polldev
-	insmod gpio_buttons
-	insmod button-hotplug
-}
-
-preinit_set_mac_address() {
-	case $(ar71xx_board_name) in
-		tew-632brp)
-			fetch_mac_from_mtd config lan_mac wan_mac
-			;;
-		dir-615-c1)
-			fetch_mac_from_mtd config lan_mac wan_mac
-			echo 1 > /sys/class/leds/dir-615-c1:green:wancpu/brightness
-			;;
-		wrt160nl)
-			fetch_mac_from_mtd nvram lan_hwaddr wan_hwaddr
-			;;
-	esac
-}
-
-preinit_set_mac_address
-preinit_load_modules
-
-ifname=eth0
-
-failsafe_ip
-
-netmsg 192.168.1.255 "Press any button now, to enter Failsafe!"
-
-ifconfig "$ifname" 0.0.0.0 down
-
-sleep 2
diff --git a/target/linux/ar71xx/base-files/lib/preinit/05_enable_leds_ar71xx b/target/linux/ar71xx/base-files/lib/preinit/05_enable_leds_ar71xx
new file mode 100644
index 0000000000..0b130fbf2c
--- /dev/null
+++ b/target/linux/ar71xx/base-files/lib/preinit/05_enable_leds_ar71xx
@@ -0,0 +1,16 @@
+#
+# Copyright (C) 2009 OpenWrt.org
+#
+
+. /lib/ar71xx.sh
+
+
+preinit_enable_leds() {
+	insmod input-core
+	insmod input-polldev
+	insmod gpio_buttons
+	insmod button-hotplug
+}
+
+boot_hook_add preinit_main preinit_enable_leds
+
diff --git a/target/linux/ar71xx/base-files/lib/preinit/05_set_iface_mac_ar71xx b/target/linux/ar71xx/base-files/lib/preinit/05_set_iface_mac_ar71xx
new file mode 100644
index 0000000000..f8bb7b76c6
--- /dev/null
+++ b/target/linux/ar71xx/base-files/lib/preinit/05_set_iface_mac_ar71xx
@@ -0,0 +1,39 @@
+#
+# Copyright (C) 2009 OpenWrt.org
+#
+
+. /lib/ar71xx.sh
+
+fetch_mac_from_mtd() {
+	local mtd_part=$1
+	local lan_env=$2
+	local wan_env=$3
+	local mtd mac
+
+	mtd=$(grep $mtd_part /proc/mtd | cut -d: -f1)
+	[ -z $mtd ] && return
+
+	mac=$(grep $lan_env /dev/$mtd | cut -d= -f2)
+	[ ! -z $mac ] && ifconfig eth0 hw ether $mac 2>/dev/null
+
+	mac=$(grep $wan_env /dev/$mtd | cut -d= -f2)
+	[ ! -z $mac ] && ifconfig eth1 hw ether $mac 2>/dev/null
+}
+
+preinit_set_mac_address() {
+	case $(ar71xx_board_name) in
+		tew-632brp)
+			fetch_mac_from_mtd config lan_mac wan_mac
+			;;
+		dir-615-c1)
+			fetch_mac_from_mtd config lan_mac wan_mac
+			echo 1 > /sys/class/leds/dir-615-c1:green:wancpu/brightness
+			;;
+		wrt160nl)
+			fetch_mac_from_mtd nvram lan_hwaddr wan_hwaddr
+			;;
+	esac
+}
+
+boot_hook_add preinit_main preinit_set_mac_address
+
diff --git a/target/linux/ar71xx/base-files/lib/preinit/05_set_preinit_iface_ar71xx b/target/linux/ar71xx/base-files/lib/preinit/05_set_preinit_iface_ar71xx
new file mode 100644
index 0000000000..8611dce816
--- /dev/null
+++ b/target/linux/ar71xx/base-files/lib/preinit/05_set_preinit_iface_ar71xx
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+#
+# Copyright (C) 2009 OpenWrt.org
+#
+
+. /lib/ar71xx.sh
+
+set_preinit_iface() {
+	ifname=eth0
+}
+
+boot_hook_add preinit_main set_preinit_iface
+
+
+
-- 
cgit v1.2.3