diff options
| author | Tom Rini <[email protected]> | 2024-05-24 11:01:56 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2024-05-24 11:01:56 -0600 |
| commit | 6b9ae5789e9beef7fb78893c7c831e2b31b705f6 (patch) | |
| tree | b5b14f99abfb9b9e29aecf3a0f3dcb3e70e7b766 /include | |
| parent | 377e91c162ab09ec20f96f966f380cb55c590edd (diff) | |
| parent | 7457dc6f183303aaf2d58fff0a622e6791aba33c (diff) | |
Merge tag 'u-boot-imx-next-20240524' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx into next
CI: https://source.denx.de/u-boot/custodians/u-boot-imx/-/pipelines/20834
- Allow signing i.MX8M flash.bin via binman, which is a much more
elegant solution that using scripts.
- Improve i.MX8M HAB documentation.
- Increase PHY auto-negotiation timeout to 20s on MX8Menlo
- Add bmode support for the MX53 Menlo board.
- Update Update iMX8MM Menlo board configuration
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/imx8mm-mx8menlo.h | 3 | ||||
| -rw-r--r-- | include/configs/m53menlo.h | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/include/configs/imx8mm-mx8menlo.h b/include/configs/imx8mm-mx8menlo.h index a86bd76a3c7..5cc60af91e5 100644 --- a/include/configs/imx8mm-mx8menlo.h +++ b/include/configs/imx8mm-mx8menlo.h @@ -8,6 +8,9 @@ #include <configs/verdin-imx8mm.h> +/* PHY needs a longer autoneg timeout */ +#define PHY_ANEG_TIMEOUT 20000 + /* Custom initial environment variables */ #undef CFG_EXTRA_ENV_SETTINGS #define CFG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/m53menlo.h b/include/configs/m53menlo.h index 1ecbba1b58f..9cf46b2c362 100644 --- a/include/configs/m53menlo.h +++ b/include/configs/m53menlo.h @@ -119,7 +119,7 @@ "addargs=run addcons addmisc addmtd\0" \ "mmcload=" \ "mmc rescan || reset ; load mmc ${mmcdev}:${mmcpart} " \ - "${kernel_addr_r} ${bootfile} || reset\0" \ + "${kernel_addr_r} boot/${bootfile} || reset\0" \ "miscargs=nohlt panic=1\0" \ "mmcargs=setenv bootargs root=/dev/mmcblk0p${mmcpart} rw " \ "rootwait\0" \ |