diff --git a/package/boot/uboot-envtools/files/mediatek_filogic b/package/boot/uboot-envtools/files/mediatek_filogic index 8fdc3d738e..b92a2c788c 100644 --- a/package/boot/uboot-envtools/files/mediatek_filogic +++ b/package/boot/uboot-envtools/files/mediatek_filogic @@ -74,7 +74,7 @@ jdcloud,re-cp-03) ;; esac ;; -cetron,ct3003-stock|\ +cetron,ct3003|\ cetron,ct3003-ubootmod|\ edgecore,eap111|\ h3c,magic-nx30-pro-nmbm|\ diff --git a/target/linux/mediatek/dts/mt7981b-cetron-ct3003-ubootmod.dts b/target/linux/mediatek/dts/mt7981b-cetron-ct3003-ubootmod.dts index 4f6326dcb8..0705c7732c 100644 --- a/target/linux/mediatek/dts/mt7981b-cetron-ct3003-ubootmod.dts +++ b/target/linux/mediatek/dts/mt7981b-cetron-ct3003-ubootmod.dts @@ -4,7 +4,7 @@ #include "mt7981b-cetron-ct3003.dtsi" / { - model = "CETRON CT3003 (custom U-Boot layout)"; + model = "Cetron CT3003 (custom U-Boot layout)"; compatible = "cetron,ct3003-ubootmod", "mediatek,mt7981"; }; diff --git a/target/linux/mediatek/dts/mt7981b-cetron-ct3003-stock.dts b/target/linux/mediatek/dts/mt7981b-cetron-ct3003.dts similarity index 78% rename from target/linux/mediatek/dts/mt7981b-cetron-ct3003-stock.dts rename to target/linux/mediatek/dts/mt7981b-cetron-ct3003.dts index 436bd10aea..d411d940bc 100644 --- a/target/linux/mediatek/dts/mt7981b-cetron-ct3003-stock.dts +++ b/target/linux/mediatek/dts/mt7981b-cetron-ct3003.dts @@ -4,8 +4,8 @@ #include "mt7981b-cetron-ct3003.dtsi" / { - model = "CETRON CT3003 (stock layout)"; - compatible = "cetron,ct3003-stock", "mediatek,mt7981"; + model = "Cetron CT3003 (stock layout)"; + compatible = "cetron,ct3003", "mediatek,mt7981"; }; &partitions { diff --git a/target/linux/mediatek/dts/mt7981b-cetron-ct3003.dtsi b/target/linux/mediatek/dts/mt7981b-cetron-ct3003.dtsi index 2ece40d7ee..316803b847 100644 --- a/target/linux/mediatek/dts/mt7981b-cetron-ct3003.dtsi +++ b/target/linux/mediatek/dts/mt7981b-cetron-ct3003.dtsi @@ -1,7 +1,4 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT -/* - * Copyright (C) 2023 Tianling Shen - */ /dts-v1/; #include diff --git a/target/linux/mediatek/filogic/base-files/etc/board.d/02_network b/target/linux/mediatek/filogic/base-files/etc/board.d/02_network index 615a92899f..b992710e5b 100644 --- a/target/linux/mediatek/filogic/base-files/etc/board.d/02_network +++ b/target/linux/mediatek/filogic/base-files/etc/board.d/02_network @@ -25,7 +25,7 @@ mediatek_setup_interfaces() ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 game" eth1 ;; asus,rt-ax59u|\ - cetron,ct3003-stock|\ + cetron,ct3003|\ cetron,ct3003-ubootmod|\ cmcc,a10-ubootmod|\ confiabits,mt7981|\ diff --git a/target/linux/mediatek/filogic/base-files/etc/hotplug.d/ieee80211/11_fix_wifi_mac b/target/linux/mediatek/filogic/base-files/etc/hotplug.d/ieee80211/11_fix_wifi_mac index 46fe722697..300f265351 100644 --- a/target/linux/mediatek/filogic/base-files/etc/hotplug.d/ieee80211/11_fix_wifi_mac +++ b/target/linux/mediatek/filogic/base-files/etc/hotplug.d/ieee80211/11_fix_wifi_mac @@ -51,7 +51,7 @@ case "$board" in ;; bananapi,bpi-r4|\ bananapi,bpi-r4-poe|\ - cetron,ct3003-stock|\ + cetron,ct3003|\ cetron,ct3003-ubootmod|\ konka,komi-a31|\ nokia,ea0326gmp) diff --git a/target/linux/mediatek/image/filogic.mk b/target/linux/mediatek/image/filogic.mk index e86f92c112..3385587133 100644 --- a/target/linux/mediatek/image/filogic.mk +++ b/target/linux/mediatek/image/filogic.mk @@ -420,13 +420,13 @@ define Device/bananapi_bpi-r4-poe endef TARGET_DEVICES += bananapi_bpi-r4-poe -define Device/cetron_ct3003-stock +define Device/cetron_ct3003 DEVICE_VENDOR := Cetron DEVICE_MODEL := CT3003 DEVICE_VARIANT := (stock layout) - DEVICE_DTS := mt7981b-cetron-ct3003-stock + DEVICE_DTS := mt7981b-cetron-ct3003 DEVICE_DTS_DIR := ../dts - SUPPORTED_DEVICES += cetron,ct3003 mediatek,mt7981-spim-snand-rfb + SUPPORTED_DEVICES += cetron,ct3003-stock mediatek,mt7981-spim-snand-rfb DEVICE_PACKAGES := kmod-mt7915e kmod-mt7981-firmware mt7981-wo-firmware UBINIZE_OPTS := -E 5 BLOCKSIZE := 128k @@ -437,7 +437,7 @@ define Device/cetron_ct3003-stock IMAGES += factory.bin IMAGE/factory.bin := $$(IMAGE/sysupgrade.bin) | cetron-header rd30 CT3003 endef -TARGET_DEVICES += cetron_ct3003-stock +TARGET_DEVICES += cetron_ct3003 define Device/cetron_ct3003-ubootmod DEVICE_VENDOR := Cetron