ramips: use generic board detection for D-Link DAP-1522 A1

[openwrt/openwrt.git] / target / linux / ramips / base-files / lib / ramips.sh

diff --git a/target/linux/ramips/base-files/lib/ramips.sh b/target/linux/ramips/base-files/lib/ramips.sh
index a08f2331704c82c76f2dbf95c7d115813a86333a..74ed5913b8c2e00172f01d5da09afd5c400f7d20 100755 (executable)
--- a/target/linux/ramips/base-files/lib/ramips.sh
+++ b/target/linux/ramips/base-files/lib/ramips.sh
@@ -3,9 +3,6 @@
 # Copyright (C) 2010-2013 OpenWrt.org
 #
 
-RAMIPS_BOARD_NAME=
-RAMIPS_MODEL=
-
 ramips_board_detect() {
        local machine
        local name
@@ -88,9 +85,6 @@ ramips_board_detect() {
        *"C108")
                name="c108"
                ;;
-       *"C20")
-               name="c20"
-               ;;
        *"C20i")
                name="c20i"
                ;;
@@ -211,6 +205,9 @@ ramips_board_detect() {
        *"GB-PC1")
                name="gb-pc1"
                ;;
+       *"GB-PC2")
+               name="gb-pc2"
+               ;;
        *"GL-MT300A")
                name="gl-mt300a"
                ;;
@@ -583,9 +580,6 @@ ramips_board_detect() {
        *"WHR-G300N")
                name="whr-g300n"
                ;;
-       *"Widora-NEO")
-               name="widora-neo"
-               ;;
        *"WiTi")
                 name="witi"
                ;;
@@ -733,18 +727,13 @@ ramips_board_detect() {
        *"YK1")
                name="youku-yk1"
                ;;
-       *)
-               name="$(strings /proc/device-tree/compatible | head -1)"
-               name="${name##*,}"
-               name="${name:-generic}"
-               ;;
        esac
 
-       [ -z "$RAMIPS_BOARD_NAME" ] && RAMIPS_BOARD_NAME="$name"
-       [ -z "$RAMIPS_MODEL" ] && RAMIPS_MODEL="$machine"
+       # use generic board detect if no name is set
+       [ -z "$name" ] && return
 
        [ -e "/tmp/sysinfo/" ] || mkdir -p "/tmp/sysinfo/"
 
-       echo "$RAMIPS_BOARD_NAME" > /tmp/sysinfo/board_name
-       echo "$RAMIPS_MODEL" > /tmp/sysinfo/model
+       echo "$name" > /tmp/sysinfo/board_name
+       echo "$machine" > /tmp/sysinfo/model
 }