kiddin9 il y a 8 mois
Parent
commit
531ac934d6

+ 1 - 3
devices/common/diy.sh

@@ -31,7 +31,7 @@ wget -N https://github.com/immortalwrt/immortalwrt/raw/refs/heads/openwrt-24.10/
 
 echo "$(date +"%s")" >version.date
 sed -i '/$(curdir)\/compile:/c\$(curdir)/compile: package/opkg/host/compile' package/Makefile
-sed -i "s/DEFAULT_PACKAGES:=/DEFAULT_PACKAGES:=luci-app-advancedplus luci-app-firewall luci-app-package-manager luci-app-upnp luci-app-syscontrol \
+sed -i "s/DEFAULT_PACKAGES:=/DEFAULT_PACKAGES:=luci-app-advancedplus luci-app-firewall luci-app-package-manager luci-app-upnp luci-app-syscontrol luci-proto-wireguard \
 luci-app-wizard luci-base luci-compat luci-lib-ipkg luci-lib-fs \
 coremark wget-ssl curl autocore htop nano zram-swap kmod-lib-zstd kmod-tcp-bbr bash openssh-sftp-server block-mount resolveip ds-lite swconfig luci-app-fan luci-app-filemanager /" include/target.mk
 
@@ -59,8 +59,6 @@ wget -N https://raw.githubusercontent.com/coolsnowwolf/lede/master/target/linux/
 
 wget -N https://patch-diff.githubusercontent.com/raw/openwrt/openwrt/pull/16414.patch -P devices/common/patches/
 
