From: Luka Perkov <luka@openwrt.org>
Date: Thu, 26 Jun 2014 10:21:32 +0000 (+0000)
Subject: mvebu: drop preinit script
X-Git-Tag: reboot~6799
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=cb3d5242cafaebf70142230b727bae2a99557549;hp=e575c759ca607b8bff9a302fbc31def6317340bf;p=openwrt%2Fopenwrt.git

mvebu: drop preinit script

The /lib/mvebu.sh script can now handle this task.

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

SVN-Revision: 41341
---

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