aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorMathias Kresin <dev@kresin.me>2018-02-23 08:20:47 +0100
committerMathias Kresin <dev@kresin.me>2018-02-23 08:21:50 +0100
commit50641a0f9a6a4b32aaa17d2c735883f3b2f19270 (patch)
treeacd907bed615d41cdfdfca6d1b5008afa74fa1a2 /target/linux
parent2d8eeca842d5c024961b93af221123a0aa8b3e4a (diff)
downloadupstream-50641a0f9a6a4b32aaa17d2c735883f3b2f19270.tar.gz
upstream-50641a0f9a6a4b32aaa17d2c735883f3b2f19270.tar.bz2
upstream-50641a0f9a6a4b32aaa17d2c735883f3b2f19270.zip
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>
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/octeontx/base-files/etc/board.d/02_network3
-rw-r--r--target/linux/octeontx/base-files/lib/octeontx.sh43
2 files changed, 1 insertions, 45 deletions
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"
-}