-sed -i "/mediaurlbase/d" package/feeds/*/luci-theme*/root/etc/uci-defaults/*
-
 # find target/linux/x86 -name "config*" -exec bash -c 'cat kernel.conf >> "{}"' \;
 sed -i 's/max_requests 3/max_requests 20/g' package/network/services/uhttpd/files/uhttpd.config
 #rm -rf ./feeds/packages/lang/{golang,node}

+ 27 - 0
devices/common/patches/base-files.patch

@@ -1,3 +1,30 @@
+--- a/package/base-files/files/etc/rc.common
++++ b/package/base-files/files/etc/rc.common
+@@ -28,7 +28,9 @@ restart() {
+ }
+ 
+ boot() {
+-	start "$@"
++	name="$(basename "${initscript}")"
++	name="${name##S[0-9][0-9]}"
++	[[ "$(uci -q get $name.$name[0].enabled)" == 0 || "$(uci -q get $name.config.enabled)" == 0 || "$(uci -q get $name.$name.enabled)" == 0 || "$(uci -q get $name.main.enabled)" == 0 || "$(uci -q get $name.$name[0].enable)" == 0 || "$(uci -q get $name.config.enable)" == 0 || "$(uci -q get $name.$name.enable)" == 0 || "$(uci -q get $name.main.enable)" == 0 ]] || start "$@";
+ }
+ 
+ shutdown() {
+
+--- a/package/base-files/files/lib/functions.sh
++++ b/package/base-files/files/lib/functions.sh
+@@ -395,7 +395,9 @@ default_postinst() {
+ 			if [ "$PKG_UPGRADE" != "1" ]; then
+ 				"$i" enable
+ 			fi
+-			"$i" start
++			if "$i" enabled; then
++				"$i" start
++			fi
+ 		fi
+ 	done
+
 --- a/package/base-files/files/etc/shinit
 +++ b/package/base-files/files/etc/shinit
 @@ -2,6 +2,8 @@

+ 1 - 1
devices/common/patches/luci-base.patch

@@ -165,7 +165,7 @@
  	shift; shift
  
 -	if [ -x "$init" ] && "$init" enabled && ! grep -sqE 'USE_PROCD=.' "$init"; then
-+	if [ -x "$init" ] && "$init" enabled && ! grep -sq 'procd_add_reload_trigger' "$init"; then
++	if [ -x "$init" ] && ! grep -sqE 'USE_PROCD=.' "$init"; then
  		logger -t "ucitrack" "Setting up /etc/config/$config reload trigger for non-procd $init"
  		procd_add_config_trigger "config.change" "$config" "$init" "$@"
  	fi

+ 4 - 3
devices/mediatek_filogic/diy/target/linux/mediatek/dts/mt7981b-cudy-tr3000-mod.dts

@@ -5,16 +5,17 @@
 
 / {
 	model = "Cudy TR3000 (U-Boot mod)";
-	compatible = "cudy,tr3000-mod", "mediatek,mt7981-spim-snand-rfb";
+	compatible = "cudy,tr3000-mod", "mediatek,mt7981";
 };
 
 &spi0 {
 	flash@0 {
 		partitions {
-			partition@580000 {
+			partition@5c0000 {
 				label = "ubi";
-				reg = <0x5C0000 0x7000000>;
+				reg = <0x5c0000 0x7000000>;
 			};
 		};
 	};
 };
+

+ 0 - 18
devices/mediatek_filogic/diy/target/linux/mediatek/dts/mt7981b-xiaomi-mi-router-ax3000t-an8855.dts

@@ -1,18 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-
-/dts-v1/;
-#include "mt7981b-xiaomi-mi-router-ax3000t.dts"
-
-/ { 
-	model = "Xiaomi Mi Router AX3000T with AN8855";
-	compatible = "xiaomi,mi-router-ax3000t-an8855", "mediatek,mt7981";
-	
-	gsw_an8855: gsw@1 {
-	compatible = "airoha,an8855";
-	#address-cells = <1>;
-	#size-cells = <0>;
-	status = "okay";
-	};
-};
-
-

+ 0 - 310
devices/qualcommax_ipq807x/diy/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8070-rm2-6.dts

@@ -1,310 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-
-/dts-v1/;
-
-#include "ipq8074-512m.dtsi"
-#include "ipq8074-ac-cpu.dtsi"
-#include "ipq8074-ess.dtsi"
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/leds/common.h>
-
-/ {
-	model = "CMCC RM2-6";
-	compatible = "cmcc,rm2-6", "qcom,ipq8074";
-
-	aliases {
-		serial0 = &blsp1_uart5;
-		serial1 = &blsp1_uart3;
-		led-boot = &led_status_red;
-		led-failsafe = &led_status_red;
-		led-running = &led_status_blue;
-		led-upgrade = &led_status_amber;
-		/*
-		 * Aliases as required by u-boot
-		 * to patch MAC addresses
-		 */
-		ethernet0 = &dp4;
-		ethernet1 = &dp2;
-		ethernet2 = &dp5;
-		label-mac-device = &dp4;
-	};
-
-	chosen {
-		stdout-path = "serial0:115200n8";
-		bootargs-append = " root=/dev/ubiblock0_1";
-	};
-
-	keys {
-		compatible = "gpio-keys";
-
-		wps {
-			label = "wps";
-			linux,code = <KEY_WPS_BUTTON>;
-			gpios = <&tlmm 27 GPIO_ACTIVE_LOW>;
-		};
-
-		reset {
-			label = "reset";
-			linux,code = <KEY_RESTART>;
-			gpios = <&tlmm 30 GPIO_ACTIVE_LOW>;
-		};
-	};
-
-	leds {
-		compatible = "gpio-leds";
-
-		led_status_amber: status-amber {
-			color = <LED_COLOR_ID_AMBER>;
-			function = LED_FUNCTION_STATUS;
-			gpios = <&tlmm 25 GPIO_ACTIVE_HIGH>;
-		};
-
-		led_status_blue: status-blue {
-			color = <LED_COLOR_ID_BLUE>;
-			function = LED_FUNCTION_STATUS;
-			gpios = <&tlmm 26 GPIO_ACTIVE_HIGH>;
-		};
-
-		led_status_red: status-red {
-			color = <LED_COLOR_ID_RED>;
-			function = LED_FUNCTION_STATUS;
-			gpios = <&tlmm 31 GPIO_ACTIVE_HIGH>;
-		};
-	};
-
-	fan: gpio-fan {
-		#cooling-cells = <2>;
-		compatible = "gpio-fan";
-		gpios = <&tlmm 29 GPIO_ACTIVE_HIGH>;
-		gpio-fan,speed-map = <0 0>, <1 1>;
-	};
-};
-
-&tlmm {
-	mdio_pins: mdio-pins {
-		mdc {
-			pins = "gpio68";
-			function = "mdc";
-			drive-strength = <8>;
-			bias-pull-up;
-		};
-
-		mdio {
-			pins = "gpio69";
-			function = "mdio";
-			drive-strength = <8>;
-			bias-pull-up;
-		};
-	};
-};
-
-&blsp1_uart3 {
-	status = "okay";
-};
-
-&blsp1_uart5 {
-	status = "okay";
-};
-
-&cryptobam {
-	status = "okay";
-};
-
-&crypto {
-	status = "okay";
-};
-
-&prng {
-	status = "okay";
-};
-
-&qpic_bam {
-	status = "okay";
-};
-
-&qpic_nand {
-	status = "okay";
-
-	nand@0 {
-		reg = <0>;
-		nand-ecc-strength = <8>;
-		nand-ecc-step-size = <512>;
-		nand-bus-width = <8>;
-
-		partitions {
-			compatible = "qcom,smem-part";
-		};
-	};
-};
-
-&cpu0_thermal {
-	trips {
-		cpu0_trip_active: cpu-active {
-			temperature = <60000>;
-			hysteresis = <2000>;
-			type = "active";
-		};
-	};
-
-	cooling-maps {
-		cpu-active {
-			cooling-device = <&fan THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
-			trip = <&cpu0_trip_active>;
-		};
-	};
-};
-
-&cpu1_thermal {
-	trips {
-		cpu1_trip_active: cpu-active {
-			temperature = <60000>;
-			hysteresis = <2000>;
-			type = "active";
-		};
-	};
-
-	cooling-maps {
-		cpu-active {
-			cooling-device = <&fan THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
-			trip = <&cpu1_trip_active>;
-		};
-	};
-};
-
-&cpu2_thermal {
-	trips {
-		cpu2_trip_active: cpu-active {
-			temperature = <60000>;
-			hysteresis = <2000>;
-			type = "active";
-		};
-	};
-
-	cooling-maps {
-		cpu-active {
-			cooling-device = <&fan THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
-			trip = <&cpu2_trip_active>;
-		};
-	};
-};
-
-&cpu3_thermal {
-	trips {
-		cpu3_trip_active: cpu-active {
-			temperature = <60000>;
-			hysteresis = <2000>;
-			type = "active";
-		};
-	};
-
-	cooling-maps {
-		cpu-active {
-			cooling-device = <&fan THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
-			trip = <&cpu3_trip_active>;
-		};
-	};
-};
-
-&cluster_thermal {
-	trips {
-		cluster_active: cluster-active {
-			temperature = <60000>;
-			hysteresis = <2000>;
-			type = "active";
-		};
-	};
-
-	cooling-maps {
-		cluster-active {
-			cooling-device = <&fan THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
-			trip = <&cluster_active>;
-		};
-	};
-};
-
-&mdio {
-	status = "okay";
-
-	pinctrl-0 = <&mdio_pins>;
-	pinctrl-names = "default";
-	reset-gpios = <&tlmm 37 GPIO_ACTIVE_LOW>;
-
-	ethernet-phy-package@0 {
-		compatible = "qcom,qca8075-package";
-		#address-cells = <1>;
-		#size-cells = <0>;
-		reg = <0>;
-
-		qca8075_1: ethernet-phy@1 {
-			compatible = "ethernet-phy-ieee802.3-c22";
-			reg = <1>;
-		};
-
-		qca8075_3: ethernet-phy@3 {
-			compatible = "ethernet-phy-ieee802.3-c22";
-			reg = <3>;
-		};
-
-		qca8075_4: ethernet-phy@4 {
-			compatible = "ethernet-phy-ieee802.3-c22";
-			reg = <4>;
-		};
-	};
-};
-
-&switch {
-	status = "okay";
-
-	switch_lan_bmp = <(0x4 | 0x10)>;
-	switch_wan_bmp = <0x20>;
-	switch_mac_mode = <0x0>;
-
-	qcom,port_phyinfo {
-		port@2 {
-			port_id = <2>;
-			phy_address = <1>;
-		};
-		port@4 {
-			port_id = <4>;
-			phy_address = <3>;
-		};
-		port@5 {
-			port_id = <5>;
-			phy_address = <4>;
-		};
-	};
-};
-
-&edma {
-	status = "okay";
-};
-
-/*
- * Directly connect to the Hi5630
- * PLC (Power Line Communication)
- */
-&dp2 {
-	status = "okay";
-	phy-handle = <&qca8075_1>;
-	label = "plc";
-};
-
-&dp4 {
-	status = "okay";
-	phy-handle = <&qca8075_3>;
-	label = "lan";
-};
-
-&dp5 {
-	status = "okay";
-	phy-handle = <&qca8075_4>;
-	label = "wan";
-};
-
-&wifi {
-	status = "okay";
-
-	qcom,ath11k-calibration-variant = "CMCC-RM2-6";
-	qcom,ath11k-fw-memory-mode = <1>;
-};

