The commit fd6e425be243 ("rockchip: rk3588-rock-5b: Enable boot from SPI NOR flash") added a new BROM_BOOTSOURCE_SPINOR_RK3588 with value 6.
At the time the reason for this new bootsource id value 6 was unknown.
Since then the following bootsource id values have been observed on different RK3588 devices:
- Radxa ROCK 5 Model A - fspim0_pins - rk3588s - Xunlong Orange Pi 5 - fspim0_pins - rk3588s brom_bootdevice_id: 3
- FriendlyElec NanoPC-T6 - fspim1_pins - rk3588 - Xunlong Orange Pi 5 Plus - fspim1_pins - rk3588 brom_bootdevice_id: 4
- Radxa ROCK 5 Model B - fspim2_pins - rk3588 brom_bootdevice_id: 6
It has now been confirmed that the BootRom on RK3588 use different bootsource id values depending on the iomux used by the flash spi controller, and not by the type of spi nor or spi nand flash used.
This series adjusts the bootsource enum values, updates the boot_devices array to fix booting from SPI flash on RK3588 devices using fspim1_pins. It also enable building of a bootable SPI image for affected devices.
Changes in v2: - Move FSPI M0/M1/M2 enum values from bootrom.h to rk3588.c - Add t-b tag
John Clark (1): rockchip: rk3588-nanopc-t6: Build SPI image
Jonas Karlman (2): rockchip: rk3588: Fix boot from SPI flash rockchip: rk3588s-orangepi-5: Build SPI image
Slawomir Stepien (1): rockchip: rk3588-orangepi-5-plus: Build SPI image
arch/arm/include/asm/arch-rockchip/bootrom.h | 1 - arch/arm/mach-rockchip/rk3588/rk3588.c | 16 ++++++++++++++-- configs/nanopc-t6-rk3588_defconfig | 1 + configs/orangepi-5-plus-rk3588_defconfig | 1 + configs/orangepi-5-rk3588s_defconfig | 1 + 5 files changed, 17 insertions(+), 3 deletions(-)