rockchip: puma-rk3399: migrate to u-boot-rockchip-spi.bin

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@0leil.net>
Signed-off-by: Quentin Schulz <quentin.schulz@theobroma-systems.com>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
This commit is contained in:
Quentin Schulz 2022-09-15 11:14:32 +02:00 committed by Kever Yang
parent 35f571b56c
commit bd9b4ac9c5
3 changed files with 12 additions and 9 deletions

View File

@ -50,6 +50,15 @@
offset = <((CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR - 64) * 512)>;
};
};
#ifdef CONFIG_ROCKCHIP_SPI_IMAGE
simple-bin-spi {
blob {
/* same as u-boot,spl-payload-offset */
offset = <0x80000>;
};
};
#endif
};
&gpio1 {

View File

@ -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

View File

@ -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