+ 0 - 452
devices/qualcommax_ipq807x/diy/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8071-mf269.dts

@@ -1,452 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-
-/dts-v1/;
-
-#include "ipq8074-512m.dtsi"
-#include "ipq8074-ac-cpu.dtsi"
-#include "ipq8074-ess.dtsi"
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/leds/common.h>
-
-/ {
-	model = "ZTE MF269";
-	compatible = "zte,mf269", "qcom,ipq8074";
-
-	aliases {
-		serial0 = &blsp1_uart5;
-		led-boot = &led_power;
-		led-failsafe = &led_power;
-		led-running = &led_power;
-		led-upgrade = &led_power;
-		label-mac-device = &dp6_syn;
-	};
-
-	chosen {
-		stdout-path = "serial0:115200n8";
-		bootargs-append = " root=/dev/ubiblock0_0";
-	};
-
-	keys {
-		compatible = "gpio-keys";
-		pinctrl-0 = <&button_pins>;
-		pinctrl-names = "default";
-
-		wps {
-			label = "wps";
-			linux,code = <KEY_WPS_BUTTON>;
-			gpios = <&tlmm 37 GPIO_ACTIVE_LOW>;
-		};
-
-		reset {
-			label = "reset";
-			linux,code = <KEY_RESTART>;
-			gpios = <&tlmm 46 GPIO_ACTIVE_LOW>;
-		};
-	};
-
-	leds {
-		compatible = "gpio-leds";
-
-		led_power: power {
-			function = LED_FUNCTION_POWER;
-			color = <LED_COLOR_ID_WHITE>;
-			gpios = <&tlmm 56 GPIO_ACTIVE_HIGH>;
-		};
-	};
-};
-
-&tlmm {
-	button_pins: button_pins {
-		mux {
-			pins = "gpio37", "gpio46";
-			function = "gpio";
-			drive-strength = <8>;
-			bias-pull-up;
-		};
-	};
-
-	i2c_pins: i2c-pins {
-		pins = "gpio21", "gpio22";
-		function = "blsp4_i2c1";
-		drive-strength = <8>;
-		bias-disable;
-	};
-
-	mdio_pins: mdio-pins {
-		mdc {
-			pins = "gpio68";
-			function = "mdc";
-			drive-strength = <8>;
-			bias-pull-up;
-		};
-
-		mdio {
-			pins = "gpio69";
-			function = "mdio";
-			drive-strength = <8>;
-			bias-pull-up;
-		};
-	};
-
-	usb_pwr_pins: usb_pwr_pins {
-		mux {
-			pins = "gpio29";
-			function = "gpio";
-			drive-strength = <8>;
-			bias-disable;
-			output-high;
-		};
-	};
-};
-
-&blsp1_spi1 {
-	pinctrl-0 = <&spi_0_pins>;
-	pinctrl-names = "default";
-	cs-select = <0>;
-	status = "okay";
-
-	flash@0 {
-		compatible = "jedec,spi-nor";
-		#address-cells = <1>;
-		#size-cells = <1>;
-		reg = <0>;
-		spi-max-frequency = <50000000>;
-
-		partitions {
-			compatible = "fixed-partitions";
-			#address-cells = <1>;
-			#size-cells = <1>;
-
-			partition@0 {
-				label = "0:sbl1";
-				reg = <0x0 0x50000>;
-				read-only;
-			};
-
-			partition@50000 {
-				label = "0:mibib";
-				reg = <0x50000 0x10000>;
-				read-only;
-			};
-
-			partition@60000 {
-				label = "0:bootconfig";
-				reg = <0x60000 0x20000>;
-				read-only;
-			};
-
-			partition@80000 {
-				label = "0:bootconfig1";
-				reg = <0x80000 0x20000>;
-				read-only;
-			};
-
-			partition@a0000 {
-				label = "0:qsee";
-				reg = <0xa0000 0x180000>;
-				read-only;
-			};
-
-			partition@220000 {
-				label = "0:qsee_1";
-				reg = <0x220000 0x180000>;
-				read-only;
-			};
-
-			partition@3a0000 {
-				label = "0:devcfg";
-				reg = <0x3a0000 0x10000>;
-				read-only;
-			};
-
-			partition@3b0000 {
-				label = "0:devcfg_1";
-				reg = <0x3b0000 0x10000>;
-				read-only;
-			};
-
-			partition@3c0000 {
-				label = "0:apdp";
-				reg = <0x3c0000 0x10000>;
-				read-only;
-			};
-
-			partition@3d0000 {
-				label = "0:apdp_1";
-				reg = <0x3d0000 0x10000>;
-				read-only;
-			};
-
-			partition@3e0000 {
-				label = "0:rpm";
-				reg = <0x3e0000 0x40000>;
-				read-only;
-			};
-
-			partition@420000 {
-				label = "0:rpm_1";
-				reg = <0x420000 0x40000>;
-				read-only;
-			};
-
-			partition@460000 {
-				label = "0:cdt";
-				reg = <0x460000 0x10000>;
-				read-only;
-			};
-
-			partition@470000 {
-				label = "0:cdt_1";
-				reg = <0x470000 0x10000>;
-				read-only;
-			};
-
-			partition@480000 {
-				label = "0:appsblenv";
-				reg = <0x480000 0x10000>;
-			};
-
-			partition@490000 {
-				label = "0:appsbl";
-				reg = <0x490000 0xc0000>;
-				read-only;
-			};
-
-			partition@550000 {
-				label = "0:appsbl_1";
-				reg = <0x550000 0xc0000>;
-				read-only;
-			};
-
-			partition@610000 {
-				label = "0:art";
-				reg = <0x610000 0x40000>;
-				read-only;
-			};
-
-			partition@650000 {
-				label = "0:ethphyfw";
-				reg = <0x650000 0x80000>;
-				read-only;
-			};
-		};
-	};
-};
-
-&blsp1_i2c5 {
-	pinctrl-0 = <&i2c_pins>;
-	pinctrl-names = "default";
-	status = "okay";
-
-	/* No driver exists */
-	aw9106: gpio-expander@5b {
-		reg = <0x5b>;
-		reset-gpios = <&tlmm 54 GPIO_ACTIVE_HIGH>;
-	};
-};
-
-&blsp1_uart5 {
-	status = "okay";
-};
-
-&cryptobam {
-	status = "okay";
-};
-
-&crypto {
-	status = "okay";
-};
-
-&prng {
-	status = "okay";
-};
-
-&qpic_bam {
-	status = "okay";
-};
-
-&qpic_nand {
-	status = "okay";
-
-	/*
-	 * Bootloader will find the NAND DT node by the compatible and
-	 * then "fixup" it by adding the partitions from the SMEM table
-	 * using the legacy bindings thus making it impossible for us
-	 * to change the partition table or utilize NVMEM for calibration.
-	 * So add a dummy partitions node that bootloader will populate
-	 * and set it as disabled so the kernel ignores it instead of
-	 * printing warnings due to the broken way bootloader adds the
-	 * partitions.
-	 */
-	partitions {
-		status = "disabled";
-	};
-
-	nand@0 {
-		reg = <0>;
-		nand-ecc-strength = <4>;
-		nand-ecc-step-size = <512>;
-		nand-bus-width = <8>;
-
-		partitions {
-			compatible = "fixed-partitions";
-			#address-cells = <1>;
-			#size-cells = <1>;
-
-			partition@0 {
-				label = "fota-flag";
-				reg = <0x0000000 0x00a0000>;
-				read-only;
-			};
-
-			partition@a0000 {
-				label = "mac";
-				reg = <0x00a0000 0x0080000>;
-				read-only;
-
-				nvmem-layout {
-					compatible = "fixed-layout";
-					#address-cells = <1>;
-					#size-cells = <1>;
-
-					macaddr_mac_0: macaddr@0 {
-						compatible = "mac-base";
-						reg = <0x0 0x6>;
-						#nvmem-cell-cells = <1>;
-					};
-				};
-			};
-
-			partition@120000 {
-				label = "cfg-param";
-				reg = <0x0120000 0x1400000>;
-				read-only;
-			};
-
-			partition@1520000 {
-				label = "log";
-				reg = <0x1520000 0x0600000>;
-				read-only;
-			};
-
-			partition@1b20000 {
-				label = "oops";
-				reg = <0x1b20000 0x00a0000>;
-				read-only;
-			};
-
-			partition@1bc0000 {
-				label = "web";
-				reg = <0x1bc0000 0x0800000>;
-				read-only;
-			};
-
-			partition@23c0000 {
-				label = "ubi_kernel";
-				reg = <0x23c0000 0x3400000>;
-			};
-
-			partition@57c0000 {
-				label = "0:wififw";
-				reg = <0x57c0000 0x0800000>;
-				read-only;
-			};
-
-			/* rootfs partition is the result of squashing
-			 * consecutive stock partitions:
-			 * - openwrt_data (25 MiB)
-			 * - data (30 MiB)
-			 * - fota (99 MiB)
-			 */
-			partition@5fc0000 {
-				label = "rootfs";
-				reg = <0x5fc0000 0x9a00000>;
-			};
-		};
-	};
-};
-
-&qusb_phy_0 {
-	status = "okay";
-};
-
-&ssphy_0 {
-	status = "okay";
-};
-
-&usb_0 {
-	pinctrl-0 = <&usb_pwr_pins>;
-	pinctrl-names = "default";
-	status = "okay";
-};
-
-&mdio {
-	status = "okay";
-
-	pinctrl-0 = <&mdio_pins>;
-	pinctrl-names = "default";
-
-	qca8081_24: ethernet-phy@24 {
-		compatible = "ethernet-phy-id004d.d101";
-		reg = <24>;
-		reset-deassert-us = <10000>;
-		reset-gpios = <&tlmm 25 GPIO_ACTIVE_LOW>;
-	};
-
-	qca8081_28: ethernet-phy@28 {
-		compatible = "ethernet-phy-id004d.d101";
-		reg = <28>;
-		reset-deassert-us = <10000>;
-		reset-gpios = <&tlmm 44 GPIO_ACTIVE_LOW>;
-	};
-};
-
-&switch {
-	status = "okay";
-
-	switch_lan_bmp = <0x20>; /* lan port bitmap */
-	switch_wan_bmp = <0x40>; /* wan port bitmap */
-	switch_mac_mode1 = <0xc>; /* mac mode for uniphy instance1*/
-	switch_mac_mode2 = <0xc>; /* mac mode for uniphy instance2*/
-
-	qcom,port_phyinfo {
-		port@5 {
-			port_id = <5>;
-			phy_address = <24>;
-			port_mac_sel = "QGMAC_PORT";
-		};
-		port@6 {
-			port_id = <6>;
-			phy_address = <28>;
-			port_mac_sel = "QGMAC_PORT";
-		};
-	};
-};
-
-&edma {
-	status = "okay";
-};
-
-&dp5_syn {
-	status = "okay";
-	phy-handle = <&qca8081_24>;
-	label = "lan";
-	nvmem-cell-names = "mac-address";
-	nvmem-cells = <&macaddr_mac_0 1>;
-};
-
-&dp6_syn {
-	status = "okay";
-	phy-handle = <&qca8081_28>;
-	label = "wan";
-	nvmem-cell-names = "mac-address";
-	nvmem-cells = <&macaddr_mac_0 0>;
-};
-
-&wifi {
-	status = "okay";
-
-	qcom,ath11k-calibration-variant = "ZTE-MF269";
-	qcom,ath11k-fw-memory-mode = <1>;
-};

