ramips: use D-Link DIR-600 B1 image for B2 version

Everything set for the B1 is identical to the values uses for the B2
version.

Signed-off-by: Mathias Kresin <dev@kresin.me>

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 b7f3b36d8a45b0c775bfe766b8cfc7197db6685f..e6664bdd988ea66aee11a9b403e8d5b023a2d791 100755 (executable)
--- a/target/linux/ramips/base-files/etc/board.d/01_leds
+++ b/target/linux/ramips/base-files/etc/board.d/01_leds
@@ -122,7 +122,6 @@ dcs-930l-b1)
        ;;
 dir-300-b1|\
 dir-600-b1|\
-dir-600-b2|\
 dir-620-a1)
        ucidef_set_led_default "wan" "WAN LED (amber)" "$board:amber:wan" "1"
        set_wifi_led "rt2800pci-phy0::radio"

diff --git a/target/linux/ramips/base-files/etc/diag.sh b/target/linux/ramips/base-files/etc/diag.sh
index c4b753808f9a11ea55d0f6b8a446f9e38d23c73f..6b64d3b3855a48e26f4edc7ca09b9effd8053588 100644 (file)
--- a/target/linux/ramips/base-files/etc/diag.sh
+++ b/target/linux/ramips/base-files/etc/diag.sh
@@ -63,7 +63,6 @@ get_status_led() {
        dir-300-b7|\
        dir-320-b1|\
        dir-600-b1|\
-       dir-600-b2|\
        dir-610-a1|\
        dir-615-d|\
        dir-615-h1|\

diff --git a/target/linux/ramips/base-files/lib/ramips.sh b/target/linux/ramips/base-files/lib/ramips.sh
index 695f20697dcd1679c30e65f6696b0221b592571c..bfb186ddf8ce85f01dfdbf92d7b6615043199475 100755 (executable)
--- a/target/linux/ramips/base-files/lib/ramips.sh
+++ b/target/linux/ramips/base-files/lib/ramips.sh
@@ -133,9 +133,6 @@ ramips_board_detect() {
        *"DIR-600 B1")
                name="dir-600-b1"
                ;;
-       *"DIR-600 B2")
-               name="dir-600-b2"
-               ;;
        *"DIR-610 A1")
                name="dir-610-a1"
                ;;

