From 36c57dd881d2028ba54334b4db7e772f3f59d02a Mon Sep 17 00:00:00 2001 From: baiywt Date: Wed, 8 May 2024 20:58:49 +0800 Subject: [PATCH] opi5pro/5max: update ddrbin to v1.16 --- external/config/boards/orangepi5pro.conf | 2 +- .../sources/families/include/rockchip64_common.inc | 10 ++++++++-- scripts/main.sh | 3 +-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/external/config/boards/orangepi5pro.conf b/external/config/boards/orangepi5pro.conf index c5e4c04437b2..41aed0008d6b 100644 --- a/external/config/boards/orangepi5pro.conf +++ b/external/config/boards/orangepi5pro.conf @@ -12,4 +12,4 @@ SKIP_BOOTSPLASH="yes" # Skip boot splash patch, conflicts with CONFIG_VT=yes DISTRIB_TYPE_LEGACY="bullseye bookworm bionic focal jammy" DISTRIB_TYPE_CURRENT="bullseye bookworm jammy" BOOTFS_TYPE="fat" -REVISION="1.0.0" +REVISION="1.0.2" diff --git a/external/config/sources/families/include/rockchip64_common.inc b/external/config/sources/families/include/rockchip64_common.inc index eb6cb2383bf6..f4ce787f24c0 100644 --- a/external/config/sources/families/include/rockchip64_common.inc +++ b/external/config/sources/families/include/rockchip64_common.inc @@ -61,8 +61,14 @@ if [[ $BOARD =~ orangepir1plus|orangepir1plus-lts ]]; then elif [[ $BOARDFAMILY == "rockchip-rk3588" ]]; then BOOT_SCENARIO="${BOOT_SCENARIO:=spl-blobs}" - DDR_BLOB="${DDR_BLOB:=rk35/rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.15.bin}" - BL31_BLOB='rk35/rk3588_bl31_v1.44.elf' + + if [[ "${BOARD}x" =~ orangepi5maxx|orangepi5prox ]]; then + DDR_BLOB="${DDR_BLOB:=rk35/rk3588_ddr_lp4_2112MHz_lp5_2400MHz_v1.16.bin}" + BL31_BLOB='rk35/rk3588_bl31_v1.45_20240422.elf' + else + DDR_BLOB="${DDR_BLOB:=rk35/rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.11.bin}" + BL31_BLOB='rk35/rk3588_bl31_v1.38.elf' + fi elif [[ $BOARD =~ orangepicm4|orangepi3b ]]; then diff --git a/scripts/main.sh b/scripts/main.sh index 2259444ac82a..9d0baea99908 100755 --- a/scripts/main.sh +++ b/scripts/main.sh @@ -505,8 +505,7 @@ if [[ ${IGNORE_UPDATES} != yes ]]; then if [[ ${BOARDFAMILY} == "rockchip-rk3588" ]]; then local rkbin_url="https://github.com/orangepi-xunlong/rk-rootfs-build/raw/rkbin/rk35" - wget -qnc -P ${EXTER}/cache/sources/rkbin-tools/rk35/ ${rkbin_url}/rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.15.bin - wget -qnc -P ${EXTER}/cache/sources/rkbin-tools/rk35/ ${rkbin_url}/rk3588_bl31_v1.44.elf + wget -qnc -P ${EXTER}/cache/sources/rkbin-tools/rk35/ ${rkbin_url}/rk3588_bl31_v1.45_20240422.elf fi fi