[PATCH 12/12] rockchip: puma-rk3399: migrate to u-boot-rockchip-spi.bin

[Kever Yang]

On 2022/7/23 00:06, Quentin Schulz wrote:
> From: Quentin Schulz <quentin.schulz at theobroma-systems.com>
>
> Now that a single binary containing TPL/SPL correctly formatted for SPI
> flashes and U-Boot proper, can be generated by binman, let's do it.
>
> Also update the documentation to tell the user to use this newly
> generated file instead of manually generating and flashing the binaries.
>
> Cc: Quentin Schulz <foss+uboot at 0leil.net>
> Signed-off-by: Quentin Schulz <quentin.schulz at theobroma-systems.com>

Reviewed-by: Kever Yang <kever.yang at rock-chips.com>

Thanks,
- Kever
> ---
>
> Depends on follwing patch series:
> https://lore.kernel.org/u-boot/20220722113505.3875669-1-foss+uboot@0leil.net/
>
>   arch/arm/dts/rk3399-puma-haikou-u-boot.dtsi | 11 +++++++++++
>   board/theobroma-systems/puma_rk3399/README  | 11 ++---------
>   configs/puma-rk3399_defconfig               |  1 +
>   3 files changed, 14 insertions(+), 9 deletions(-)
>
> diff --git a/arch/arm/dts/rk3399-puma-haikou-u-boot.dtsi b/arch/arm/dts/rk3399-puma-haikou-u-boot.dtsi
> index 27a792fe6d..bfc504b952 100644
> --- a/arch/arm/dts/rk3399-puma-haikou-u-boot.dtsi
> +++ b/arch/arm/dts/rk3399-puma-haikou-u-boot.dtsi
> @@ -44,6 +44,17 @@
>   	};
>   };
>   
> +#ifdef CONFIG_ROCKCHIP_SPI_IMAGE
> +&binman {
> +	simple-bin-spi {
> +		blob {
> +			/* same as u-boot,spl-payload-offset */
> +			offset = <0x80000>;
> +		};
> +	};
> +};
> +#endif
> +
>   &gpio1 {
>   	u-boot,dm-pre-reloc;
>   };
> diff --git a/board/theobroma-systems/puma_rk3399/README b/board/theobroma-systems/puma_rk3399/README
> index 2e3785c986..649aa3c543 100644
> --- a/board/theobroma-systems/puma_rk3399/README
> +++ b/board/theobroma-systems/puma_rk3399/README
> @@ -44,17 +44,11 @@ Compile the U-Boot
>     > cd ../u-boot
>     > make CROSS_COMPILE=aarch64-linux-gnu- puma-rk3399_defconfig all
>   
> -Package the image
> -=================
> -
> -Creating an SPL image for SPI-NOR:
> -  > tools/mkimage -n rk3399 -T rkspi -d tpl/u-boot-tpl.bin:spl/u-boot-spl.bin idbloader-spi.img
> -
>   Flash the image
>   ===============
>   
>   Copy u-boot-rockchip.bin to offset 32k for SD/eMMC.
> -Copy the SPL to offset 0 and the FIT image to offset 512k for NOR-Flash.
> +Copy u-boot-rockchip-spi.bin to offset 0 for NOR-flash.
>   
>   SD-Card
>   -------
> @@ -92,5 +86,4 @@ help of the Rockchip loader binary.
>     > cd ..
>     > ./rkdeveloptool db rkbin/rk3399_loader_spinor_v1.25.114.bin
>     > ./rkdeveloptool ef
> -  > ./rkdeveloptool wl 0 ../idbloader-spi.img
> -  > ./rkdeveloptool wl 1024 ../u-boot.itb
> +  > ./rkdeveloptool wl 0 ../u-boot-rockchip-spi.bin
> diff --git a/configs/puma-rk3399_defconfig b/configs/puma-rk3399_defconfig
> index c70dbe9ed5..0f532b2776 100644
> --- a/configs/puma-rk3399_defconfig
> +++ b/configs/puma-rk3399_defconfig
> @@ -9,6 +9,7 @@ CONFIG_ENV_OFFSET=0x3F8000
>   CONFIG_DEFAULT_DEVICE_TREE="rk3399-puma-haikou"
>   CONFIG_ROCKCHIP_RK3399=y
>   CONFIG_ROCKCHIP_BOOT_MODE_REG=0x0
> +CONFIG_ROCKCHIP_SPI_IMAGE=y
>   CONFIG_TARGET_PUMA_RK3399=y
>   CONFIG_DEBUG_UART_BASE=0xFF180000
>   CONFIG_DEBUG_UART_CLOCK=24000000