diff --git a/target/linux/ramips/base-files/lib/upgrade/platform.sh b/target/linux/ramips/base-files/lib/upgrade/platform.sh
index 78e87a09f2ea51821f435c41a2c73c91e551324f..c097cfa218052b1898f99fba4f659423d1808b3b 100755 (executable)
--- a/target/linux/ramips/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ramips/base-files/lib/upgrade/platform.sh
@@ -43,7 +43,6 @@ platform_check_image() {
        dir-300-b7|\
        dir-320-b1|\
        dir-600-b1|\
-       dir-600-b2|\
        dir-615-d|\
        dir-615-h1|\
        dir-620-a1|\

diff --git a/target/linux/ramips/dts/DIR-600-B2.dts b/target/linux/ramips/dts/DIR-600-B2.dts
deleted file mode 100644 (file)
index f1f10ad..0000000
--- a/target/linux/ramips/dts/DIR-600-B2.dts
+++ /dev/null
@@ -1,107 +0,0 @@
-/dts-v1/;
-
-#include "rt3050.dtsi"
-
-#include <dt-bindings/input/input.h>
-
-/ {
-       compatible = "DIR-600-B2", "ralink,rt3050-soc";
-       model = "D-Link DIR-600 B2";
-
-       cfi@1f000000 {
-               compatible = "cfi-flash";
-               reg = <0x1f000000 0x800000>;
-               bank-width = <2>;
-               device-width = <2>;
-               #address-cells = <1>;
-               #size-cells = <1>;
-
-               partition@0 {
-                       label = "u-boot";
-                       reg = <0x0 0x30000>;
-                       read-only;
-               };
-
-               devdata: partition@30000 {
-                       label = "devdata";
-                       reg = <0x30000 0x10000>;
-                       read-only;
-               };
-
-               partition@40000 {
-                       label = "devconf";
-                       reg = <0x40000 0x10000>;
-                       read-only;
-               };
-
-               partition@50000 {
-                       label = "firmware";
-                       reg = <0x50000 0x3b0000>;
-               };
-       };
-
-       gpio-keys-polled {
-               compatible = "gpio-keys-polled";
-               #address-cells = <1>;
-               #size-cells = <0>;
-               poll-interval = <20>;
-
-               reset {
-                       label = "reset";
-                       gpios = <&gpio0 10 1>;
-                       linux,code = <KEY_RESTART>;
-               };
-
-               wps {
-                       label = "wps";
-                       gpios = <&gpio0 0 1>;
-                       linux,code = <KEY_WPS_BUTTON>;
-               };
-       };
-
-       gpio-leds {
-               compatible = "gpio-leds";
-
-               status {
-                       label = "dir-600-b2:amber:status";
-                       gpios = <&gpio0 8 1>;
-               };
-
-               status2 {
-                       label = "dir-600-b2:green:status";
-                       gpios = <&gpio0 9 1>;
-               };
-
-               wan {
-                       label = "dir-600-b2:amber:wan";
-                       gpios = <&gpio0 14 1>;
-               };
-
-               wan2 {
-                       label = "dir-600-b2:green:wan";
-                       gpios = <&gpio0 12 1>;
-               };
-
-               wps {
-                       label = "dir-600-b2:blue:wps";
-                       gpios = <&gpio0 13 1>;
-               };
-       };
-};
-
-&pinctrl {
-       state_default: pinctrl0 {
-               gpio {
-                       ralink,group = "i2c", "spi", "jtag", "mdio", "rgmii", "uartf";
-                       ralink,function = "gpio";
-               };
-       };
-};
-
-&esw {
-       mediatek,portmap = <0x2f>;
-};
-
-&wmac {
-       ralink,mtd-eeprom = <&devdata 0x4000>;
-};

diff --git a/target/linux/ramips/image/rt305x-legacy.mk b/target/linux/ramips/image/rt305x-legacy.mk
index 48ed73b05d231f1f9d15ac1cb0b9ae1c09329e21..e3b26ed7afd11412208c4b4c4c081b276756bf65 100644 (file)
--- a/target/linux/ramips/image/rt305x-legacy.mk
+++ b/target/linux/ramips/image/rt305x-legacy.mk
@@ -157,7 +157,6 @@ Image/Build/Profile/JHR-N825R=$(call BuildFirmware/JCG/$(1),$(1),jhr-n825r,JHR-N
 Image/Build/Profile/JHR-N926R=$(call BuildFirmware/JCG/$(1),$(1),jhr-n926r,JHR-N926R,25.24)
 Image/Build/Profile/DIR-300-B1=$(call BuildFirmware/DIR300B1/$(1),$(1),dir-300-b1,DIR-300-B1,wrgn23_dlwbr_dir300b)
 Image/Build/Profile/DIR-600-B1=$(call BuildFirmware/DIR300B1/$(1),$(1),dir-600-b1,DIR-600-B1,wrgn23_dlwbr_dir600b)
-Image/Build/Profile/DIR-600-B2=$(call BuildFirmware/DIR300B1/$(1),$(1),dir-600-b2,DIR-600-B2,wrgn23_dlwbr_dir600b)
 Image/Build/Profile/DIR-615-D=$(call BuildFirmware/DIR300B1/$(1),$(1),dir-615-d,DIR-615-D,wrgn23_dlwbr_dir615d)
 Image/Build/Profile/DAP1350=$(call BuildFirmware/dap1350/$(1),$(1),dap-1350,DAP-1350,RT3052-AP-DAP1350-3)
 Image/Build/Profile/DAP1350WW=$(call BuildFirmware/dap1350/$(1),$(1),dap-1350WW,DAP-1350,RT3052-AP-DAP1350WW-3)
@@ -289,17 +288,11 @@ LEGACY_DEVICES += DIR-300-B1
 
 
 define LegacyDevice/DIR-600-B1
-  DEVICE_TITLE := D-Link DIR-600 B1
+  DEVICE_TITLE := D-Link DIR-600 B1/B2
 endef
 LEGACY_DEVICES += DIR-600-B1
 
 
-define LegacyDevice/DIR-600-B2
-  DEVICE_TITLE := D-Link DIR-600 B2
-endef
-LEGACY_DEVICES += DIR-600-B2
-
-
 define LegacyDevice/DIR-615-D
   DEVICE_TITLE := D-Link DIR-615 D
 endef