From: Michael Heimpold <mhei@heimpold.de>
Date: Sat, 3 Nov 2018 00:24:01 +0000 (+0100)
Subject: mxs: use generic sysinfo board detection
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=e880a30549b5d1dfb11dc4c6cb2aac742de93366;p=openwrt%2Fstaging%2Fneocturne.git

mxs: use generic sysinfo board detection

Since we do nothing special for mxs based boards,
we can simply use the generic existing code.
We just need to convert scripts to use the DT
compatible strings.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
---

diff --git a/target/linux/mxs/base-files/etc/diag.sh b/target/linux/mxs/base-files/etc/diag.sh
index 3b05f6da5f..6c9dd250ab 100644
--- a/target/linux/mxs/base-files/etc/diag.sh
+++ b/target/linux/mxs/base-files/etc/diag.sh
@@ -6,10 +6,10 @@
 
 get_status_led() {
 	case $(board_name) in
-	duckbill)
+	i2se,duckbill*)
 		status_led="duckbill:green:status"
 		;;
-	olinuxino)
+	olimex,imx23-olinuxino)
 		status_led="green"
 		;;
 	*)
diff --git a/target/linux/mxs/base-files/lib/mxs.sh b/target/linux/mxs/base-files/lib/mxs.sh
deleted file mode 100644
index f6c3b22916..0000000000
--- a/target/linux/mxs/base-files/lib/mxs.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) 2013 OpenWrt.org
-#
-
-MXS_BOARD_NAME=
-MXS_MODEL=
-
-mxs_board_detect() {
-	local machine
-	local name
-
-	machine=$(cat /proc/device-tree/model)
-
-	case "$machine" in
-	*"I2SE Duckbill"*)
-		name="duckbill"
-		;;
-	*"i.MX23 Olinuxino Low Cost Board")
-		name="olinuxino"
-		;;
-	esac
-
-	[ -z "$name" ] && name="unknown"
-
-	[ -z "$MXS_BOARD_NAME" ] && MXS_BOARD_NAME="$name"
-	[ -z "$MXS_MODEL" ] && MXS_MODEL="$machine"
-
-	[ -e "/tmp/sysinfo/" ] || mkdir -p "/tmp/sysinfo/"
-
-	echo "$MXS_BOARD_NAME" > /tmp/sysinfo/board_name
-	echo "$MXS_MODEL" > /tmp/sysinfo/model
-}
diff --git a/target/linux/mxs/base-files/lib/preinit/01_preinit_do_mxs.sh b/target/linux/mxs/base-files/lib/preinit/01_preinit_do_mxs.sh
deleted file mode 100644
index 692078d3e2..0000000000
--- a/target/linux/mxs/base-files/lib/preinit/01_preinit_do_mxs.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-do_mxs() {
-	. /lib/mxs.sh
-
-	mxs_board_detect
-}
-
-boot_hook_add preinit_main do_mxs