mvebu: rename generic rb5009 to rb5009ug

Specialize RB5009UG model from generic RB5009.

Signed-off-by: Przemek Rudy <prudy@protonmail.com>
[carlo@common-net.org: fixed model name and backward compatibility ]
Signed-off-by: Carlo Filippi <carlo@common-net.org>
Signed-off-by: Sm00shed <sm00shed@posteo.de>
Link: https://github.com/openwrt/openwrt/pull/23698
Signed-off-by: Jonas Jelonek <jelonek.jonas@gmail.com>

diff --git a/package/boot/uboot-mvebu/Makefile b/package/boot/uboot-mvebu/Makefile
index 9c9027759599fb3e9f3b2bbe6dc3f4cac6d051ea..34d9a21ee4b18253ceb225a8b54aac675cc471fb 100644 (file)
--- a/package/boot/uboot-mvebu/Makefile
+++ b/package/boot/uboot-mvebu/Makefile
@@ -70,7 +70,7 @@ endef
 define U-Boot/rb5009
   NAME:=MikroTik RB5009
   BUILD_SUBTARGET:=cortexa72
-  BUILD_DEVICES:=mikrotik_rb5009
+  BUILD_DEVICES:=mikrotik_rb5009ug
   UBOOT_CONFIG:=mvebu_rb5009
   UBOOT_IMAGE:=u-boot.elf
 endef

diff --git a/target/linux/mvebu/cortexa72/base-files/etc/board.d/01_leds b/target/linux/mvebu/cortexa72/base-files/etc/board.d/01_leds
index 2d18587a62495061a73e1863e7fe83f73f783e7d..6e0d2711d7c8b42032d09686bc6d3b6f09f2e785 100644 (file)
--- a/target/linux/mvebu/cortexa72/base-files/etc/board.d/01_leds
+++ b/target/linux/mvebu/cortexa72/base-files/etc/board.d/01_leds
@@ -13,7 +13,8 @@ iei,puzzle-m901)
 iei,puzzle-m902)
        ucidef_set_led_netdev "wan" "WAN" "white:network" "eth2" "link"
        ;;
-mikrotik,rb5009)
+mikrotik,rb5009ug|\
+mikrotik,rb5009upr)
        ucidef_set_led_netdev "sfp" "SFP" "green:sfp" "sfp"
        ucidef_set_led_netdev "wan-port-link" "WAN-PORT-LINK" "!cp0!config-space@f2000000!mdio@12a200!switch@0!mdio1:00:green:" "p1" "tx rx link_10 link_100 link_1000 link_2500"
        ;;

diff --git a/target/linux/mvebu/cortexa72/base-files/etc/board.d/02_network b/target/linux/mvebu/cortexa72/base-files/etc/board.d/02_network
index 6c8c6c171fd9b0dbfa86aa639d3e452c8212f6a7..b8d1a3b41b34884fae927a5917d41f64db7040bc 100644 (file)
--- a/target/linux/mvebu/cortexa72/base-files/etc/board.d/02_network
+++ b/target/linux/mvebu/cortexa72/base-files/etc/board.d/02_network
@@ -38,7 +38,7 @@ marvell,armada7040-db)
 marvell,armada8040-clearfog-gt-8k)
        ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4 eth2" "eth0 eth1"
        ;;
-mikrotik,rb5009)
+mikrotik,rb5009ug)
        ucidef_set_interfaces_lan_wan "p2 p3 p4 p5 p6 p7 p8 sfp" "p1"
        ;;
 solidrun,clearfog-pro)

diff --git a/target/linux/mvebu/cortexa72/base-files/lib/upgrade/platform.sh b/target/linux/mvebu/cortexa72/base-files/lib/upgrade/platform.sh
index b88b3c08ec947759219ad7887b1fb2ae1cee97a0..1c1233f8268a0c6b8db0615f0ed827cc2d0d8ff3 100755 (executable)
--- a/target/linux/mvebu/cortexa72/base-files/lib/upgrade/platform.sh
+++ b/target/linux/mvebu/cortexa72/base-files/lib/upgrade/platform.sh
@@ -83,7 +83,7 @@ platform_do_upgrade() {
        solidrun,clearfog-pro)
                legacy_sdcard_do_upgrade "$1"
                ;;
-       mikrotik,rb5009)
+       mikrotik,rb5009ug)
                nand_do_upgrade "$1"
                ;;
        *)

diff --git a/target/linux/mvebu/files/arch/arm64/boot/dts/marvell/armada-7040-rb5009.dts b/target/linux/mvebu/files/arch/arm64/boot/dts/marvell/armada-7040-rb5009.dtsi
similarity index 100%
rename from target/linux/mvebu/files/arch/arm64/boot/dts/marvell/armada-7040-rb5009.dts
rename to target/linux/mvebu/files/arch/arm64/boot/dts/marvell/armada-7040-rb5009.dtsi

diff --git a/target/linux/mvebu/files/arch/arm64/boot/dts/marvell/armada-7040-rb5009ug.dts b/target/linux/mvebu/files/arch/arm64/boot/dts/marvell/armada-7040-rb5009ug.dts
new file mode 100644 (file)
index 0000000..bf2d805
--- /dev/null
+++ b/target/linux/mvebu/files/arch/arm64/boot/dts/marvell/armada-7040-rb5009ug.dts
@@ -0,0 +1,11 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+
+/dts-v1/;
+
+#include "armada-7040-rb5009.dtsi"
+
+/ {
+       model = "MikroTik RB5009UG";
+       compatible = "mikrotik,rb5009ug", "marvell,armada7040",
+                    "marvell,armada-ap806-quad", "marvell,armada-ap806";
+};

diff --git a/target/linux/mvebu/image/cortexa72.mk b/target/linux/mvebu/image/cortexa72.mk
index 20cf50064c6f10d83a7a371ea456b81863b69996..bc7ef452ab94e66418474595d38bd830067aec5c 100644 (file)
--- a/target/linux/mvebu/image/cortexa72.mk
+++ b/target/linux/mvebu/image/cortexa72.mk
@@ -106,12 +106,18 @@ define Device/mikrotik_rb5009
   $(call Device/FitImage)
   $(call Device/UbiFit)
   DEVICE_VENDOR := MikroTik
-  DEVICE_MODEL := RB5009
   SOC := armada-7040
   KERNEL_LOADADDR := 0x22000000
   DEVICE_PACKAGES += kmod-i2c-gpio yafut kmod-dsa-mv88e6xxx
 endef
-TARGET_DEVICES += mikrotik_rb5009
+
+define Device/mikrotik_rb5009ug
+  $(call Device/mikrotik_rb5009)
+  DEVICE_DTS := armada-7040-rb5009ug
+  DEVICE_MODEL := RB5009UG+S+IN
+  SUPPORTED_DEVICES += mikrotik,rb5009
+endef
+TARGET_DEVICES += mikrotik_rb5009ug
 
 define Device/marvell_clearfog-gt-8k
   $(call Device/Default-arm64)