[PATCH 1/3] board: theobroma-systems: update instructions for newer Rockchip rkbin

[Kever Yang]

On 2025/7/30 20:46, Quentin Schulz wrote:
> From: Quentin Schulz <quentin.schulz at cherry.de>
>
> The instructions are regularly out of date because the generated or
> prebuilt binaries are updated and the filename doesn't match our
> instructions anymore.
>
> Additionally, since commit 55a95caaef15 ("tools: ddrbin_tool: add
> ddrbin_tool.py and update to v1.21 20241211") end of October 2024,
> ddrbin_tool doesn't exist anymore and has been replaced by
> ddrbin_tool.py python script (which currently isn't an executable) so
> let's update these instructions as well.
>
> Signed-off-by: Quentin Schulz <quentin.schulz at cherry.de>
Reviewed-by: Kever Yang <kever.yang at rock-chips.com>

Thanks,
- Kever
> ---
>   doc/board/theobroma-systems/jaguar_rk3588.rst | 9 ++++-----
>   doc/board/theobroma-systems/puma_rk3399.rst   | 6 ++++--
>   doc/board/theobroma-systems/ringneck_px30.rst | 3 ++-
>   doc/board/theobroma-systems/tiger_rk3588.rst  | 9 ++++-----
>   4 files changed, 14 insertions(+), 13 deletions(-)
>
> diff --git a/doc/board/theobroma-systems/jaguar_rk3588.rst b/doc/board/theobroma-systems/jaguar_rk3588.rst
> index cba4fd066ab8c3575a3e39c7a95c6d84f04909c8..33cd7276852c5b74b750ad14ce2beb4a9440ef3f 100644
> --- a/doc/board/theobroma-systems/jaguar_rk3588.rst
> +++ b/doc/board/theobroma-systems/jaguar_rk3588.rst
> @@ -39,13 +39,12 @@ Get the TF-A and DDR init (TPL) binaries
>   
>      git clone https://github.com/rockchip-linux/rkbin
>      cd rkbin
> -   export RKBIN=$(pwd)
> -   export BL31=$RKBIN/bin/rk35/rk3588_bl31_v1.47.elf
> -   export ROCKCHIP_TPL=$RKBIN/bin/rk35/rk3588_ddr_lp4_2112MHz_lp5_2400MHz_v1.18.bin
> +   export BL31=$(readlink -f bin/rk35/rk3588_bl31_v*.elf | head -1)
> +   export ROCKCHIP_TPL=$(readlink -f bin/rk35/rk3588_ddr_lp4_2112MHz_lp5_2400MHz_v*.bin | head -1)
>      sed -i 's/^uart baudrate=.*$/uart baudrate=115200/' tools/ddrbin_param.txt
> -   ./tools/ddrbin_tool rk3588 tools/ddrbin_param.txt "$ROCKCHIP_TPL"
> +   python3 ./tools/ddrbin_tool.py rk3588 tools/ddrbin_param.txt "$ROCKCHIP_TPL"
>      ./tools/boot_merger RKBOOT/RK3588MINIALL.ini
> -   export RKDB=$RKBIN/rk3588_spl_loader_v1.11.112.bin
> +   export RKDB=$(readlink -f rk3588_spl_loader_v*.bin | head -1)
>   
>   This will setup all required external dependencies for compiling U-Boot. This will
>   be updated in the future once upstream Trusted-Firmware-A supports RK3588 or U-Boot
> diff --git a/doc/board/theobroma-systems/puma_rk3399.rst b/doc/board/theobroma-systems/puma_rk3399.rst
> index a2a5e7bca4b90c7d85084c7e5dd8abb0d5108d4c..1a8d33f188d336d90dfa3966d1fc45eeab87aae9 100644
> --- a/doc/board/theobroma-systems/puma_rk3399.rst
> +++ b/doc/board/theobroma-systems/puma_rk3399.rst
> @@ -95,8 +95,9 @@ To flash U-Boot on the eMMC with ``rkdeveloptool``:
>      git clone https://github.com/rockchip-linux/rkbin.git
>      cd rkbin
>      ./tools/boot_merger RKBOOT/RK3399MINIALL.ini
> +   export RKDB=$(readlink -f rk3399_loader_v*.bin | head -1)
>      cd ..
> -   ./rkdeveloptool db rkbin/rk3399_loader_v1.30.130.bin
> +   ./rkdeveloptool db "$RKDB"
>      ./rkdeveloptool wl 64 ../u-boot-rockchip.bin
>   
>   NOR-Flash
> @@ -121,7 +122,8 @@ To flash U-Boot on the SPI with ``rkdeveloptool``:
>      git clone https://github.com/rockchip-linux/rkbin.git
>      cd rkbin
>      ./tools/boot_merger RKBOOT/RK3399MINIALL_SPINOR.ini
> +   export RKDB=$(readlink -f rk3399_loader_spinor_v*.bin | head -1)
>      cd ..
> -   ./rkdeveloptool db rkbin/rk3399_loader_spinor_v1.30.114.bin
> +   ./rkdeveloptool db "$RKDB"
>      ./rkdeveloptool ef
>      ./rkdeveloptool wl 0 ../u-boot-rockchip-spi.bin
> diff --git a/doc/board/theobroma-systems/ringneck_px30.rst b/doc/board/theobroma-systems/ringneck_px30.rst
> index c16b9ed17edf6e6264d80f38e591b0bc5a0bd4b7..d3feedf6062bb9cd3c8622491d45bc93ff6fbb76 100644
> --- a/doc/board/theobroma-systems/ringneck_px30.rst
> +++ b/doc/board/theobroma-systems/ringneck_px30.rst
> @@ -90,6 +90,7 @@ To flash U-Boot on the eMMC with ``rkdeveloptool``:
>      git clone https://github.com/rockchip-linux/rkbin.git
>      cd rkbin
>      ./tools/boot_merger RKBOOT/PX30MINIALL.ini
> +   export RKDB=$(readlink -f px30_loader_v*.bin | head -1)
>      cd ..
> -   ./rkdeveloptool db rkbin/px30_loader_v2.08.135.bin
> +   ./rkdeveloptool db "$RKDB"
>      ./rkdeveloptool wl 64 ../u-boot-rockchip.bin
> diff --git a/doc/board/theobroma-systems/tiger_rk3588.rst b/doc/board/theobroma-systems/tiger_rk3588.rst
> index 4586b8d8b5a801c7646c5a85ea608e86eb33eb2f..71dbe4c59de8f8b3ccb6ece440a780459db127b1 100644
> --- a/doc/board/theobroma-systems/tiger_rk3588.rst
> +++ b/doc/board/theobroma-systems/tiger_rk3588.rst
> @@ -46,14 +46,13 @@ Get the TF-A and DDR init (TPL) binaries
>   
>      git clone https://github.com/rockchip-linux/rkbin
>      cd rkbin
> -   export RKBIN=$(pwd)
> -   export BL31=$RKBIN/bin/rk35/rk3588_bl31_v1.47.elf
> -   export ROCKCHIP_TPL=$RKBIN/bin/rk35/rk3588_ddr_lp4_2112MHz_lp5_2400MHz_v1.18.bin
> +   export BL31=$(readlink -f bin/rk35/rk3588_bl31_v*.elf | head -1)
> +   export ROCKCHIP_TPL=$(readlink -f bin/rk35/rk3588_ddr_lp4_2112MHz_lp5_2400MHz_v*.bin | head -1)
>      sed -i 's/^uart baudrate=.*$/uart baudrate=115200/' tools/ddrbin_param.txt
>      sed -i 's/^uart iomux=.*$/uart iomux=2/' tools/ddrbin_param.txt
> -   ./tools/ddrbin_tool rk3588 tools/ddrbin_param.txt "$ROCKCHIP_TPL"
> +   python3 ./tools/ddrbin_tool.py rk3588 tools/ddrbin_param.txt "$ROCKCHIP_TPL"
>      ./tools/boot_merger RKBOOT/RK3588MINIALL.ini
> -   export RKDB=$RKBIN/rk3588_spl_loader_v1.11.112.bin
> +   export RKDB=$(readlink -f rk3588_spl_loader_v*.bin | head -1)
>   
>   This will setup all required external dependencies for compiling U-Boot. This will
>   be updated in the future once upstream Trusted-Firmware-A supports RK3588 or U-Boot
>