Hi Simon,
On 2025-02-09 22:14, Simon Glass wrote:
> 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.
This confuses me, to me the image is the output binary image. And the
offset in the image is what SPL_PAD_TO already is referring to.
The help for SPL_PAD_TO mention "Image offset to which the SPL should be
padded before appending the SPL payload.".
I can be fine with changing it to payload location in storage, however
do such mass change in a separate series and with a clear explanation
why SPL_PAD_TO should mean the offset on storage and not offset in the
output binary image written to storage.
With one patch that just add the skip-at-start prop and adjust to use
<(CONFIG_SPL_PAD_TO + 0x8000)> for the offset prop. And put the mass
change to defconfig in a separate patch.
Another option could possible be to use SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR
in a calculation and drop use of the SPL_PAD_TO symbol.
Else this blocks others from adding new boards, and/or will break them
if a defconfig was missed. With a separate series adding a new board can
just reference the smaller series.
Regards,
Jonas
>
> Signed-off-by: Simon Glass <s...@chromium.org>
> ---
>
> 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 +
> configs/anbernic-rgxx3-rk3566_defconfig | 2 +-
> configs/bpi-r2-pro-rk3568_defconfig | 2 +-
> configs/chromebit_mickey_defconfig | 2 +-
> configs/chromebook_bob_defconfig | 2 +-
> configs/chromebook_jerry_defconfig | 2 +-
> configs/chromebook_kevin_defconfig | 2 +-
> configs/chromebook_minnie_defconfig | 2 +-
> configs/chromebook_speedy_defconfig | 2 +-
> configs/cm3588-nas-rk3588_defconfig | 2 +-
> configs/coolpi-4b-rk3588s_defconfig | 2 +-
> configs/coolpi-cm5-evb-rk3588_defconfig | 2 +-
> configs/coolpi-cm5-genbook-rk3588_defconfig | 2 +-
> configs/eaidk-610-rk3399_defconfig | 2 +-
> configs/evb-px30_defconfig | 2 +-
> configs/evb-px5_defconfig | 2 +-
> configs/evb-rk3036_defconfig | 2 +-
> configs/evb-rk3229_defconfig | 2 +-
> configs/evb-rk3288_defconfig | 2 +-
> configs/evb-rk3308_defconfig | 2 +-
> configs/evb-rk3328_defconfig | 2 +-
> configs/evb-rk3399_defconfig | 2 +-
> configs/evb-rk3568_defconfig | 2 +-
> configs/evb-rk3588_defconfig | 2 +-
> configs/ficus-rk3399_defconfig | 2 +-
> configs/firefly-px30_defconfig | 2 +-
> configs/firefly-rk3288_defconfig | 2 +-
> configs/firefly-rk3399_defconfig | 2 +-
> configs/generic-rk3568_defconfig | 2 +-
> configs/generic-rk3588_defconfig | 2 +-
> configs/jaguar-rk3588_defconfig | 2 +-
> configs/khadas-edge-captain-rk3399_defconfig | 2 +-
> configs/khadas-edge-rk3399_defconfig | 2 +-
> configs/khadas-edge-v-rk3399_defconfig | 2 +-
> configs/khadas-edge2-rk3588s_defconfig | 2 +-
> configs/kylin-rk3036_defconfig | 2 +-
> configs/leez-rk3399_defconfig | 2 +-
> configs/lubancat-2-rk3568_defconfig | 2 +-
> configs/miqi-rk3288_defconfig | 2 +-
> configs/mk808_defconfig | 2 +-
> configs/nanopc-t4-rk3399_defconfig | 2 +-
> configs/nanopc-t6-rk3588_defconfig | 2 +-
> configs/nanopi-m4-2gb-rk3399_defconfig | 2 +-
> configs/nanopi-m4-rk3399_defconfig | 2 +-
> configs/nanopi-m4b-rk3399_defconfig | 2 +-
> configs/nanopi-neo4-rk3399_defconfig | 2 +-
> configs/nanopi-r2c-plus-rk3328_defconfig | 2 +-
> configs/nanopi-r2c-rk3328_defconfig | 2 +-
> configs/nanopi-r2s-plus-rk3328_defconfig | 2 +-
> configs/nanopi-r2s-rk3328_defconfig | 2 +-
> configs/nanopi-r3s-rk3566_defconfig | 2 +-
> configs/nanopi-r4s-rk3399_defconfig | 2 +-
> configs/nanopi-r5c-rk3568_defconfig | 2 +-
> configs/nanopi-r5s-rk3568_defconfig | 2 +-
> configs/nanopi-r6c-rk3588s_defconfig | 2 +-
> configs/nanopi-r6s-rk3588s_defconfig | 2 +-
> configs/neu2-io-rv1126_defconfig | 2 +-
> configs/neu6a-io-rk3588_defconfig | 2 +-
> configs/neu6b-io-rk3588_defconfig | 2 +-
> configs/nova-rk3588s_defconfig | 2 +-
> configs/odroid-go2_defconfig | 2 +-
> configs/odroid-m1-rk3568_defconfig | 2 +-
> configs/odroid-m1s-rk3566_defconfig | 2 +-
> configs/odroid-m2-rk3588s_defconfig | 2 +-
> configs/orangepi-3b-rk3566_defconfig | 2 +-
> configs/orangepi-5-plus-rk3588_defconfig | 2 +-
> configs/orangepi-5-rk3588s_defconfig | 2 +-
> configs/orangepi-r1-plus-lts-rk3328_defconfig | 2 +-
> configs/orangepi-r1-plus-rk3328_defconfig | 2 +-
> configs/orangepi-rk3399_defconfig | 2 +-
> configs/phycore-rk3288_defconfig | 2 +-
> configs/pinebook-pro-rk3399_defconfig | 2 +-
> configs/pinephone-pro-rk3399_defconfig | 2 +-
> configs/pinetab2-rk3566_defconfig | 2 +-
> configs/popmetal-rk3288_defconfig | 2 +-
> configs/powkiddy-x55-rk3566_defconfig | 2 +-
> configs/puma-rk3399_defconfig | 2 +-
> configs/px30-core-ctouch2-of10-px30_defconfig | 2 +-
> configs/px30-core-ctouch2-px30_defconfig | 2 +-
> configs/px30-core-edimm2.2-px30_defconfig | 2 +-
> configs/qnap-ts433-rk3568_defconfig | 2 +-
> configs/quartz64-a-rk3566_defconfig | 2 +-
> configs/quartz64-b-rk3566_defconfig | 2 +-
> configs/quartzpro64-rk3588_defconfig | 2 +-
> configs/radxa-cm3-io-rk3566_defconfig | 2 +-
> configs/radxa-e25-rk3568_defconfig | 2 +-
> configs/radxa-zero-3-rk3566_defconfig | 2 +-
> configs/rk3399-generic-ddr3_defconfig | 2 +-
> configs/roc-cc-rk3308_defconfig | 2 +-
> configs/roc-cc-rk3328_defconfig | 2 +-
> configs/roc-pc-mezzanine-rk3399_defconfig | 2 +-
> configs/roc-pc-rk3399_defconfig | 2 +-
> configs/rock-3a-rk3568_defconfig | 2 +-
> configs/rock-3b-rk3568_defconfig | 2 +-
> configs/rock-3c-rk3566_defconfig | 2 +-
> configs/rock-4c-plus-rk3399_defconfig | 2 +-
> configs/rock-4se-rk3399_defconfig | 2 +-
> configs/rock-5-itx-rk3588_defconfig | 2 +-
> configs/rock-5c-rk3588s_defconfig | 2 +-
> configs/rock-pi-4-rk3399_defconfig | 2 +-
> configs/rock-pi-4c-rk3399_defconfig | 2 +-
> configs/rock-pi-e-rk3328_defconfig | 2 +-
> configs/rock-pi-e-v3-rk3328_defconfig | 2 +-
> configs/rock-pi-n10-rk3399pro_defconfig | 2 +-
> configs/rock-pi-n8-rk3288_defconfig | 2 +-
> configs/rock-pi-s-rk3308_defconfig | 2 +-
> configs/rock-s0-rk3308_defconfig | 2 +-
> configs/rock2_defconfig | 2 +-
> configs/rock5a-rk3588s_defconfig | 2 +-
> configs/rock5b-rk3588_defconfig | 2 +-
> configs/rock64-rk3328_defconfig | 2 +-
> configs/rock960-rk3399_defconfig | 2 +-
> configs/rock_defconfig | 2 +-
> configs/rockpro64-rk3399_defconfig | 2 +-
> configs/sige7-rk3588_defconfig | 2 +-
> configs/sonoff-ihost-rv1126_defconfig | 2 +-
> configs/soquartz-blade-rk3566_defconfig | 2 +-
> configs/soquartz-cm4-rk3566_defconfig | 2 +-
> configs/soquartz-model-a-rk3566_defconfig | 2 +-
> configs/tiger-rk3588_defconfig | 2 +-
> configs/tinker-rk3288_defconfig | 2 +-
> configs/tinker-s-rk3288_defconfig | 2 +-
> configs/toybrick-rk3588_defconfig | 2 +-
> configs/turing-rk1-rk3588_defconfig | 2 +-
> configs/vyasa-rk3288_defconfig | 2 +-
> 125 files changed, 125 insertions(+), 124 deletions(-)
>
> diff --git a/arch/arm/dts/rockchip-u-boot.dtsi
> b/arch/arm/dts/rockchip-u-boot.dtsi
> index 0d59aad86bf..937d5a81742 100644
> --- a/arch/arm/dts/rockchip-u-boot.dtsi
> +++ b/arch/arm/dts/rockchip-u-boot.dtsi
> @@ -201,6 +201,7 @@
> simple-bin {
> filename = "u-boot-rockchip.bin";
> pad-byte = <0xff>;
> + skip-at-start = <0x8000>;
>
> #ifndef CONFIG_VPL
> mkimage {
> diff --git a/configs/anbernic-rgxx3-rk3566_defconfig
> b/configs/anbernic-rgxx3-rk3566_defconfig
> index 14c97b4c5bf..972d4c71b14 100644
> --- a/configs/anbernic-rgxx3-rk3566_defconfig
> +++ b/configs/anbernic-rgxx3-rk3566_defconfig
> @@ -28,7 +28,7 @@ CONFIG_BOARD_TYPES=y
> CONFIG_DISPLAY_BOARDINFO_LATE=y
> CONFIG_BOARD_RNG_SEED=y
> CONFIG_SPL_MAX_SIZE=0x40000
> -CONFIG_SPL_PAD_TO=0x7f8000
> +CONFIG_SPL_PAD_TO=0x800000
> CONFIG_SPL_BOARD_INIT=y
> # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
> CONFIG_SPL_POWER=y
[snip]
