Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mediatek: mt7622: convert unifi6lr-v{1,2,3}-ubootmod to fitblk

Browse source 
No bootloader changes needed in this case, smooth transition.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
This commit is contained in:
Daniel Golle 2024-01-22 00:56:47 +00:00
parent 208f6c1232
commit 41c053141e
6 changed files with 33 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
package/boot/uboot-envtools/files/mediatek_mt7622
View file

@ -52,8 +52,10 @@ buffalo,wsr-2533dhp2)
ruijie,rg-ew3200gx-pro) ruijie,rg-ew3200gx-pro)
ubootenv_add_uci_config "/dev/mtd3" "0x0" "0x20000" "0x20000" ubootenv_add_uci_config "/dev/mtd3" "0x0" "0x20000" "0x20000"
;; ;;
ubnt,unifi-6-lr-ubootmod) ubnt,unifi-6-lr-v1-ubootmod|\
ubootenv_add_uci_config "/dev/mtd2" "0x0" "0x4000" "0x1000" ubnt,unifi-6-lr-v2-ubootmod|\
ubnt,unifi-6-lr-v3-ubootmod)
ubootenv_add_uci_config "/dev/mtd$(find_mtd_index "u-boot-env")" "0x0" "0x4000" "0x1000"
;; ;;
xiaomi,redmi-router-ax6s) xiaomi,redmi-router-ax6s)
ubootenv_add_uci_config "/dev/mtd3" "0x0" "0x10000" "0x40000" ubootenv_add_uci_config "/dev/mtd3" "0x0" "0x10000" "0x40000"

7
target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr-v1-ubootmod.dts
View file