+ 0 - 26
devices/qualcommax_ipq807x/diy/target/linux/qualcommax/ipq807x/base-files/etc/hotplug.d/ieee80211/11_fix_wifi_mac

@@ -1,26 +0,0 @@
-[ "$ACTION" == "add" ] || exit 0
-
-PHYNBR=${DEVPATH##*/phy}
-
-[ -n $PHYNBR ] || exit 0
-
-. /lib/functions.sh
-. /lib/functions/system.sh
-
-board=$(board_name)
-
-case "$board" in
-	arcadyan,aw1000)
-		[ "$PHYNBR" = "0" ] && macaddr_add $(get_mac_label) 1 > /sys${DEVPATH}/macaddress
-		[ "$PHYNBR" = "1" ] && macaddr_add $(get_mac_label) 2 > /sys${DEVPATH}/macaddress
-		;;
-	buffalo,wxr-5950ax12)
-		[ "$PHYNBR" = "0" ] && macaddr_add $(get_mac_label)  8 > /sys${DEVPATH}/macaddress
-		[ "$PHYNBR" = "1" ] && macaddr_add $(get_mac_label) 16 > /sys${DEVPATH}/macaddress
-		;;
-	cmcc,rm2-6|\
-	zte,mf269)
-		[ "$PHYNBR" = "0" ] && macaddr_add $(get_mac_label) 2 > /sys${DEVPATH}/macaddress
-		[ "$PHYNBR" = "1" ] && macaddr_add $(get_mac_label) 3 > /sys${DEVPATH}/macaddress
-		;;
-esac

