From: Przemek Rudy Date: Mon, 23 Dec 2024 19:28:12 +0000 (+0100) Subject: mvebu: rename generic rb5009 to rb5009ug X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4b1a8835289415862db5a1497f3d4a75a40a4b95;p=thirdparty%2Fopenwrt.git mvebu: rename generic rb5009 to rb5009ug Specialize RB5009UG model from generic RB5009. Signed-off-by: Przemek Rudy [carlo@common-net.org: fixed model name and backward compatibility ] Signed-off-by: Carlo Filippi Signed-off-by: Sm00shed Link: https://github.com/openwrt/openwrt/pull/23698 Signed-off-by: Jonas Jelonek --- diff --git a/package/boot/uboot-mvebu/Makefile b/package/boot/uboot-mvebu/Makefile index 9c902775959..34d9a21ee4b 100644 --- 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 2d18587a624..6e0d2711d7c 100644 --- 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 6c8c6c171fd..b8d1a3b41b3 100644 --- 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 b88b3c08ec9..1c1233f8268 100755 --- 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 index 00000000000..bf2d805565c --- /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 20cf50064c6..bc7ef452ab9 100644 --- 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)