mvebu: rename generic rb5009 to rb5009ug

Models specialized for RB5009UG and RB5009UPr, use generic dtsi for both.

Signed-off-by: Przemek Rudy <prudy@protonmail.com>
This commit is contained in:
Przemek Rudy 2024-12-01 20:52:34 +01:00
parent f1c247091f
commit c74f85d911
9 changed files with 28 additions and 8 deletions

View File

@ -63,7 +63,7 @@ endef
define U-Boot/rb5009
NAME:=MikroTik RB5009
BUILD_SUBTARGET:=cortexa72
BUILD_DEVICES:=mikrotik_rb5009 mikrotik_rb5009upr
BUILD_DEVICES:=mikrotik_rb5009 mikrotik_rb5009ug mikrotik_rb5009upr
UBOOT_CONFIG:=mvebu_rb5009
UBOOT_IMAGE:=u-boot.elf
endef

View File

@ -2,7 +2,7 @@
+++ b/board/Marvell/mvebu_armada-8k/mikrotik-rb5009.env 2024-07-08 15:45:11.657761785 +0200
@@ -1,4 +1,4 @@
-openwrt_initramfs=openwrt-mvebu-cortexa72-mikrotik_rb5009-initramfs-uImage.itb
+openwrt_initramfs=openwrt-mvebu-cortexa72-mikrotik_rb5009-initramfs-uImage.itb openwrt-mvebu-cortexa72-mikrotik_rb5009upr-initramfs-uImage.itb
+openwrt_initramfs=openwrt-mvebu-cortexa72-mikrotik_rb5009ug-initramfs-uImage.itb openwrt-mvebu-cortexa72-mikrotik_rb5009upr-initramfs-uImage.itb
boot_devices=ubi usb net
recovery_boot_devices=usb net

View File

@ -33,6 +33,7 @@ marvell,armada8040-clearfog-gt-8k)
ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4 eth2" "eth0 eth1"
;;
mikrotik,rb5009|\
mikrotik,rb5009ug|\
mikrotik,rb5009upr)
ucidef_set_interfaces_lan_wan "p2 p3 p4 p5 p6 p7 p8 sfp" "p1"
;;

View File

@ -38,6 +38,7 @@ platform_do_upgrade() {
legacy_sdcard_do_upgrade "$1"
;;
mikrotik,rb5009|\
mikrotik,rb5009ug|\
mikrotik,rb5009upr)
nand_do_upgrade "$1"
;;

View File

@ -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", "mikrotik,rb5009", "marvell,armada7040",
"marvell,armada-ap806-quad", "marvell,armada-ap806";
};

View File

@ -2,7 +2,7 @@
/dts-v1/;
#include "armada-7040-rb5009.dts"
#include "armada-7040-rb5009.dtsi"
/ {
model = "MikroTik RB5009UPr";

View File

@ -71,18 +71,25 @@ 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
SUPPORTED_DEVICES := mikrotik,rb5009 mikrotik,rb5009upr
SUPPORTED_DEVICES := mikrotik,rb5009
endef
TARGET_DEVICES += mikrotik_rb5009
define Device/mikrotik_rb5009ug
$(call Device/mikrotik_rb5009)
DEVICE_DTS := armada-7040-rb5009ug
DEVICE_MODEL := RB5009UG
SUPPORTED_DEVICES += mikrotik,rb5009ug
endef
TARGET_DEVICES += mikrotik_rb5009ug
define Device/mikrotik_rb5009upr
$(call Device/mikrotik_rb5009)
DEVICE_DTS := armada-7040-rb5009upr
DEVICE_MODEL := RB5009UPr+S+IN
SUPPORTED_DEVICES += mikrotik,rb5009upr
endef
TARGET_DEVICES += mikrotik_rb5009upr

View File

@ -1,6 +1,6 @@
--- a/drivers/spi/spidev.c
+++ b/drivers/spi/spidev.c
@@ -714,6 +714,7 @@ static const struct spi_device_id spidev
@@ -716,6 +716,7 @@ static const struct spi_device_id spidev
{ .name = "spi-authenta" },
{ .name = "em3581" },
{ .name = "si3210" },
@ -8,7 +8,7 @@
{},
};
MODULE_DEVICE_TABLE(spi, spidev_spi_ids);
@@ -742,6 +743,7 @@ static const struct of_device_id spidev_
@@ -746,6 +747,7 @@ static const struct of_device_id spidev_
{ .compatible = "semtech,sx1301", .data = &spidev_of_check },
{ .compatible = "silabs,em3581", .data = &spidev_of_check },
{ .compatible = "silabs,si3210", .data = &spidev_of_check },