]> git.dujemihanovic.xyz Git - u-boot.git/commit
rockchip: rockpro64: fix boot from SPI flash on spi1
authorHugh Cole-Baker <sigmaris@gmail.com>
Sun, 8 Nov 2020 14:00:23 +0000 (14:00 +0000)
committerKever Yang <kever.yang@rock-chips.com>
Fri, 13 Nov 2020 10:16:39 +0000 (18:16 +0800)
commitc180e2939d3ccb43f89565d6660a0d6f912712b6
tree63687ad59cb200190c5c36b7029a5ccb048ba110
parenta355ece8e678602de89febe30ede17a337c25836
rockchip: rockpro64: fix boot from SPI flash on spi1

Commit c4cea2bbf995 ("rockchip: Enable building a SPI ROM image on bob")
added an alias spi1 referring to spi@ff1d0000, however there was already
an alias spi0 referring to the same node in rockpro64's u-boot.dtsi, and
having both aliases present broke booting from SPI flash for this board.

Remove the spi0 alias, set the default bus for SPI flash to 1, and
enable support for numbered aliases in SPL so that it uses the same bus
numbering as U-Boot proper. This fixes booting from U-Boot in SPI flash
on the rockpro64 board.

Signed-off-by: Hugh Cole-Baker <sigmaris@gmail.com>
Suggested-by: Simon Glass <sjg@chromium.org>
Fixes: c4cea2bbf995 ("rockchip: Enable building a SPI ROM image on bob")
Reviewed-by: Kever Yang<kever.yang@rock-chips.com>
arch/arm/dts/rk3399-rockpro64-u-boot.dtsi
configs/rockpro64-rk3399_defconfig