leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
The offset of the SPL payload on Puma is different than for other
Rockchip devices in that it is stored at offset 256K instead of much
further away in the MMC.

Flashing one binary instead of two at different offsets is much more
user friendly so let's migrate to it by modifying the offset in the Puma
specific Device Tree.

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:30 +02:00 committed by Kever Yang
parent 2169e29c5a
commit 35f571b56c
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/dts/rk3399-puma-haikou-u-boot.dtsi
View File

@ -44,6 +44,14 @@
}; };
}; };
&binman {
simple-bin {
blob {
offset = <((CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR - 64) * 512)>;
};
};
};
&gpio1 { &gpio1 {
u-boot,dm-pre-reloc; u-boot,dm-pre-reloc;
}; };

11
board/theobroma-systems/puma_rk3399/README
View File

@ -47,23 +47,19 @@ Compile the U-Boot
Package the image Package the image
================= =================
The SPL image for SD-Card/eMMC is readily available in idbloader.img at the
root of U-Boot after compilation.
Creating an SPL image for SPI-NOR: 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 > tools/mkimage -n rk3399 -T rkspi -d tpl/u-boot-tpl.bin:spl/u-boot-spl.bin idbloader-spi.img
Flash the image Flash the image
=============== ===============
Copy the SPL to offset 32k and the FIT image to offset 256k for SD/eMMC. 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 the SPL to offset 0 and the FIT image to offset 512k for NOR-Flash.
SD-Card SD-Card
------- -------
> dd if=idbloader.img of=/dev/sdb seek=64 > dd if=u-boot-rockchip.bin of=/dev/sdb seek=64
> dd if=u-boot.itb of=/dev/sdb seek=512
eMMC eMMC
---- ----
@ -79,8 +75,7 @@ help of the Rockchip loader binary.
> ./tools/boot_merger RKBOOT/RK3399MINIALL.ini > ./tools/boot_merger RKBOOT/RK3399MINIALL.ini
> cd .. > cd ..
> ./rkdeveloptool db rkbin/rk3399_loader_v1.25.126.bin > ./rkdeveloptool db rkbin/rk3399_loader_v1.25.126.bin
> ./rkdeveloptool wl 64 ../idbloader.img > ./rkdeveloptool wl 64 ../u-boot-rockchip.bin
> ./rkdeveloptool wl 512 ../u-boot.itb
NOR-Flash NOR-Flash
--------- ---------