From: Mathias Kresin <dev@kresin.me>
Date: Fri, 23 Feb 2018 07:20:47 +0000 (+0100)
Subject: octeontx: use the generic board detection
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=50641a0f9a6a4b32aaa17d2c735883f3b2f19270;p=openwrt%2Fstaging%2Fnbd.git

octeontx: use the generic board detection

Use the generic board detection based on the device tree compatible
string instead of a target specific one.

Signed-off-by: Mathias Kresin <dev@kresin.me>
---

diff --git a/target/linux/octeontx/base-files/etc/board.d/02_network b/target/linux/octeontx/base-files/etc/board.d/02_network
index 3ad5e852cb..743e0f2ed7 100644
--- a/target/linux/octeontx/base-files/etc/board.d/02_network
+++ b/target/linux/octeontx/base-files/etc/board.d/02_network
@@ -4,9 +4,8 @@
 #
 
 . ./lib/functions/uci-defaults.sh
-. ./lib/octeontx.sh
 
-board=$(octeontx_board_name)
+board=$(board_name)
 
 board_config_update
 
diff --git a/target/linux/octeontx/base-files/lib/octeontx.sh b/target/linux/octeontx/base-files/lib/octeontx.sh
deleted file mode 100644
index b6335f8a00..0000000000
--- a/target/linux/octeontx/base-files/lib/octeontx.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) 2018 OpenWrt.org
-#
-
-octeontx_board_detect() {
-	local machine
-	local name
-
-	machine=$(cat /proc/device-tree/model)
-	board=$(cat /proc/device-tree/board)
-
-	case "$machine" in
-	"Cavium ThunderX CN81XX board")
-		name="cn81xx"
-		;;
-
-	*)
-		name="generic"
-		;;
-	esac
-
-	case "$board" in
-	GW630*)
-		name="gw630x"
-		;;
-	esac
-
-	[ -e "/tmp/sysinfo" ] || mkdir -p "/tmp/sysinfo"
-
-	echo "$name" > /tmp/sysinfo/board_name
-	echo "$machine" > /tmp/sysinfo/model
-}
-
-octeontx_board_name() {
-	local name
-
-	[ -f /tmp/sysinfo/board_name ] || octeontx_board_detect
-	[ -f /tmp/sysinfo/board_name ] && name=$(cat /tmp/sysinfo/board_name)
-	[ -z "$name" ] && name="unknown"
-
-	echo "$name"
-}