On 4/25/2023 12:33 AM, Tim Harvey wrote:
commit 787f04bb6a0a ("imx: add USB2_BOOT type") broke get_boot_device()
for IMX8 which affects booting from SDP due to boot_instance being
non-zero.
Fix this by only using boot_instance for imx8ulp and imx9.
Fixes: 787f04bb6a0a ("imx: add USB2_BOOT type")
Signed-off-by: Tim Harvey <thar...@gateworks.com>
Reviewed-by: Peng Fan <peng....@nxp.com>
---
arch/arm/mach-imx/romapi.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/arm/mach-imx/romapi.c b/arch/arm/mach-imx/romapi.c
index b49e7f80a286..ff0522c2d117 100644
--- a/arch/arm/mach-imx/romapi.c
+++ b/arch/arm/mach-imx/romapi.c
@@ -70,6 +70,8 @@ enum boot_device get_boot_device(void)
boot_dev = SPI_NOR_BOOT;
break;
case BT_DEV_TYPE_USB:
+ if (!is_imx8ulp() && !is_imx9())
+ boot_instance = 0;
boot_dev = boot_instance + USB_BOOT;
break;
default:
