diff options
| author | Tom Rini <trini@konsulko.com> | 2026-03-02 13:44:46 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2026-03-02 13:44:46 -0600 |
| commit | c0ca147ac6228949a6d6497531c9f2f4a0dc6c67 (patch) | |
| tree | 203dffa4165dbe5c98fb0e2a4594185782d53dbb /board/nxp | |
| parent | f6963fc232603007c661411fb31c57f1a9678a87 (diff) | |
| parent | 56e5f5290f2daf886bf6306f426cbb1171deac01 (diff) | |
Merge tag 'u-boot-imx-next-20260228' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx into nextnext
CI: https://source.denx.de/u-boot/custodians/u-boot-imx/-/pipelines/29404
- Miscelanous improvements for Siemens Capricorn board.
- Convert i.MX6 IPUv3 driver to use clock framework.
- Skip voltage switching for fixed 1.8V regulator on fsl_esdhc_imx.
- Support printing imx8m pinmux.
- Enter fastboot on USB boot by default on phycore-imx93.
- Use arch override for env_get_location() on imx95.
Diffstat (limited to 'board/nxp')
| -rw-r--r-- | board/nxp/imx8mm_evk/spl.c | 2 | ||||
| -rw-r--r-- | board/nxp/imx8mp_evk/imx8mp_evk.c | 7 | ||||
| -rw-r--r-- | board/nxp/imx8mp_evk/spl.c | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/board/nxp/imx8mm_evk/spl.c b/board/nxp/imx8mm_evk/spl.c index 5c588046ff4..50bae3a2bcc 100644 --- a/board/nxp/imx8mm_evk/spl.c +++ b/board/nxp/imx8mm_evk/spl.c @@ -106,8 +106,6 @@ void board_init_f(ulong dummy) arch_cpu_init(); - init_uart_clk(1); - timer_init(); /* Clear the BSS. */ diff --git a/board/nxp/imx8mp_evk/imx8mp_evk.c b/board/nxp/imx8mp_evk/imx8mp_evk.c index 489e5ad4d43..e17100e51ec 100644 --- a/board/nxp/imx8mp_evk/imx8mp_evk.c +++ b/board/nxp/imx8mp_evk/imx8mp_evk.c @@ -28,6 +28,13 @@ struct efi_capsule_update_info update_info = { }; #endif /* EFI_HAVE_CAPSULE_SUPPORT */ +#if CONFIG_IS_ENABLED(ENV_IS_IN_MMC) +int board_mmc_get_env_dev(int devno) +{ + return devno; +} +#endif + int board_late_init(void) { #if CONFIG_IS_ENABLED(ENV_IS_IN_MMC) diff --git a/board/nxp/imx8mp_evk/spl.c b/board/nxp/imx8mp_evk/spl.c index 5b4aac42830..27cd82e745a 100644 --- a/board/nxp/imx8mp_evk/spl.c +++ b/board/nxp/imx8mp_evk/spl.c @@ -102,8 +102,6 @@ void board_init_f(ulong dummy) arch_cpu_init(); - init_uart_clk(1); - ret = spl_early_init(); if (ret) { debug("spl_init() failed: %d\n", ret); |
