mvebu: drop preinit script
authorLuka Perkov <luka@openwrt.org>
Thu, 26 Jun 2014 10:21:32 +0000 (10:21 +0000)
committerLuka Perkov <luka@openwrt.org>
Thu, 26 Jun 2014 10:21:32 +0000 (10:21 +0000)
The /lib/mvebu.sh script can now handle this task.

Signed-off-by: Luka Perkov <luka@openwrt.org>
SVN-Revision: 41341

target/linux/mvebu/base-files/lib/mvebu.sh
target/linux/mvebu/base-files/lib/preinit/03_preinit_do_mvebu.sh [deleted file]

index 9d06626793ce281c8dc8fb667b2d1b3ee717e8fd..e8985b466431a8e7e1740802a32cbfc0687b77f2 100755 (executable)
@@ -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 (executable)
index 054c9d3..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-do_mvebu() {
-       . /lib/mvebu.sh
-
-       mvebu_board_detect
-}
-
-boot_hook_add preinit_main do_mvebu