aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorLuka Perkov <luka@openwrt.org>2014-06-26 10:21:32 +0000
committerLuka Perkov <luka@openwrt.org>2014-06-26 10:21:32 +0000
commitd47a2a692b7f4b8f8a06edf9dff1ab6d3ccdcbe2 (patch)
tree32f9a5fd2787216ab99aa903cfe77fa1f7b74f8f /target
parent65fcfca2ebc4050a4ea67ad13d6c2dd70ce8dd70 (diff)
downloadupstream-d47a2a692b7f4b8f8a06edf9dff1ab6d3ccdcbe2.tar.gz
upstream-d47a2a692b7f4b8f8a06edf9dff1ab6d3ccdcbe2.tar.bz2
upstream-d47a2a692b7f4b8f8a06edf9dff1ab6d3ccdcbe2.zip
mvebu: drop preinit script
The /lib/mvebu.sh script can now handle this task. Signed-off-by: Luka Perkov <luka@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41341 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
-rwxr-xr-xtarget/linux/mvebu/base-files/lib/mvebu.sh1
-rwxr-xr-xtarget/linux/mvebu/base-files/lib/preinit/03_preinit_do_mvebu.sh9
2 files changed, 1 insertions, 9 deletions
diff --git a/target/linux/mvebu/base-files/lib/mvebu.sh b/target/linux/mvebu/base-files/lib/mvebu.sh
index 9d06626793..e8985b4664 100755
--- a/target/linux/mvebu/base-files/lib/mvebu.sh
+++ b/target/linux/mvebu/base-files/lib/mvebu.sh
@@ -50,6 +50,7 @@ mvebu_board_detect() {
mvebu_board_name() {
local name
+ [ -f /tmp/sysinfo/board_name ] || mvebu_board_detect
[ -f /tmp/sysinfo/board_name ] && name=$(cat /tmp/sysinfo/board_name)
[ -z "$name" ] && name="unknown"
diff --git a/target/linux/mvebu/base-files/lib/preinit/03_preinit_do_mvebu.sh b/target/linux/mvebu/base-files/lib/preinit/03_preinit_do_mvebu.sh
deleted file mode 100755
index 054c9d33a3..0000000000
--- a/target/linux/mvebu/base-files/lib/preinit/03_preinit_do_mvebu.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-do_mvebu() {
- . /lib/mvebu.sh
-
- mvebu_board_detect
-}
-
-boot_hook_add preinit_main do_mvebu