Hi Jonas,
On Wed, 5 Feb 2025 at 08:32, Jonas Karlman <jo...@kwiboo.se> wrote:
>
> Hi Simon,
>
> On 2025-02-05 02:55, 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.
>
> I see lots of calculation with +/- 0x8000 in your new VPL binman images,
> are they there to counteract this change?
I count two (for A and B) and no, they are not related.
>
> Please drop this mass change and use a <(CONFIG_SPL_PAD_TO + 0x8000)>
> or similar for binman, and if needed do a mass change at the end or in a
> separate follow-up patch/series.
OK, I'll move this to later and separate out the clean-ups so you can
see the impact.
>
> >
> > Signed-off-by: Simon Glass <s...@chromium.org>
> > ---
> >
> > arch/arm/dts/rockchip-u-boot.dtsi | 2 ++
> > 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/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-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/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-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 +-
> > 121 files changed, 122 insertions(+), 120 deletions(-)
> >
> > diff --git a/arch/arm/dts/rockchip-u-boot.dtsi
> > b/arch/arm/dts/rockchip-u-boot.dtsi
> > index 67cb2c3d165..6871260574d 100644
> > --- a/arch/arm/dts/rockchip-u-boot.dtsi
> > +++ b/arch/arm/dts/rockchip-u-boot.dtsi
> > @@ -209,6 +209,7 @@
> > simple-bin {
> > filename = "u-boot-rockchip.bin";
> > pad-byte = <0xff>;
> > + skip-at-start = <0x8000>;
> >
> > mkimage {
> > filename = "idbloader.img";
> > @@ -244,6 +245,7 @@
> > simple-bin-spi {
> > filename = "u-boot-rockchip-spi.bin";
> > pad-byte = <0xff>;
> > + skip-at-start = <0x8000>;
>
> This is not correct, as stated in the documentation [1]:
>
> Write u-boot-rockchip-spi.bin to offset 0 of SPI flash.
>
> [1] https://docs.u-boot.org/en/latest/board/rockchip/rockchip.html#spi
OK, thanks, will fix.
>
> Regards,
> Jonas
>
> >
> > mkimage {
> > filename = "idbloader-spi.img";
>
> [snip]
Regards,
Simon
