diff --git a/package/boot/uboot-envtools/files/ipq807x b/package/boot/uboot-envtools/files/ipq807x index 54ac6a1064..5c5b77089a 100644 --- a/package/boot/uboot-envtools/files/ipq807x +++ b/package/boot/uboot-envtools/files/ipq807x @@ -24,6 +24,7 @@ edimax,cax1800) ubootenv_add_uci_config "/dev/mtd$idx" "0x0" "0x10000" "0x20000" ;; redmi,ax6|\ +redmi,ax6-stock|\ xiaomi,ax3600|\ xiaomi,ax3600-stock|\ xiaomi,ax9000) diff --git a/target/linux/ipq807x/base-files/etc/board.d/01_leds b/target/linux/ipq807x/base-files/etc/board.d/01_leds index a6932d9f47..a2439502e0 100644 --- a/target/linux/ipq807x/base-files/etc/board.d/01_leds +++ b/target/linux/ipq807x/base-files/etc/board.d/01_leds @@ -10,6 +10,7 @@ edgecore,eap102) ucidef_set_led_netdev "wan" "WAN" "green:wanpoe" "wan" ;; redmi,ax6|\ +redmi,ax6-stock|\ xiaomi,ax3600|\ xiaomi,ax3600-stock) ucidef_set_led_netdev "wan" "WAN" "blue:network" "wan" diff --git a/target/linux/ipq807x/base-files/etc/board.d/02_network b/target/linux/ipq807x/base-files/etc/board.d/02_network index ffed60c1a6..004ab4fdc6 100644 --- a/target/linux/ipq807x/base-files/etc/board.d/02_network +++ b/target/linux/ipq807x/base-files/etc/board.d/02_network @@ -24,6 +24,7 @@ ipq807x_setup_interfaces() ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4 10g-2" "10g-1" ;; redmi,ax6|\ + redmi,ax6-stock|\ xiaomi,ax3600|\ xiaomi,ax3600-stock) ucidef_set_interfaces_lan_wan "lan1 lan2 lan3" "wan" diff --git a/target/linux/ipq807x/base-files/etc/hotplug.d/firmware/11-ath11k-caldata b/target/linux/ipq807x/base-files/etc/hotplug.d/firmware/11-ath11k-caldata index a77ab645d4..524211ef43 100644 --- a/target/linux/ipq807x/base-files/etc/hotplug.d/firmware/11-ath11k-caldata +++ b/target/linux/ipq807x/base-files/etc/hotplug.d/firmware/11-ath11k-caldata @@ -14,6 +14,7 @@ case "$FIRMWARE" in dynalink,dl-wrx36|\ qnap,301w|\ redmi,ax6|\ + redmi,ax6-stock|\ xiaomi,ax3600|\ xiaomi,ax3600-stock|\ xiaomi,ax9000) diff --git a/target/linux/ipq807x/base-files/etc/init.d/bootcount b/target/linux/ipq807x/base-files/etc/init.d/bootcount index 5d8c537585..d79e79a53d 100755 --- a/target/linux/ipq807x/base-files/etc/init.d/bootcount +++ b/target/linux/ipq807x/base-files/etc/init.d/bootcount @@ -9,6 +9,7 @@ boot() { # Unset changed flag after sysupgrade complete fw_setenv changed ;; + redmi,ax6-stock|\ xiaomi,ax3600-stock) # OTA handling should not be used. Reset it just in case. fw_setenv flag_ota_reboot 0 diff --git a/target/linux/ipq807x/base-files/lib/upgrade/platform.sh b/target/linux/ipq807x/base-files/lib/upgrade/platform.sh index 18099a1fc4..2662fc717a 100644 --- a/target/linux/ipq807x/base-files/lib/upgrade/platform.sh +++ b/target/linux/ipq807x/base-files/lib/upgrade/platform.sh @@ -85,6 +85,7 @@ platform_do_upgrade() { CI_ROOT_UBIPART="rootfs" nand_do_upgrade "$1" ;; + redmi,ax6-stock|\ xiaomi,ax3600-stock) part_num="$(fw_printenv -n flag_boot_rootfs)" if [ "$part_num" -eq "1" ]; then diff --git a/target/linux/ipq807x/files/arch/arm64/boot/dts/qcom/ipq8071-ax6-stock.dts b/target/linux/ipq807x/files/arch/arm64/boot/dts/qcom/ipq8071-ax6-stock.dts new file mode 100644 index 0000000000..fc63acf058 --- /dev/null +++ b/target/linux/ipq807x/files/arch/arm64/boot/dts/qcom/ipq8071-ax6-stock.dts @@ -0,0 +1,56 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + +#include "ipq8071-ax6.dts" + +/ { + model = "Redmi AX6 (stock layout)"; + compatible = "redmi,ax6-stock", "qcom,ipq8074"; + + aliases { + /* Aliases as required by u-boot to patch MAC addresses */ + ethernet1 = &dp2; + ethernet2 = &dp3; + ethernet3 = &dp4; + ethernet4 = &dp5; + }; + + chosen { + bootargs-append = " root=/dev/ubiblock0_1"; + }; +}; + +&qpic_nand { + /delete-node/ partitions; + /delete-node/ nand@0; + + nand@0 { + reg = <0>; + nand-ecc-strength = <4>; + nand-ecc-step-size = <512>; + nand-bus-width = <8>; + + partitions { + compatible = "qcom,smem-part"; + }; + }; +}; + +&dp2 { + /delete-property/ nvmem-cells; + /delete-property/ nvmem-cell-names; +}; + +&dp3 { + /delete-property/ nvmem-cells; + /delete-property/ nvmem-cell-names; +}; + +&dp4 { + /delete-property/ nvmem-cells; + /delete-property/ nvmem-cell-names; +}; + +&dp5 { + /delete-property/ nvmem-cells; + /delete-property/ nvmem-cell-names; +}; diff --git a/target/linux/ipq807x/image/generic.mk b/target/linux/ipq807x/image/generic.mk index 8b9b7af5a2..6ed0cc5c1f 100644 --- a/target/linux/ipq807x/image/generic.mk +++ b/target/linux/ipq807x/image/generic.mk @@ -80,6 +80,14 @@ define Device/redmi_ax6 endef TARGET_DEVICES += redmi_ax6 +define Device/redmi_ax6-stock + $(call Device/redmi_ax6) + DEVICE_VARIANT := (stock layout) + KERNEL_SIZE := + ARTIFACTS := +endef +TARGET_DEVICES += redmi_ax6-stock + define Device/xiaomi_ax3600 $(call Device/FitImage) $(call Device/UbiFit)