The rockchip image is written to the media at block 64, which is a 32K
offset, so set the skip-at-start property to 0x8000
Update CONFIG_SPL_PAD_TO to point to the offset in the image, since
Binman is dealing with the 'missing' 32K now.
Signed-off-by: Simon Glass <s...@chromium.org>
---
Changes in v5:
- Add to VPL file also
Changes in v2:
- Move this patch to the end of the series
- Drop 0x8000 offset for SPI
arch/arm/dts/rockchip-u-boot.dtsi | 1 +
arch/arm/dts/rockchip-vpl-u-boot.dtsi | 1 +
common/spl/Kconfig | 2 +-
3 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/arch/arm/dts/rockchip-u-boot.dtsi
b/arch/arm/dts/rockchip-u-boot.dtsi
index 7a60f6b4526..3ff75c07121 100644
--- a/arch/arm/dts/rockchip-u-boot.dtsi
+++ b/arch/arm/dts/rockchip-u-boot.dtsi
@@ -171,6 +171,7 @@
simple-bin {
filename = "u-boot-rockchip.bin";
pad-byte = <0xff>;
+ skip-at-start = <0x8000>;
mkimage {
filename = "idbloader.img";
diff --git a/arch/arm/dts/rockchip-vpl-u-boot.dtsi
b/arch/arm/dts/rockchip-vpl-u-boot.dtsi
index ac67b29c57a..66dcf36010e 100644
--- a/arch/arm/dts/rockchip-vpl-u-boot.dtsi
+++ b/arch/arm/dts/rockchip-vpl-u-boot.dtsi
@@ -113,6 +113,7 @@
simple-bin {
filename = "u-boot-rockchip.bin";
pad-byte = <0xff>;
+ skip-at-start = <0x8000>;
alternates-fdt {
fdt-list-dir = "dts/upstream/src/arm64/rockchip";
diff --git a/common/spl/Kconfig b/common/spl/Kconfig
index fb6c90733ee..fa28c18fa48 100644
--- a/common/spl/Kconfig
+++ b/common/spl/Kconfig
@@ -96,7 +96,7 @@ config SPL_MAX_SIZE
config SPL_PAD_TO
hex "Offset to which the SPL should be padded before appending the SPL
payload"
- default 0x7f8000 if ARCH_ROCKCHIP
+ default 0x800000 if ARCH_ROCKCHIP
default 0x31000 if ARCH_MX6 && MX6_OCRAM_256KB
default 0x11000 if ARCH_MX7 || (ARCH_MX6 && !MX6_OCRAM_256KB)
default 0x10000 if ARCH_KEYSTONE
--
2.43.0
