From 4ace629e301e1599dee74dba014dbed65ee17fd4 Mon Sep 17 00:00:00 2001 From: Andrii Kuiukoff Date: Wed, 9 Sep 2026 11:29:22 -0400 Subject: [PATCH] mediatek: filogic: comfast cf-wa933: clean up legacy device definitions Remove the fixed memory node and console bootargs override, relying on the bootloader to supply the memory map and command line. Drop the DTB padding and explicit kernel/FDT load addresses so the image definitions use the Filogic defaults. I have boot-tested the standard target with these settings removed. Both existing variants inherit the changes. Remove the redundant crypto status override. The inherited SoC node has no status property, which leaves it available; this does not disable the EIP-97 engine. Remove the CPU port's user-facing label while keeping its Ethernet link and switch topology. Remove the explicit SPI address and size cell properties. Drop the standard target's 64M display suffix, which describes its UBI region size rather than a different NAND device. Keep its 64 MiB image limit. Add cf-wa933 as a supported-device alias for the standard target, matching the short compatibility alias used by the CF-WR632AX. Keep both existing targets and their NMBM partition maps intact. Signed-off-by: Andrii Kuiukoff Signed-off-by: Guillaume RISCHARD Link: https://github.com/openwrt/openwrt/pull/24590 Signed-off-by: Jonas Jelonek --- .../dts/mt7981a-comfast-cf-wa933-common.dtsi | 13 ------------- target/linux/mediatek/image/filogic.mk | 5 +---- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/target/linux/mediatek/dts/mt7981a-comfast-cf-wa933-common.dtsi b/target/linux/mediatek/dts/mt7981a-comfast-cf-wa933-common.dtsi index 72f1392b403..4fc9c295168 100644 --- a/target/linux/mediatek/dts/mt7981a-comfast-cf-wa933-common.dtsi +++ b/target/linux/mediatek/dts/mt7981a-comfast-cf-wa933-common.dtsi @@ -13,15 +13,9 @@ }; chosen { - bootargs-override = "console=ttyS0,115200n8"; stdout-path = "serial0:115200n8"; }; - memory@40000000 { - reg = <0 0x40000000>, <0 0x10000000>; // 256MB - device_type = "memory"; - }; - gpio-keys { compatible = "gpio-keys"; @@ -116,7 +110,6 @@ port@6 { reg = <6>; - label = "cpu"; ethernet = <&gmac0>; phy-mode = "2500base-x"; @@ -130,10 +123,6 @@ }; }; -&crypto { - status = "okay"; -}; - &pio { spi0_flash_pins: spi0-pins { mux { @@ -156,8 +145,6 @@ &spi0 { pinctrl-names = "default"; pinctrl-0 = <&spi0_flash_pins>; - #address-cells = <1>; - #size-cells = <0>; status = "okay"; spi_nand: spi-nand@0 { diff --git a/target/linux/mediatek/image/filogic.mk b/target/linux/mediatek/image/filogic.mk index bec58ef0e81..0474f4f41da 100644 --- a/target/linux/mediatek/image/filogic.mk +++ b/target/linux/mediatek/image/filogic.mk @@ -1149,10 +1149,7 @@ define Device/comfast_cf-wa933-common DEVICE_VENDOR := COMFAST DEVICE_MODEL := CF-WA933 DEVICE_DTS_DIR := ../dts - DEVICE_DTC_FLAGS := --pad 4096 - DEVICE_DTS_LOADADDR := 0x43f00000 DEVICE_PACKAGES := kmod-ledtrig-network kmod-mt7915e kmod-mt7981-firmware mt7981-wo-firmware - KERNEL_LOADADDR := 0x44000000 UBINIZE_OPTS := -E 5 BLOCKSIZE := 128k PAGESIZE := 2048 @@ -1162,9 +1159,9 @@ define Device/comfast_cf-wa933-common endef define Device/comfast_cf-wa933 - DEVICE_VARIANT := 64M DEVICE_DTS := mt7981a-comfast-cf-wa933 IMAGE_SIZE := 65536k + SUPPORTED_DEVICES += cf-wa933 $(call Device/comfast_cf-wa933-common) endef TARGET_DEVICES += comfast_cf-wa933