From 5d8e0585ac778f4dde3ead2cee576695c351c628 Mon Sep 17 00:00:00 2001
From: blogic <blogic@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sat, 15 Dec 2012 02:01:00 +0000
Subject: [lantiq] cleanup basefiles

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34698 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 target/linux/lantiq/base-files/lib/functions/lantiq.sh |  9 +++++++++
 target/linux/lantiq/base-files/lib/lantiq.sh           | 17 -----------------
 target/linux/lantiq/base-files/lib/preinit/42_athfix   |  2 +-
 3 files changed, 10 insertions(+), 18 deletions(-)
 create mode 100644 target/linux/lantiq/base-files/lib/functions/lantiq.sh
 delete mode 100644 target/linux/lantiq/base-files/lib/lantiq.sh

(limited to 'target/linux/lantiq/base-files/lib')

diff --git a/target/linux/lantiq/base-files/lib/functions/lantiq.sh b/target/linux/lantiq/base-files/lib/functions/lantiq.sh
new file mode 100644
index 0000000000..ca52d08a60
--- /dev/null
+++ b/target/linux/lantiq/base-files/lib/functions/lantiq.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+lantiq_board_id() {
+	grep "^system type" /proc/cpuinfo | sed "s/system type.*: \(.*\)/\1/g" | sed "s/.* - \(.*\) - .*/\1/g"
+}
+
+lantiq_board_name() {
+	grep "^system type" /proc/cpuinfo | sed "s/system type.*: \(.*\)/\1/g" | sed "s/.* - \(.*\)/\1/g"
+}
diff --git a/target/linux/lantiq/base-files/lib/lantiq.sh b/target/linux/lantiq/base-files/lib/lantiq.sh
deleted file mode 100644
index e4f1471a9e..0000000000
--- a/target/linux/lantiq/base-files/lib/lantiq.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-lantiq_soc_has_adsl() {
-	ls /lib/modules/*/drv_dsl_cpe_api.ko
-}
-
-lantiq_soc_name() {
-	grep ^system /proc/cpuinfo | sed "s/system type.*: \(.*\)/\1/g"
-}
-
-lantiq_board_name() {
-	grep ^machine /proc/cpuinfo | sed "s/machine.*: \(.*\)/\1/g" | sed "s/\(.*\) - .*/\1/g"
-}
-
-lantiq_dsl_fwannex() {
-	ls /lib/firmware/dsl-fw-*.bin 2> /dev/null | sed "s/.*\([ab]\)\.bin/\1/g"
-}
diff --git a/target/linux/lantiq/base-files/lib/preinit/42_athfix b/target/linux/lantiq/base-files/lib/preinit/42_athfix
index 114aaffc8b..d182fbf340 100644
--- a/target/linux/lantiq/base-files/lib/preinit/42_athfix
+++ b/target/linux/lantiq/base-files/lib/preinit/42_athfix
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. /lib/lantiq.sh
+. /lib/functions/lantiq.sh
 
 init_atheeprom() {
 	local board=$(lantiq_board_name)
-- 
cgit v1.2.3