| Message ID | 20240217002304.2141064-13-jonas@kwiboo.se |
|---|---|
| State | Accepted |
| Commit | 2f440ffb1d26e07f14e1d0341ceadfa374bdf8e3 |
| Delegated to: | Kever Yang |
| Headers | show |
| Series | rockchip: rk3328: Update defconfigs, DTs and enable boot from SPI | expand |
On 2024/2/17 08:22, Jonas Karlman wrote: > This reverts commit 3523c07867b403d5b3b68812aebac8a5afa5be4c. > > Booting from SPI was already allowed before this commit was first > introduced. A few lines further down the exact same code already existed > and still does. > > Signed-off-by: Jonas Karlman <jonas@kwiboo.se> Reviewed-by: Kever Yang <kever.yang@rock-chips.com> Thanks, - Kever > --- > v2: > - No change > --- > arch/arm/mach-rockchip/spl-boot-order.c | 3 --- > 1 file changed, 3 deletions(-) > > diff --git a/arch/arm/mach-rockchip/spl-boot-order.c b/arch/arm/mach-rockchip/spl-boot-order.c > index 2c39a215c107..79c856d2a0ac 100644 > --- a/arch/arm/mach-rockchip/spl-boot-order.c > +++ b/arch/arm/mach-rockchip/spl-boot-order.c > @@ -65,9 +65,6 @@ static int spl_node_to_boot_device(int node) > default: > return -ENOSYS; > } > - } else if (!uclass_get_device_by_of_offset(UCLASS_SPI_FLASH, node, > - &parent)) { > - return BOOT_DEVICE_SPI; > } > > /*
diff --git a/arch/arm/mach-rockchip/spl-boot-order.c b/arch/arm/mach-rockchip/spl-boot-order.c index 2c39a215c107..79c856d2a0ac 100644 --- a/arch/arm/mach-rockchip/spl-boot-order.c +++ b/arch/arm/mach-rockchip/spl-boot-order.c @@ -65,9 +65,6 @@ static int spl_node_to_boot_device(int node) default: return -ENOSYS; } - } else if (!uclass_get_device_by_of_offset(UCLASS_SPI_FLASH, node, - &parent)) { - return BOOT_DEVICE_SPI; } /*
This reverts commit 3523c07867b403d5b3b68812aebac8a5afa5be4c. Booting from SPI was already allowed before this commit was first introduced. A few lines further down the exact same code already existed and still does. Signed-off-by: Jonas Karlman <jonas@kwiboo.se> --- v2: - No change --- arch/arm/mach-rockchip/spl-boot-order.c | 3 --- 1 file changed, 3 deletions(-)