From 9685f3978795727ac99d5d20a4af16c808b1e24b Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sat, 26 May 2018 17:26:14 -0700 Subject: [PATCH] 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 --- target/linux/ramips/base-files/etc/board.d/01_leds | 2 +- target/linux/ramips/base-files/etc/board.d/02_network | 2 +- target/linux/ramips/base-files/etc/diag.sh | 2 +- target/linux/ramips/base-files/lib/ramips.sh | 3 --- target/linux/ramips/base-files/lib/upgrade/platform.sh | 2 +- target/linux/ramips/image/mt7621.mk | 4 ++-- 6 files changed, 6 insertions(+), 9 deletions(-) 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 88e4c2b7fe..ae5ac77b5e 100755 --- 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 3fc5e55df1..3a744bda0c 100755 --- 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 6a51778726..b4118358b4 100644 --- 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 edccfcd4a8..5741cbd2ee 100755 --- 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 7aa14770ca..95cb7c33a9 100755 --- 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 b84b74a5b0..b20f35976b 100644 --- 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 -- 2.25.1