ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2025-02-06 11:09:31 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

mediatek: switch to fitblk for JDCloud RE-CP-03

Browse Source 
Use the new fitblk driver.

Tested-By: Yangyu Chen <cyy@cyyself.name>
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
Tianling Shen 2024-04-02 18:53:29 +08:00 committed by Daniel Golle
parent 4b04304713
commit 790082098e
No known key found for this signature in database
GPG Key ID: 97EF37B2ABE172CB
4 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
package/boot/uboot-envtools/files/mediatek_filogic
View File

@ -38,7 +38,8 @@ asus,rt-ax59u)
;; ;;
bananapi,bpi-r3|\ bananapi,bpi-r3|\
bananapi,bpi-r3-mini|\ bananapi,bpi-r3-mini|\
bananapi,bpi-r4) bananapi,bpi-r4|\
jdcloud,re-cp-03)
. /lib/upgrade/common.sh . /lib/upgrade/common.sh
bootdev="$(fitblk_get_bootdev)" bootdev="$(fitblk_get_bootdev)"
@ -98,11 +99,6 @@ glinet,gl-mt6000)
glinet,gl-mt3000) glinet,gl-mt3000)
ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x80000" "0x20000" ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x80000" "0x20000"
;; ;;
jdcloud,re-cp-03)
local envdev=$(find_mmc_part "ubootenv" "mmcblk0")
ubootenv_add_uci_config "$envdev" "0x0" "0x40000" "0x40000" "1"
ubootenv_add_uci_config "$envdev" "0x40000" "0x40000" "0x40000" "1"
;;
mercusys,mr90x-v1|\ mercusys,mr90x-v1|\
routerich,ax3000) routerich,ax3000)
local envdev=/dev/mtd$(find_mtd_index "u-boot-env") local envdev=/dev/mtd$(find_mtd_index "u-boot-env")

2
package/boot/uboot-mediatek/patches/441-add-jdcloud_re-cp-03.patch
View File

@ -271,7 +271,7 @@
+serverip=192.168.1.254 +serverip=192.168.1.254
+loadaddr=0x46000000 +loadaddr=0x46000000
+console=earlycon=uart8250,mmio32,0x11002000 console=ttyS0 +console=earlycon=uart8250,mmio32,0x11002000 console=ttyS0
+bootargs=root=/dev/mmcblk0p65 +bootargs=root=/dev/fit0 rootwait
+bootcmd=if pstore check ; then run boot_recovery ; else run boot_emmc ; fi +bootcmd=if pstore check ; then run boot_recovery ; else run boot_emmc ; fi
+bootconf=config-1 +bootconf=config-1
+bootdelay=0 +bootdelay=0

16
target/linux/mediatek/dts/mt7986a-jdcloud-re-cp-03.dts
View File

@ -23,7 +23,9 @@
}; };
chosen { chosen {
bootargs-override = "root=/dev/fit0 rootwait";
stdout-path = "serial0:115200n8"; stdout-path = "serial0:115200n8";
rootdisk = <&emmc_rootdisk>;
}; };
memory@40000000 { memory@40000000 {
@ -157,6 +159,20 @@
vmmc-supply = <&reg_3p3v>; vmmc-supply = <&reg_3p3v>;
vqmmc-supply = <&reg_1p8v>; vqmmc-supply = <&reg_1p8v>;
status = "okay"; status = "okay";
card@0 {
compatible = "mmc-card";
reg = <0>;
block {
compatible = "block-device";
partitions {
emmc_rootdisk: block-partition-production {
partname = "production";
};
};
};
};
}; };
&pio { &pio {

5
target/linux/mediatek/filogic/base-files/lib/upgrade/platform.sh
View File

@ -83,6 +83,7 @@ platform_do_upgrade() {
bananapi,bpi-r3|\ bananapi,bpi-r3|\
bananapi,bpi-r3-mini|\ bananapi,bpi-r3-mini|\
bananapi,bpi-r4|\ bananapi,bpi-r4|\
jdcloud,re-cp-03|\
tplink,tl-xdr4288|\ tplink,tl-xdr4288|\
tplink,tl-xdr6086|\ tplink,tl-xdr6086|\
tplink,tl-xdr6088|\ tplink,tl-xdr6088|\
@ -140,10 +141,6 @@ platform_do_upgrade() {
CI_KERNPART="fit" CI_KERNPART="fit"
nand_do_upgrade "$1" nand_do_upgrade "$1"
;; ;;
jdcloud,re-cp-03)
CI_KERNPART="production"
emmc_do_upgrade "$1"
;;
mercusys,mr90x-v1) mercusys,mr90x-v1)
CI_UBIPART="ubi0" CI_UBIPART="ubi0"
nand_do_upgrade "$1" nand_do_upgrade "$1"