UniElec devices are the last ones in ramips target still having the RAM size in device name although RAM size is auto-detected.
Remove this from device name, compatible, etc., as it's not required and might be misleading to users and developers adding device support copying those devices. Signed-off-by: Adrian Schmutzler <[email protected]> --- target/linux/ramips/base-files/etc/board.d/01_leds | 2 +- target/linux/ramips/base-files/etc/board.d/02_network | 6 +++--- ...6-256m-16m.dts => mt7621_unielec_u7621-06-16m.dts} | 4 ++-- ...6-512m-64m.dts => mt7621_unielec_u7621-06-64m.dts} | 4 ++-- ...128m-16m.dts => mt7628an_unielec_u7628-01-16m.dts} | 4 ++-- target/linux/ramips/image/mt7621.mk | 11 ++++++----- target/linux/ramips/image/mt76x8.mk | 6 +++--- 7 files changed, 19 insertions(+), 18 deletions(-) rename target/linux/ramips/dts/{mt7621_unielec_u7621-06-256m-16m.dts => mt7621_unielec_u7621-06-16m.dts} (94%) rename target/linux/ramips/dts/{mt7621_unielec_u7621-06-512m-64m.dts => mt7621_unielec_u7621-06-64m.dts} (94%) rename target/linux/ramips/dts/{mt7628an_unielec_u7628-01-128m-16m.dts => mt7628an_unielec_u7628-01-16m.dts} (94%) 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 d5ea201279..a6ebb7e2dc 100755 --- a/target/linux/ramips/base-files/etc/board.d/01_leds +++ b/target/linux/ramips/base-files/etc/board.d/01_leds @@ -392,7 +392,7 @@ tplink,tl-wr902ac-v3) ucidef_set_led_wlan "wlan2g" "wlan2g" "$boardname:green:wlan" "phy0tpt" ucidef_set_led_switch "lan" "lan" "$boardname:green:lan" "switch0" "0x10" ;; -unielec,u7628-01-128m-16m) +unielec,u7628-01-16m) ucidef_set_led_switch "lan1" "lan1" "u7628-01:green:lan1" "switch0" "0x2" ucidef_set_led_switch "lan2" "lan2" "u7628-01:green:lan2" "switch0" "0x4" ucidef_set_led_switch "lan3" "lan3" "u7628-01:green:lan3" "switch0" "0x8" 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 b413b434eb..ba4ed5f1a4 100755 --- a/target/linux/ramips/base-files/etc/board.d/02_network +++ b/target/linux/ramips/base-files/etc/board.d/02_network @@ -85,8 +85,8 @@ ramips_setup_interfaces() telco-electronics,x1|\ totolink,a7000r|\ totolink,lr1200|\ - unielec,u7621-06-256m-16m|\ - unielec,u7621-06-512m-64m|\ + unielec,u7621-06-16m|\ + unielec,u7621-06-64m|\ wavlink,wl-wn570ha1|\ wavlink,wl-wn575a3|\ xiaomi,miwifi-mini|\ @@ -212,7 +212,7 @@ ramips_setup_interfaces() tplink,tl-wr841n-v13|\ tplink,tl-wr841n-v14|\ tplink,tl-wr842n-v5|\ - unielec,u7628-01-128m-16m|\ + unielec,u7628-01-16m|\ ubiquiti,edgerouterx|\ ubiquiti,edgerouterx-sfp|\ upvel,ur-326n4g|\ diff --git a/target/linux/ramips/dts/mt7621_unielec_u7621-06-256m-16m.dts b/target/linux/ramips/dts/mt7621_unielec_u7621-06-16m.dts similarity index 94% rename from target/linux/ramips/dts/mt7621_unielec_u7621-06-256m-16m.dts rename to target/linux/ramips/dts/mt7621_unielec_u7621-06-16m.dts index 78bccbf12d..603e2dd2d8 100644 --- a/target/linux/ramips/dts/mt7621_unielec_u7621-06-256m-16m.dts +++ b/target/linux/ramips/dts/mt7621_unielec_u7621-06-16m.dts @@ -40,8 +40,8 @@ #include <dt-bindings/input/input.h> / { - compatible = "unielec,u7621-06-256m-16m", "unielec,u7621-06", "mediatek,mt7621-soc"; - model = "UniElec U7621-06 (256M RAM/16M flash)"; + compatible = "unielec,u7621-06-16m", "unielec,u7621-06", "mediatek,mt7621-soc"; + model = "UniElec U7621-06 (16M flash)"; }; &spi0 { diff --git a/target/linux/ramips/dts/mt7621_unielec_u7621-06-512m-64m.dts b/target/linux/ramips/dts/mt7621_unielec_u7621-06-64m.dts similarity index 94% rename from target/linux/ramips/dts/mt7621_unielec_u7621-06-512m-64m.dts rename to target/linux/ramips/dts/mt7621_unielec_u7621-06-64m.dts index 16baf70600..3498be044a 100644 --- a/target/linux/ramips/dts/mt7621_unielec_u7621-06-512m-64m.dts +++ b/target/linux/ramips/dts/mt7621_unielec_u7621-06-64m.dts @@ -41,8 +41,8 @@ #include <dt-bindings/input/input.h> / { - compatible = "unielec,u7621-06-512m-64m", "unielec,u7621-06", "mediatek,mt7621-soc"; - model = "UniElec U7621-06 (512M RAM/64M flash)"; + compatible = "unielec,u7621-06-64m", "unielec,u7621-06", "mediatek,mt7621-soc"; + model = "UniElec U7621-06 (64M flash)"; }; &spi0 { diff --git a/target/linux/ramips/dts/mt7628an_unielec_u7628-01-128m-16m.dts b/target/linux/ramips/dts/mt7628an_unielec_u7628-01-16m.dts similarity index 94% rename from target/linux/ramips/dts/mt7628an_unielec_u7628-01-128m-16m.dts rename to target/linux/ramips/dts/mt7628an_unielec_u7628-01-16m.dts index c5eaf6d5d0..66fea358bd 100644 --- a/target/linux/ramips/dts/mt7628an_unielec_u7628-01-128m-16m.dts +++ b/target/linux/ramips/dts/mt7628an_unielec_u7628-01-16m.dts @@ -37,8 +37,8 @@ #include "mt7628an_unielec_u7628-01.dtsi" / { - compatible = "unielec,u7628-01-128m-16m", "unielec,u7628-01", "mediatek,mt7628an-soc"; - model = "UniElec U7628-01 (128M RAM/16M flash)"; + compatible = "unielec,u7628-01-16m", "unielec,u7628-01", "mediatek,mt7628an-soc"; + model = "UniElec U7628-01 (16M flash)"; }; &spi0 { diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk index d32feb7eab..00705e6e52 100644 --- a/target/linux/ramips/image/mt7621.mk +++ b/target/linux/ramips/image/mt7621.mk @@ -592,24 +592,25 @@ define Device/ubiquiti_edgerouterx-sfp endef TARGET_DEVICES += ubiquiti_edgerouterx-sfp -define Device/unielec_u7621-06-256m-16m +define Device/unielec_u7621-06-16m MTK_SOC := mt7621 IMAGE_SIZE := 16064k DEVICE_VENDOR := UniElec DEVICE_MODEL := U7621-06 - DEVICE_VARIANT := 256M RAM/16M flash + DEVICE_VARIANT := 16M DEVICE_PACKAGES := kmod-ata-core kmod-ata-ahci kmod-sdhci-mt7620 kmod-usb3 - SUPPORTED_DEVICES += u7621-06-256M-16M + SUPPORTED_DEVICES += u7621-06-256M-16M unielec,u7621-06-256m-16m endef TARGET_DEVICES += unielec_u7621-06-256m-16m -define Device/unielec_u7621-06-512m-64m +define Device/unielec_u7621-06-64m MTK_SOC := mt7621 IMAGE_SIZE := 65216k DEVICE_VENDOR := UniElec DEVICE_MODEL := U7621-06 - DEVICE_VARIANT := 512M RAM/64M flash + DEVICE_VARIANT := 64M DEVICE_PACKAGES := kmod-ata-core kmod-ata-ahci kmod-sdhci-mt7620 kmod-usb3 + SUPPORTED_DEVICES += unielec,u7621-06-512m-64m endef TARGET_DEVICES += unielec_u7621-06-512m-64m diff --git a/target/linux/ramips/image/mt76x8.mk b/target/linux/ramips/image/mt76x8.mk index d560a2aab0..3fd53dee2e 100644 --- a/target/linux/ramips/image/mt76x8.mk +++ b/target/linux/ramips/image/mt76x8.mk @@ -433,14 +433,14 @@ define Device/tplink_tl-wr902ac-v3 endef TARGET_DEVICES += tplink_tl-wr902ac-v3 -define Device/unielec_u7628-01-128m-16m +define Device/unielec_u7628-01-16m MTK_SOC := mt7628an IMAGE_SIZE := 16064k DEVICE_VENDOR := UniElec DEVICE_MODEL := U7628-01 - DEVICE_VARIANT := 128M RAM/16M flash + DEVICE_VARIANT := 16M DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport - SUPPORTED_DEVICES += u7628-01-128M-16M + SUPPORTED_DEVICES += u7628-01-128M-16M unielec,u7628-01-128m-16m endef TARGET_DEVICES += unielec_u7628-01-128m-16m -- 2.20.1 _______________________________________________ openwrt-devel mailing list [email protected] https://lists.openwrt.org/mailman/listinfo/openwrt-devel