+ 1 - 5
devices/x86_64/diy.sh

@@ -8,13 +8,9 @@ git_clone_path master https://github.com/coolsnowwolf/lede target/linux/x86/file
 
 wget -N https://raw.githubusercontent.com/coolsnowwolf/lede/master/target/linux/x86/base-files/etc/board.d/02_network -P target/linux/x86/base-files/etc/board.d/
 
-wget -N https://raw.githubusercontent.com/coolsnowwolf/lede/master/target/linux/x86/64/config-6.6 -P target/linux/x86/64/
-
-wget -N https://raw.githubusercontent.com/coolsnowwolf/lede/master/package/firmware/linux-firmware/intel.mk -P package/firmware/linux-firmware/
-
 sed -i 's/kmod-r8169/kmod-r8168/' target/linux/x86/image/64.mk
 
-sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += kmod-usb-hid kmod-mmc kmod-sdhci usbutils pciutils lm-sensors-detect kmod-atlantic kmod-vmxnet3 kmod-igbvf kmod-iavf kmod-bnx2x kmod-pcnet32 kmod-tulip kmod-r8101 kmod-r8125 kmod-r8126 kmod-8139cp kmod-8139too kmod-i40e kmod-drm-i915 kmod-drm-amdgpu kmod-mlx4-core kmod-mlx5-core fdisk lsblk kmod-phy-broadcom kmod-ixgbevf/' target/linux/x86/Makefile
+sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += kmod-usb-hid kmod-mmc kmod-sdhci usbutils pciutils lm-sensors-detect kmod-atlantic kmod-vmxnet3 kmod-igbvf kmod-iavf kmod-bnx2x kmod-pcnet32 kmod-tulip kmod-r8101 kmod-r8125 kmod-r8126 kmod-8139cp kmod-8139too kmod-i40e kmod-drm-amdgpu kmod-mlx4-core kmod-mlx5-core fdisk lsblk kmod-phy-broadcom kmod-ixgbevf/' target/linux/x86/Makefile
 
 mv -f tmp/r81* feeds/kiddin9/