orangepi4-lts: update blobs and add rk35xx_packages fetch

external/config/boards/orangepi4-lts.conf

@@ -10,4 +10,4 @@ BOOT_FDT_FILE="rockchip/rk3399-orangepi-4-lts.dtb"
 DISTRIB_TYPE_LEGACY="buster"
 DISTRIB_TYPE_CURRENT="bookworm jammy bullseye focal"
 DISTRIB_TYPE_NEXT="jammy"
-REVISION="3.1.0"
+REVISION="3.1.2"

external/config/sources/families/rk3399.conf

@@ -7,7 +7,6 @@ ASOUND_STATE="asound.state.rk3399"
 BOOTBRANCH="branch:v2020.04-rockchip64"
 LINUXCONFIG='linux-rk3399-'$BRANCH
 LINUXFAMILY=rk3399
-OVERLAY_PREFIX="rk3399"
 
 case $BRANCH in
 
@@ -44,7 +43,7 @@ case $BRANCH in
 
 	current)
 
-		BOOTBRANCH="branch:v2017.09-rk3588"
+		BOOTBRANCH="branch:v2020.10-rockchip64"
 		KERNELBRANCH='branch:orange-pi-5.10-rk35xx'
 		LINUXCONFIG='linux-5.10-rk3399'
 		[[ ${BOARD} == orangepi4-lts ]] && ASOUND_STATE='asound.state.orangepi4-es8316'
@@ -63,10 +62,11 @@ esac
 
 if [[ $BOARD =~ orangepi4|orangepi4-lts|orangepi800 ]]; then
 
-	BOOT_SCENARIO="${BOOT_SCENARIO:=spl-blobs}"
-	DDR_BLOB='rk33/rk3399_ddr_933MHz_v1.24.bin'
-	BL31_BLOB='rk33/rk3399_bl31_v1.30.elf'
-	BOOT_SCENARIO="${BOOT_SCENARIO:=spl-blobs}"
+	BOOT_USE_BLOBS=yes
+	DDR_BLOB='rk33/rk3399_ddr_933MHz_v1.30.bin'
+	MINILOADER_BLOB='rk33/rk3399_miniloader_v1.19.bin'
+	BL31_BLOB='rk33/rk3399_bl31_v1.36.elf'
+
 else
 
 	BOOT_USE_BLOBS=yes

scripts/main.sh

@@ -462,6 +462,7 @@ if [[ ${IGNORE_UPDATES} != yes ]]; then
 	if [[ "${BOARD}x" =~ orangepi4x|orangepi4-ltsx|orangepi800x && $RELEASE =~ focal|buster|bullseye|bookworm ]]; then
 
 		[[ ${BUILD_OPT} == image ]] && fetch_from_repo "https://github.com/orangepi-xunlong/rk-rootfs-build.git" "${EXTER}/cache/sources/rk-rootfs-build-${RELEASE}" "branch:rk-rootfs-build-${RELEASE}"
+		[[ ${BUILD_OPT} == image ]] && fetch_from_repo "https://github.com/orangepi-xunlong/rk-rootfs-build.git" "${EXTER}/cache/sources/rk35xx_packages" "branch:rk35xx_packages"
 
 	fi