diff options
| author | Mathias Kresin <dev@kresin.me> | 2017-12-28 10:18:48 +0100 |
|---|---|---|
| committer | Mathias Kresin <dev@kresin.me> | 2018-01-09 22:06:55 +0100 |
| commit | c9e2c35f46346fc460a78b8f13b70d538c47cb27 (patch) | |
| tree | e8def2744bc1f68beeee290eadd6ee55787968e4 /target/linux/kirkwood/base-files/lib | |
| parent | aa6f5f1787a69c8b9af7533010f2d099075d9826 (diff) | |
| download | upstream-c9e2c35f46346fc460a78b8f13b70d538c47cb27.tar.gz upstream-c9e2c35f46346fc460a78b8f13b70d538c47cb27.tar.bz2 upstream-c9e2c35f46346fc460a78b8f13b70d538c47cb27.zip | |
kirkwood: use the generic board detect
Drop the target specific detection function in favour of the generic
one provided by base-files.
Signed-off-by: Mathias Kresin <dev@kresin.me>
Diffstat (limited to 'target/linux/kirkwood/base-files/lib')
| -rw-r--r-- | target/linux/kirkwood/base-files/lib/kirkwood.sh | 72 | ||||
| -rw-r--r-- | target/linux/kirkwood/base-files/lib/preinit/01_sysinfo | 9 | ||||
| -rw-r--r-- | target/linux/kirkwood/base-files/lib/upgrade/platform.sh | 4 |
3 files changed, 2 insertions, 83 deletions
diff --git a/target/linux/kirkwood/base-files/lib/kirkwood.sh b/target/linux/kirkwood/base-files/lib/kirkwood.sh deleted file mode 100644 index 6474b06176..0000000000 --- a/target/linux/kirkwood/base-files/lib/kirkwood.sh +++ /dev/null @@ -1,72 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2014 OpenWrt.org -# - -KIRKWOOD_BOARD_NAME= -KIRKWOOD_MODEL= - -kirkwood_board_detect() { - local machine - local name - - machine=$(cat /proc/device-tree/model) - - case "$machine" in - "Seagate FreeAgent Dockstar") - name="dockstar" - ;; - - "Seagate GoFlex Home") - name="goflexhome" - ;; - - "Seagate GoFlex Net") - name="goflexnet" - ;; - - "Iomega Iconnect") - name="iconnect" - ;; - - "RaidSonic ICY BOX IB-NAS62x0 (Rev B)") - name="ib62x0" - ;; - - "Cisco Systems ON100") - name="on100" - ;; - - "Cloud Engines Pogoplug E02") - name="pogo_e02" - ;; - - "Linksys Audi (EA3500)") - name="linksys-audi" - ;; - - "Linksys Viper (E4200v2 / EA4500)") - name="linksys-viper" - ;; - - "ZyXEL NSA310b") - name="nsa310b" - ;; - - "ZyXEL NSA325") - name="nsa325" - ;; - - *) - name="generic" - ;; - esac - - [ -z "$KIRKWOOD_BOARD_NAME" ] && KIRKWOOD_BOARD_NAME="$name" - [ -z "$KIRKWOOD_MODEL" ] && KIRKWOOD_MODEL="$machine" - - [ -e "/tmp/sysinfo/" ] || mkdir -p "/tmp/sysinfo/" - - echo "$KIRKWOOD_BOARD_NAME" > /tmp/sysinfo/board_name - echo "$KIRKWOOD_MODEL" > /tmp/sysinfo/model -} diff --git a/target/linux/kirkwood/base-files/lib/preinit/01_sysinfo b/target/linux/kirkwood/base-files/lib/preinit/01_sysinfo deleted file mode 100644 index d45fc92ec3..0000000000 --- a/target/linux/kirkwood/base-files/lib/preinit/01_sysinfo +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -do_sysinfo_kirkwood() { - . /lib/kirkwood.sh - - kirkwood_board_detect -} - -boot_hook_add preinit_main do_sysinfo_kirkwood diff --git a/target/linux/kirkwood/base-files/lib/upgrade/platform.sh b/target/linux/kirkwood/base-files/lib/upgrade/platform.sh index dd06aa7f22..27012bd21d 100644 --- a/target/linux/kirkwood/base-files/lib/upgrade/platform.sh +++ b/target/linux/kirkwood/base-files/lib/upgrade/platform.sh @@ -11,8 +11,8 @@ platform_do_upgrade() { local board="$(board_name)" case "$board" in - "linksys-audi"|\ - "linksys-viper") + "linksys,audi"|\ + "linksys,viper") platform_do_upgrade_linksys "$ARGV" ;; *) |