diff options
| author | Tim Harvey <[email protected]> | 2023-04-24 09:33:44 -0700 |
|---|---|---|
| committer | Stefano Babic <[email protected]> | 2023-05-02 10:57:32 +0200 |
| commit | a48a824dbac4a33e4b27b9f568ea28c52b631658 (patch) | |
| tree | 8671f8a3b3cf0905c8013bb60761b06efba227ae | |
| parent | 1490292a0775c89a7ab4e79eab9e3c859a38f106 (diff) | |
imx: fix get_boot_device() for imx8
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 <[email protected]>
Reviewed-by: Peng Fan <[email protected]>
Reviewed-by: Fabio Estevam <[email protected]>
| -rw-r--r-- | arch/arm/mach-imx/romapi.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/romapi.c b/arch/arm/mach-imx/romapi.c index b49e7f80a28..ff0522c2d11 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: |