faf94d926e2810f895f2a98d4a49ee2fe8f673e8 added "support" for a hacked device where the original boot loader (routerboot) has been replaced by u-boot.
Support for this device with stock bootloader is possible (as evidenced by support for the RBM33G), and conflicts with this code. Remove code before release. Signed-off-by: Thibaut VARÈNE <ha...@slashdirt.org> --- .../linux/ramips/base-files/etc/board.d/02_network | 1 - target/linux/ramips/base-files/lib/ramips.sh | 3 - .../ramips/base-files/lib/upgrade/platform.sh | 1 - target/linux/ramips/dts/RB750Gr3.dts | 125 --------------------- target/linux/ramips/image/mt7621.mk | 8 -- 5 files changed, 138 deletions(-) delete mode 100644 target/linux/ramips/dts/RB750Gr3.dts 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 76b6fe9f50..981e001f64 100755 --- a/target/linux/ramips/base-files/etc/board.d/02_network +++ b/target/linux/ramips/base-files/etc/board.d/02_network @@ -200,7 +200,6 @@ ramips_setup_interfaces() jhr-n926r|\ mikrotik,rbm33g|\ mzk-wdpr|\ - rb750gr3|\ rt-n14u|\ tplink,c20-v4|\ tplink,c50-v3|\ diff --git a/target/linux/ramips/base-files/lib/ramips.sh b/target/linux/ramips/base-files/lib/ramips.sh index 5741cbd2ee..2dd0388426 100755 --- a/target/linux/ramips/base-files/lib/ramips.sh +++ b/target/linux/ramips/base-files/lib/ramips.sh @@ -418,9 +418,6 @@ ramips_board_detect() { *"R6220") name="r6220" ;; - *"RB750Gr3") - name="rb750gr3" - ;; *"RE350 v1") name="re350-v1" ;; diff --git a/target/linux/ramips/base-files/lib/upgrade/platform.sh b/target/linux/ramips/base-files/lib/upgrade/platform.sh index ffdc5e73e0..59aca60ad0 100755 --- a/target/linux/ramips/base-files/lib/upgrade/platform.sh +++ b/target/linux/ramips/base-files/lib/upgrade/platform.sh @@ -129,7 +129,6 @@ platform_check_image() { psr-680w|\ px-4885-4M|\ px-4885-8M|\ - rb750gr3|\ re6500|\ rp-n53|\ rt5350f-olinuxino|\ diff --git a/target/linux/ramips/dts/RB750Gr3.dts b/target/linux/ramips/dts/RB750Gr3.dts deleted file mode 100644 index dc359b10bb..0000000000 --- a/target/linux/ramips/dts/RB750Gr3.dts +++ /dev/null @@ -1,125 +0,0 @@ -/dts-v1/; - -#include "mt7621.dtsi" - -#include <dt-bindings/input/input.h> -#include <dt-bindings/gpio/gpio.h> - -/ { - compatible = "mikrotik,rb750gr3", "mediatek,mt7621-soc"; - model = "MikroTik RB750Gr3"; - - memory@0 { - device_type = "memory"; - reg = <0x0 0x10000000>; - }; - - chosen { - bootargs = "console=ttyS0,57600"; - }; - - gpio-leds { - compatible = "gpio-leds"; - - pwr { - label = "rb750gr3:blue:pwr"; - gpios = <&gpio0 16 GPIO_ACTIVE_HIGH>; - }; - - usr { - label = "rb750gr3:green:usr"; - gpios = <&gpio0 0 GPIO_ACTIVE_HIGH>; - }; - }; - - gpio-keys-polled { - compatible = "gpio-keys-polled"; - #address-cells = <1>; - #size-cells = <0>; - poll-interval = <20>; - - mode { - label = "mode"; - gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; - linux,code = <KEY_RFKILL>; - }; - - res { - label = "res"; - gpios = <&gpio0 18 GPIO_ACTIVE_LOW>; - linux,code = <KEY_RESTART>; - }; - }; - - gpio_export { - compatible = "gpio-export"; - #size-cells = <0>; - - buzzer { - gpio-export,name = "buzzer"; - gpio-export,output = <0>; - gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>; - }; - - usb { - gpio-export,name = "usb"; - gpio-export,output = <1>; - gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>; - }; - }; -}; - -&spi0 { - status = "okay"; - - m25p80@0 { - #address-cells = <1>; - #size-cells = <1>; - compatible = "jedec,spi-nor"; - reg = <0>; - spi-max-frequency = <10000000>; - m25p,chunked-io = <32>; - - partition@0 { - label = "u-boot"; - reg = <0x0 0x30000>; - read-only; - }; - - partition@30000 { - label = "u-boot-env"; - reg = <0x30000 0x10000>; - read-only; - }; - - factory: partition@40000 { - label = "factory"; - reg = <0x40000 0x10000>; - read-only; - }; - - partition@50000 { - label = "firmware"; - reg = <0x50000 0xfb0000>; - }; - - }; -}; - -ðernet { - mtd-mac-address = <&factory 0xe000>; - mtd-mac-address-increment = <1>; -}; - -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "uart2", "uart3", "pcie", "rgmii2", "jtag"; - ralink,function = "gpio"; - }; - }; -}; - -&sdhci { - status = "okay"; -}; diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk index e9e2d3ecef..3d1a26e00c 100644 --- a/target/linux/ramips/image/mt7621.mk +++ b/target/linux/ramips/image/mt7621.mk @@ -225,14 +225,6 @@ define Device/r6220 endef TARGET_DEVICES += r6220 -define Device/rb750gr3 - DTS := RB750Gr3 - IMAGE_SIZE := $(ralink_default_fw_size_16M) - DEVICE_TITLE := MikroTik RB750Gr3 - DEVICE_PACKAGES := kmod-usb3 uboot-envtools -endef -TARGET_DEVICES += rb750gr3 - define Device/mikrotik_rbm33g DTS := RBM33G BLOCKSIZE := 64k -- 2.14.3 (Apple Git-98) _______________________________________________ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel