diff options
| author | Tom Rini <trini@konsulko.com> | 2023-05-03 13:15:12 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-05-03 13:15:12 -0400 |
| commit | 2440719d258a97824395532cb4a775752b423f63 (patch) | |
| tree | 55da1c38a7c8467f9fcae654a98f7bb8f0d681f7 /arch/arm/mach-imx/romapi.c | |
| parent | 1807c0c70a73c7697f32c04cad20ea9cd11b248e (diff) | |
| parent | bb6ea0fe9290b4d64df8e716b58515b5325c2ea5 (diff) | |
Merge tag 'u-boot-imx-20230503' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
u-boot-imx-20230503
-------------------
- Fixes for : pico-imx6ul, smegw01
- new boards: DMSSE20, Reform 2
- fix: get_boot_device, PLL video rate
CI: https://source.denx.de/u-boot/custodians/u-boot-imx/-/pipelines/16211
Diffstat (limited to 'arch/arm/mach-imx/romapi.c')
| -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: |