ramips: Use generic board detect for GnuBee devices

This is a port of an old commit from mkresin's tree:

09260cdf3e9332978c2a474a58e93a6f2b55f4a8

This has the potential to break sysupgrade but it should be fine as
there is no stable release of LEDE or OpenWrt that support these devices.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry picked from commit 9685f3978795727ac99d5d20a4af16c808b1e24b)

diff --git a/target/linux/ramips/base-files/etc/board.d/01_leds b/target/linux/ramips/base-files/etc/board.d/01_leds
index 88e4c2b7feadd87440df7a3b2a774ac2d7f3c1c8..ae5ac77b5e5f68ca3100f6201c70383a7f682910 100755 (executable)
--- a/target/linux/ramips/base-files/etc/board.d/01_leds
+++ b/target/linux/ramips/base-files/etc/board.d/01_leds
@@ -196,7 +196,7 @@ fonera20n)
        set_usb_led "$boardname:orange:usb"
        set_wifi_led "$boardname:orange:wifi"
        ;;
-gb-pc1|\
+gnubee,gb-pc1|\
 gnubee,gb-pc2)
        ucidef_set_led_switch "lan1" "lan1" "$boardname:green:lan1" "switch0" "0x01"
        ucidef_set_led_switch "lan2" "lan2" "$boardname:green:lan2" "switch0" "0x10"

diff --git a/target/linux/ramips/base-files/etc/board.d/02_network b/target/linux/ramips/base-files/etc/board.d/02_network
index 3fc5e55df1cbbba17960a693439046d87db239a4..3a744bda0c36a49d343789fd58f0d7cc0f04c12d 100755 (executable)
--- a/target/linux/ramips/base-files/etc/board.d/02_network
+++ b/target/linux/ramips/base-files/etc/board.d/02_network
@@ -228,7 +228,7 @@ ramips_setup_interfaces()
                ucidef_add_switch "switch0" \
                        "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "0:wan" "6@eth0"
                ;;
-       gb-pc1|\
+       gnubee,gb-pc1|\
        gnubee,gb-pc2)
                ucidef_add_switch "switch0" \
                        "0:lan" "4:lan" "6@eth0"

diff --git a/target/linux/ramips/base-files/etc/diag.sh b/target/linux/ramips/base-files/etc/diag.sh
index 6a51778726a6903d2861ec00e25383702f759210..b4118358b4c18c956d36ac88ca96a54073a51eaf 100644 (file)
--- a/target/linux/ramips/base-files/etc/diag.sh
+++ b/target/linux/ramips/base-files/etc/diag.sh
@@ -95,7 +95,7 @@ get_status_led() {
        dir-620-d1|\
        dwr-512-b|\
        dlink,dwr-116-a1|\
-       gb-pc1|\
+       gnubee,gb-pc1|\
        gnubee,gb-pc2|\
        hpm|\
        hw550-3g|\

diff --git a/target/linux/ramips/base-files/lib/ramips.sh b/target/linux/ramips/base-files/lib/ramips.sh
index edccfcd4a894c1d0aed209139e15f3ee3f749a69..5741cbd2ee13f309dc5cc93f1d48f5a97e0da970 100755 (executable)
--- a/target/linux/ramips/base-files/lib/ramips.sh
+++ b/target/linux/ramips/base-files/lib/ramips.sh
@@ -205,9 +205,6 @@ ramips_board_detect() {
        *"FreeStation5")
                name="freestation5"
                ;;
-       *"GB-PC1")
-               name="gb-pc1"
-               ;;
        *"GL-MT300A")
                name="gl-mt300a"
                ;;

diff --git a/target/linux/ramips/base-files/lib/upgrade/platform.sh b/target/linux/ramips/base-files/lib/upgrade/platform.sh
index 7aa14770caa65db6e1ed567855deb09a664ba827..95cb7c33a9abeef528d35bce3ef9d68f64a22fe1 100755 (executable)
--- a/target/linux/ramips/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ramips/base-files/lib/upgrade/platform.sh
@@ -62,7 +62,7 @@ platform_check_image() {
        firewrt|\
        fonera20n|\
        freestation5|\
-       gb-pc1|\
+       gnubee,gb-pc1|\
        gnubee,gb-pc2|\
        gl-mt300a|\
        gl-mt300n|\

diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk
index b84b74a5b0fa12a4df8804b0756ea69661dc91f0..b20f35976bf8ecb4978d9389e977db1fc25a1b86 100644 (file)
--- a/target/linux/ramips/image/mt7621.mk
+++ b/target/linux/ramips/image/mt7621.mk
@@ -83,13 +83,13 @@ define Device/firewrt
 endef
 TARGET_DEVICES += firewrt
 
-define Device/gb-pc1
+define Device/gnubee_gb-pc1
   DTS := GB-PC1
   DEVICE_TITLE := GnuBee Personal Cloud One
   DEVICE_PACKAGES := kmod-ata-core kmod-ata-ahci kmod-usb3 kmod-sdhci-mt7620
   IMAGE_SIZE := $(ralink_default_fw_size_32M)
 endef
-TARGET_DEVICES += gb-pc1
+TARGET_DEVICES += gnubee_gb-pc1
 
 define Device/gnubee_gb-pc2
   DTS := GB-PC2