diff options
| author | Tom Rini <[email protected]> | 2025-03-25 08:57:38 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2025-03-25 08:57:38 -0600 |
| commit | 042c8f0cb1ea5f6988e8633799f7b550876f0ae6 (patch) | |
| tree | d520fb23901d04e5be00676b4c2cac5bd4bc5540 /board | |
| parent | 0dd455e064953fe18a49c6cdebbf868705874631 (diff) | |
| parent | 6bd1b740dd09f852ed3f313bd05f31c2324a916a (diff) | |
Merge tag 'u-boot-imx-next-20250325' 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/25324
- Imply the i.MX thermal driver by default on imx8, imx9, imx8m.
- Add clk_resolve_parent_clk() and fix up iMX clock drivers.
Diffstat (limited to 'board')
| -rw-r--r-- | board/beacon/imx8mp/spl.c | 2 | ||||
| -rw-r--r-- | board/dhelectronics/dh_imx8mp/imx8mp_dhcom_pdk2.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/board/beacon/imx8mp/spl.c b/board/beacon/imx8mp/spl.c index 6b357d90a3f..027fae38278 100644 --- a/board/beacon/imx8mp/spl.c +++ b/board/beacon/imx8mp/spl.c @@ -50,7 +50,7 @@ void spl_board_init(void) * setting done. Default is 400Mhz (system_pll1_800m with div = 2) * set by ROM for ND VDD_SOC */ - if (IS_ENABLED(CONFIG_IMX8M_VDD_SOC_850MV)) { + if (!IS_ENABLED(CONFIG_IMX8M_VDD_SOC_850MV)) { clock_enable(CCGR_GIC, 0); clock_set_target_val(GIC_CLK_ROOT, CLK_ROOT_ON | CLK_ROOT_SOURCE_SEL(5)); clock_enable(CCGR_GIC, 1); diff --git a/board/dhelectronics/dh_imx8mp/imx8mp_dhcom_pdk2.c b/board/dhelectronics/dh_imx8mp/imx8mp_dhcom_pdk2.c index 4af3cbe9fe2..4275436b128 100644 --- a/board/dhelectronics/dh_imx8mp/imx8mp_dhcom_pdk2.c +++ b/board/dhelectronics/dh_imx8mp/imx8mp_dhcom_pdk2.c @@ -186,5 +186,7 @@ int board_late_init(void) enum env_location env_get_location(enum env_operation op, int prio) { - return prio ? ENVL_UNKNOWN : ENVL_SPI_FLASH; + return prio ? ENVL_UNKNOWN : CONFIG_IS_ENABLED(ENV_IS_IN_SPI_FLASH, + (ENVL_SPI_FLASH), + (ENVL_NOWHERE)); } |