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 <[email protected]> --- (no changes since v6) Changes in v6: - Update CONFIG_SPL_PAD_TO for puma-rk3399 and ringneck-px30 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 +- configs/puma-rk3399_defconfig | 2 +- configs/ringneck-px30_defconfig | 2 +- 5 files changed, 5 insertions(+), 3 deletions(-) diff --git a/arch/arm/dts/rockchip-u-boot.dtsi b/arch/arm/dts/rockchip-u-boot.dtsi index 7ca2d6d7663..e300d7bc051 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 4b256abe6af..2cf0f03accb 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -88,7 +88,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 diff --git a/configs/puma-rk3399_defconfig b/configs/puma-rk3399_defconfig index 09b965d4637..7a129b7389a 100644 --- a/configs/puma-rk3399_defconfig +++ b/configs/puma-rk3399_defconfig @@ -23,7 +23,7 @@ CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-puma-haikou.dtb" CONFIG_CONSOLE_MUX=y CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_MAX_SIZE=0x2e000 -CONFIG_SPL_PAD_TO=0x38000 +CONFIG_SPL_PAD_TO=0x40000 # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x200 CONFIG_SPL_I2C=y diff --git a/configs/ringneck-px30_defconfig b/configs/ringneck-px30_defconfig index 75646935105..ca7c143fe17 100644 --- a/configs/ringneck-px30_defconfig +++ b/configs/ringneck-px30_defconfig @@ -26,7 +26,7 @@ CONFIG_DEFAULT_FDT_FILE="rockchip/px30-ringneck-haikou.dtb" CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_MISC_INIT_R=y CONFIG_SPL_MAX_SIZE=0x20000 -CONFIG_SPL_PAD_TO=0x38000 +CONFIG_SPL_PAD_TO=0x40000 CONFIG_SPL_BOARD_INIT=y CONFIG_SPL_BOOTROM_SUPPORT=y # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set -- 2.43.0
