[openwrt/openwrt] octeontx: use the generic board detection
LEDE Commits
lede-commits at lists.infradead.org
Thu Feb 22 23:24:26 PST 2018
mkresin pushed a commit to openwrt/openwrt.git, branch master:
https://git.lede-project.org/50641a0f9a6a4b32aaa17d2c735883f3b2f19270
commit 50641a0f9a6a4b32aaa17d2c735883f3b2f19270
Author: Mathias Kresin <dev at kresin.me>
AuthorDate: Fri Feb 23 08:20:47 2018 +0100
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 at kresin.me>
---
.../octeontx/base-files/etc/board.d/02_network | 3 +-
target/linux/octeontx/base-files/lib/octeontx.sh | 43 ----------------------
2 files changed, 1 insertion(+), 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 3ad5e85..743e0f2 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 b6335f8..0000000
--- 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"
-}
More information about the lede-commits
mailing list