diff --git a/config/sources/families/include/rockchip64_common.inc b/config/sources/families/include/rockchip64_common.inc index b669a6280efc..22e180fd4f7d 100644 --- a/config/sources/families/include/rockchip64_common.inc +++ b/config/sources/families/include/rockchip64_common.inc @@ -74,6 +74,10 @@ CPUMIN=${CPUMIN:="408000"} # BOOT_SOC_MKIMAGE defaults to BOOT_SOC, but can be overriden. See rk3566 declare -g BOOT_SOC_MKIMAGE="${BOOT_SOC}" +# LOADER_UBOOT_OFFSET defaults to 0x200000, but can be overriden. See rk3308 +# It only take effects while $BOOT_SCENARIO == 'only-blobs' +declare -g LOADER_UBOOT_OFFSET="0x200000" + case "$BOOT_SOC" in rk3308) CPUMAX=${CPUMAX:="1296000"} @@ -81,6 +85,7 @@ case "$BOOT_SOC" in DDR_BLOB="${DDR_BLOB:-"rk33/rk3308_ddr_589MHz_uart2_m1_v1.30.bin"}" MINILOADER_BLOB="${MINILOADER_BLOB:-"rk33/rk3308_miniloader_v1.22.bin"}" BL31_BLOB="${BL31_BLOB:-"rk33/rk3308_bl31_v2.22.elf"}" + LOADER_UBOOT_OFFSET="0x600000" # rk3308 loader has a quirky uboot offset 0x600000 ;; rk3328) @@ -237,7 +242,7 @@ uboot_custom_postprocess() { tempfile=$(mktemp) run_host_command_logged tools/mkimage -n "${BOOT_SOC_MKIMAGE}" -T rksd -d $RKBIN_DIR/$DDR_BLOB idbloader.bin cat $RKBIN_DIR/$MINILOADER_BLOB >> idbloader.bin - run_host_x86_binary_logged $RKBIN_DIR/tools/loaderimage --pack --uboot ./u-boot-dtb.bin uboot.img 0x200000 + run_host_x86_binary_logged $RKBIN_DIR/tools/loaderimage --pack --uboot ./u-boot-dtb.bin uboot.img ${LOADER_UBOOT_OFFSET} run_host_x86_binary_logged $RKBIN_DIR/tools/trust_merger --replace bl31.elf $RKBIN_DIR/$BL31_BLOB trust.ini ;;