From f12a32630ff52b5e13397f64e9fb31708e97fb60 Mon Sep 17 00:00:00 2001
From: Mathias Kresin <dev@kresin.me>
Date: Fri, 12 May 2017 22:36:07 +0200
Subject: treewide: use the generic board_name function

Use the generic function instead ot the target specific ones.

Signed-off-by: Mathias Kresin <dev@kresin.me>
---
 target/linux/oxnas/base-files/etc/board.d/01_leds     | 3 +--
 target/linux/oxnas/base-files/etc/board.d/02_network  | 2 +-
 target/linux/oxnas/base-files/etc/diag.sh             | 4 ++--
 target/linux/oxnas/base-files/lib/upgrade/platform.sh | 5 +----
 4 files changed, 5 insertions(+), 9 deletions(-)

(limited to 'target/linux/oxnas')

diff --git a/target/linux/oxnas/base-files/etc/board.d/01_leds b/target/linux/oxnas/base-files/etc/board.d/01_leds
index b4b598cc40..5d665093f6 100755
--- a/target/linux/oxnas/base-files/etc/board.d/01_leds
+++ b/target/linux/oxnas/base-files/etc/board.d/01_leds
@@ -1,9 +1,8 @@
 #!/bin/sh
 
 . /lib/functions/uci-defaults.sh
-. /lib/oxnas.sh
 
-board=$(oxnas_board_name)
+board=$(board_name)
 board_config_update
 
 case $board in
diff --git a/target/linux/oxnas/base-files/etc/board.d/02_network b/target/linux/oxnas/base-files/etc/board.d/02_network
index ac7fa0a1f9..7ecaed51bf 100755
--- a/target/linux/oxnas/base-files/etc/board.d/02_network
+++ b/target/linux/oxnas/base-files/etc/board.d/02_network
@@ -8,7 +8,7 @@ board_config_update
 
 lan_mac=""
 
-case "$(oxnas_board_name)" in
+case "$(board_name)" in
 	kd20)
 		lan_mac="$(legacy_boot_mac_adr)"
 		;;
diff --git a/target/linux/oxnas/base-files/etc/diag.sh b/target/linux/oxnas/base-files/etc/diag.sh
index 51771f3ea6..fd3bc3b336 100644
--- a/target/linux/oxnas/base-files/etc/diag.sh
+++ b/target/linux/oxnas/base-files/etc/diag.sh
@@ -1,11 +1,11 @@
 #!/bin/sh
 # Copyright (C) 2009-2013 OpenWrt.org
 
+. /lib/functions.sh
 . /lib/functions/leds.sh
-. /lib/oxnas.sh
 
 get_status_led() {
-	case $(oxnas_board_name) in
+	case $(board_name) in
 	akitio)
 		status_led="akitio:red:status"
 		;;
diff --git a/target/linux/oxnas/base-files/lib/upgrade/platform.sh b/target/linux/oxnas/base-files/lib/upgrade/platform.sh
index 48c1dc3f84..6652e14f19 100644
--- a/target/linux/oxnas/base-files/lib/upgrade/platform.sh
+++ b/target/linux/oxnas/base-files/lib/upgrade/platform.sh
@@ -2,13 +2,10 @@
 # Copyright (C) 2014 OpenWrt.org
 #
 
-. /lib/oxnas.sh
-
-RAMFS_COPY_DATA=/lib/oxnas.sh
 REQUIRE_IMAGE_METADATA=1
 
 platform_check_image() {
-	local board=$(oxnas_board_name)
+	local board=$(board_name)
 
 	[ "$ARGC" -gt 1 ] && return 1
 
-- 
cgit v1.2.3