[PATCH v2 0/7] migrate u-boot-rockchip.bin to binman and generate an image for SPI

Quentin Schulz foss+uboot at 0leil.net
Fri Jul 22 13:34:58 CEST 2022


From: Quentin Schulz <quentin.schulz at theobroma-systems.com>

This migrates the generation of u-boot-rockchip.bin from Makefile to binman
completely. There is therefore no idbloader.img anymore as it is created on
the fly by binman.

This also adds support for generating the same kind of image than
u-boot-rockchip.bin but for SPI flashes (specifically, a different image
type generated by mkimage is necessary, in addition to a different
offset in the storage medium).

This has been tested on Puma RK3399 with patches soon to be sent to the
ML.

This also helped removing the hardcoded value for the u-boot.itb offset
in u-boot-rockchip.bin which prevented Puma SoM to be migrated to it.

Cheers,
Quentin

v2:
 - removed patch 4/8 rockchip: pad u-boot-rockchip.bin correctly because
 it would break partitions table,
 - rebased on top of master, changes to patch 3/7 rockchip: remove
 unneeded CONFIG_SPL_PAD_TO compared to the RFC 3/8 rockchip: remove
 unneeded CONFIG_SPL_PAD_TO,

Quentin Schulz (7):
  rockchip: generate idbloader.img content for u-boot-rockchip.bin with
    binman for ARM
  rockchip: generate u-boot-rockchip.bin with binman for ARM64 boards
  rockchip: remove unneeded CONFIG_SPL_PAD_TO
  rockchip: simplify binman image dependencies addition to INPUTS
  rockchip: allow to build SPI images even without HAS_ROM option
  binman: add support for skipping file concatenation for mkimage
  rockchip: add u-boot-rockchip-spi.bin image for booting from SPI-NOR
    flash

 Makefile                                      | 39 ++-------------
 arch/arm/Kconfig                              |  2 +-
 arch/arm/dts/rk3288-u-boot.dtsi               |  2 +-
 arch/arm/dts/rk3399-u-boot.dtsi               |  2 +-
 arch/arm/dts/rockchip-u-boot.dtsi             | 49 ++++++++++++++++++-
 arch/arm/mach-rockchip/Kconfig                |  6 +--
 configs/chromebit_mickey_defconfig            |  1 -
 configs/chromebook_bob_defconfig              |  1 -
 configs/chromebook_jerry_defconfig            |  1 -
 configs/chromebook_kevin_defconfig            |  1 -
 configs/chromebook_minnie_defconfig           |  1 -
 configs/chromebook_speedy_defconfig           |  1 -
 configs/evb-px30_defconfig                    |  1 -
 configs/evb-px5_defconfig                     |  1 -
 configs/evb-rk3036_defconfig                  |  1 -
 configs/evb-rk3229_defconfig                  |  1 -
 configs/evb-rk3288_defconfig                  |  1 -
 configs/evb-rk3308_defconfig                  |  1 -
 configs/evb-rk3328_defconfig                  |  1 -
 configs/evb-rk3399_defconfig                  |  1 -
 configs/evb-rk3568_defconfig                  |  1 -
 configs/ficus-rk3399_defconfig                |  1 -
 configs/firefly-px30_defconfig                |  1 -
 configs/firefly-rk3288_defconfig              |  1 -
 configs/firefly-rk3399_defconfig              |  1 -
 configs/khadas-edge-captain-rk3399_defconfig  |  1 -
 configs/khadas-edge-rk3399_defconfig          |  1 -
 configs/khadas-edge-v-rk3399_defconfig        |  1 -
 configs/kylin-rk3036_defconfig                |  1 -
 configs/leez-rk3399_defconfig                 |  1 -
 configs/lion-rk3368_defconfig                 |  1 -
 configs/miqi-rk3288_defconfig                 |  1 -
 configs/mk808_defconfig                       |  1 -
 configs/nanopc-t4-rk3399_defconfig            |  1 -
 configs/nanopi-m4-2gb-rk3399_defconfig        |  1 -
 configs/nanopi-m4-rk3399_defconfig            |  1 -
 configs/nanopi-m4b-rk3399_defconfig           |  1 -
 configs/nanopi-neo4-rk3399_defconfig          |  1 -
 configs/nanopi-r2s-rk3328_defconfig           |  1 -
 configs/nanopi-r4s-rk3399_defconfig           |  1 -
 configs/odroid-go2_defconfig                  |  1 -
 configs/orangepi-rk3399_defconfig             |  1 -
 configs/phycore-rk3288_defconfig              |  1 -
 configs/pinebook-pro-rk3399_defconfig         |  1 -
 configs/popmetal-rk3288_defconfig             |  1 -
 configs/puma-rk3399_defconfig                 |  1 -
 configs/px30-core-ctouch2-of10-px30_defconfig |  1 -
 configs/px30-core-ctouch2-px30_defconfig      |  1 -
 configs/px30-core-edimm2.2-px30_defconfig     |  1 -
 configs/roc-cc-rk3308_defconfig               |  1 -
 configs/roc-cc-rk3328_defconfig               |  1 -
 configs/roc-pc-mezzanine-rk3399_defconfig     |  1 -
 configs/roc-pc-rk3399_defconfig               |  1 -
 configs/rock-pi-4-rk3399_defconfig            |  1 -
 configs/rock-pi-4c-rk3399_defconfig           |  1 -
 configs/rock-pi-e-rk3328_defconfig            |  1 -
 configs/rock-pi-n10-rk3399pro_defconfig       |  1 -
 configs/rock-pi-n8-rk3288_defconfig           |  1 -
 configs/rock2_defconfig                       |  1 -
 configs/rock64-rk3328_defconfig               |  1 -
 configs/rock960-rk3399_defconfig              |  1 -
 configs/rock_defconfig                        |  1 -
 configs/rockpro64-rk3399_defconfig            |  1 -
 configs/tinker-rk3288_defconfig               |  1 -
 configs/tinker-s-rk3288_defconfig             |  1 -
 configs/vyasa-rk3288_defconfig                |  1 -
 include/configs/rockchip-common.h             |  2 -
 tools/binman/entries.rst                      | 22 +++++++++
 tools/binman/etype/mkimage.py                 | 41 ++++++++++++++--
 69 files changed, 116 insertions(+), 109 deletions(-)

-- 
2.37.1



More information about the U-Boot mailing list