Merge trunk into realtek-unstable

Conflicts:
	Config.in
	feeds.conf.default
	package/base-files/files/etc/hotplug2-common.rules
	package/network/config/netifd/files/etc/init.d/network

2 files changed, 60 insertions, 0 deletions

diff --git a/target/linux/mvebu/base-files/lib/mvebu.sh b/target/linux/mvebu/base-files/lib/mvebu.sh
new file mode 100644
index 000000000..727b6b586
--- /dev/null
+++ b/target/linux/mvebu/base-files/lib/mvebu.sh
@@ -0,0 +1,51 @@
+#!/bin/sh
+#
+# Copyright (C) 2013 OpenWrt.org
+#
+
+MVEBU_BOARD_NAME=
+MVEBU_MODEL=
+
+mvebu_board_detect() {
+	local machine
+	local name
+
+	machine=$(cat /proc/device-tree/model)
+
+	case "$machine" in
+	*"Marvell Armada 370 Evaluation Board")
+		name="armada-370-db"
+		;;
+	*"Globalscale Mirabox")
+		name="mirabox"
+		;;
+	*"Marvell Armada 370 Reference Design")
+		name="armada-370-rd"
+		;;
+	*"Marvell Armada XP Evaluation Board")
+		name="armada-xp-db"
+		;;
+	*"PlatHome OpenBlocks AX3-4 board")
+		name="openblocks-ax3-4"
+		;;
+	esac
+
+	[ -z "$name" ] && name="unknown"
+
+	[ -z "$MVEBU_BOARD_NAME" ] && MVEBU_BOARD_NAME="$name"
+	[ -z "$MVEBU_MODEL" ] && MVEBU_MODEL="$machine"
+
+	[ -e "/tmp/sysinfo/" ] || mkdir -p "/tmp/sysinfo/"
+
+	echo "$MVEBU_BOARD_NAME" > /tmp/sysinfo/board_name
+	echo "$MVEBU_MODEL" > /tmp/sysinfo/model
+}
+
+mvebu_board_name() {
+	local name
+
+	[ -f /tmp/sysinfo/board_name ] && name=$(cat /tmp/sysinfo/board_name)
+	[ -z "$name" ] && name="unknown"
+
+	echo "$name"
+}
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
new file mode 100755
index 000000000..054c9d33a
--- /dev/null
+++ b/target/linux/mvebu/base-files/lib/preinit/03_preinit_do_mvebu.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+do_mvebu() {
+	. /lib/mvebu.sh
+
+	mvebu_board_detect
+}
+
+boot_hook_add preinit_main do_mvebu