@ -5,6 +5,11 @@
/ { / {
model = "Ubiquiti UniFi 6 LR v1 (U-Boot mod)"; model = "Ubiquiti UniFi 6 LR v1 (U-Boot mod)";
compatible = "ubnt,unifi-6-lr-v1-ubootmod", "mediatek,mt7622"; compatible = "ubnt,unifi-6-lr-v1-ubootmod", "mediatek,mt7622";
chosen {
rootdisk = <&rootdisk>;
bootargs = "earlycon=uart8250,mmio32,0x11002000 swiotlb=512 console=ttyS0,115200n8 root=/dev/fit0";
};
}; };
&nor_partitions { &nor_partitions {
@ -54,7 +59,7 @@
reg = <0x120000 0xee0000>; reg = <0x120000 0xee0000>;
}; };
partition@1000000 { rootdisk: partition@1000000 {
compatible = "denx,fit"; compatible = "denx,fit";
label = "firmware"; label = "firmware";
reg = <0x1000000 0x3000000>; reg = <0x1000000 0x3000000>;

7
target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr-v2-ubootmod.dts
View file

@ -5,6 +5,11 @@
/ { / {
model = "Ubiquiti UniFi 6 LR v2 (U-Boot mod)"; model = "Ubiquiti UniFi 6 LR v2 (U-Boot mod)";
compatible = "ubnt,unifi-6-lr-v2-ubootmod", "mediatek,mt7622"; compatible = "ubnt,unifi-6-lr-v2-ubootmod", "mediatek,mt7622";
chosen {
rootdisk = <&rootdisk>;
bootargs = "earlycon=uart8250,mmio32,0x11002000 swiotlb=512 console=ttyS0,115200n8 root=/dev/fit0";
};
}; };
&nor_partitions { &nor_partitions {
@ -54,7 +59,7 @@
reg = <0x120000 0xee0000>; reg = <0x120000 0xee0000>;
}; };
partition@1000000 { rootdisk: partition@1000000 {
compatible = "denx,fit"; compatible = "denx,fit";
label = "firmware"; label = "firmware";
reg = <0x1000000 0x3000000>; reg = <0x1000000 0x3000000>;

7
target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr-v3-ubootmod.dts
View file

@ -5,6 +5,11 @@
/ { / {
model = "Ubiquiti UniFi 6 LR v3 (U-Boot mod)"; model = "Ubiquiti UniFi 6 LR v3 (U-Boot mod)";
compatible = "ubnt,unifi-6-lr-v3-ubootmod", "mediatek,mt7622"; compatible = "ubnt,unifi-6-lr-v3-ubootmod", "mediatek,mt7622";
chosen {
rootdisk = <&rootdisk>;
bootargs = "earlycon=uart8250,mmio32,0x11002000 swiotlb=512 console=ttyS0,115200n8 root=/dev/fit0";
};
}; };
&nor_partitions { &nor_partitions {
@ -54,7 +59,7 @@
reg = <0x120000 0xee0000>; reg = <0x120000 0xee0000>;
}; };
partition@1000000 { rootdisk: partition@1000000 {
compatible = "denx,fit"; compatible = "denx,fit";
label = "firmware"; label = "firmware";
reg = <0x1000000 0x3000000>; reg = <0x1000000 0x3000000>;

6
target/linux/mediatek/image/mt7622.mk
View file

@ -375,7 +375,7 @@ define Device/ubnt_unifi-6-lr-v1-ubootmod
DEVICE_VARIANT := v1 U-Boot mod DEVICE_VARIANT := v1 U-Boot mod
DEVICE_DTS := mt7622-ubnt-unifi-6-lr-v1-ubootmod DEVICE_DTS := mt7622-ubnt-unifi-6-lr-v1-ubootmod
DEVICE_DTS_DIR := ../dts DEVICE_DTS_DIR := ../dts
DEVICE_PACKAGES := kmod-mt7915-firmware kmod-leds-ubnt-ledbar DEVICE_PACKAGES := fitblk kmod-mt7915-firmware kmod-leds-ubnt-ledbar
KERNEL := kernel-bin | lzma KERNEL := kernel-bin | lzma
KERNEL_INITRAMFS_SUFFIX := -recovery.itb KERNEL_INITRAMFS_SUFFIX := -recovery.itb
KERNEL_INITRAMFS := kernel-bin | lzma | fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k KERNEL_INITRAMFS := kernel-bin | lzma | fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k
@ -405,7 +405,7 @@ define Device/ubnt_unifi-6-lr-v2-ubootmod
DEVICE_VARIANT := v2 U-Boot mod DEVICE_VARIANT := v2 U-Boot mod
DEVICE_DTS := mt7622-ubnt-unifi-6-lr-v2-ubootmod DEVICE_DTS := mt7622-ubnt-unifi-6-lr-v2-ubootmod
DEVICE_DTS_DIR := ../dts DEVICE_DTS_DIR := ../dts
DEVICE_PACKAGES := kmod-mt7915-firmware DEVICE_PACKAGES := fitblk kmod-mt7915-firmware
KERNEL := kernel-bin | lzma KERNEL := kernel-bin | lzma
KERNEL_INITRAMFS_SUFFIX := -recovery.itb KERNEL_INITRAMFS_SUFFIX := -recovery.itb
KERNEL_INITRAMFS := kernel-bin | lzma | fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k KERNEL_INITRAMFS := kernel-bin | lzma | fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k
@ -434,7 +434,7 @@ define Device/ubnt_unifi-6-lr-v3-ubootmod
DEVICE_VARIANT := v3 U-Boot mod DEVICE_VARIANT := v3 U-Boot mod
DEVICE_DTS := mt7622-ubnt-unifi-6-lr-v3-ubootmod DEVICE_DTS := mt7622-ubnt-unifi-6-lr-v3-ubootmod
DEVICE_DTS_DIR := ../dts DEVICE_DTS_DIR := ../dts
DEVICE_PACKAGES := kmod-mt7915-firmware DEVICE_PACKAGES := fitblk kmod-mt7915-firmware
KERNEL := kernel-bin | lzma KERNEL := kernel-bin | lzma
KERNEL_INITRAMFS_SUFFIX := -recovery.itb KERNEL_INITRAMFS_SUFFIX := -recovery.itb
KERNEL_INITRAMFS := kernel-bin | lzma | fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k KERNEL_INITRAMFS := kernel-bin | lzma | fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k

9
target/linux/mediatek/mt7622/base-files/lib/upgrade/platform.sh
View file

@ -21,7 +21,10 @@ platform_do_upgrade() {
local file_type=$(identify $1) local file_type=$(identify $1)
case "$board" in case "$board" in
bananapi,bpi-r64) bananapi,bpi-r64|\
ubnt,unifi-6-lr-v1-ubootmod|\
ubnt,unifi-6-lr-v2-ubootmod|\
ubnt,unifi-6-lr-v3-ubootmod)
[ -e /dev/fit0 ] && fitblk /dev/fit0 [ -e /dev/fit0 ] && fitblk /dev/fit0
[ -e /dev/fitrw ] && fitblk /dev/fitrw [ -e /dev/fitrw ] && fitblk /dev/fitrw
bootdev="$(platform_get_bootdev)" bootdev="$(platform_get_bootdev)"
@ -30,6 +33,10 @@ platform_do_upgrade() {
EMMC_KERN_DEV="/dev/$bootdev" EMMC_KERN_DEV="/dev/$bootdev"
emmc_do_upgrade "$1" emmc_do_upgrade "$1"
;; ;;
mtdblock*)
PART_NAME="/dev/mtd${bootdev:8}"
default_do_upgrade "$1"
;;
ubiblock*) ubiblock*)
CI_KERNPART="fit" CI_KERNPART="fit"
nand_do_upgrade "$1" nand_do_upgrade "$1"