diff options
| author | Tom Rini <[email protected]> | 2024-04-29 08:35:02 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2024-04-29 08:35:02 -0600 |
| commit | 26968cd959abee43923f5c7dc88211e055c33a01 (patch) | |
| tree | d108191b289e3cd5e3f1049ddac0e2c963f6ca6f /include | |
| parent | dc9c1dbdb41fbb082d7625e4a24a279bb1d9f7c9 (diff) | |
| parent | 37e50627efacd8dae18b564e9d8886a033e181bc (diff) | |
Merge tag 'u-boot-imx-master-20240429' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
CI: https://source.denx.de/u-boot/custodians/u-boot-imx/-/pipelines/20563
- Fix missing fdt_fixup on colibri-imx(6ull|imx7).
- Enable PCIe and NVMe on DH i.MX8M Plus DHCOM PDK3.
- Convert i.MX8M flash.bin image generation to binman
- Convert imx93-11x11-evk to OF_UPSTREAM.
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/colibri-imx6ull.h | 2 | ||||
| -rw-r--r-- | include/configs/colibri_imx7.h | 2 | ||||
| -rw-r--r-- | include/dt-bindings/clock/imx93-clock.h | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/include/configs/colibri-imx6ull.h b/include/configs/colibri-imx6ull.h index 7c9d633b68d..8860ceec1a0 100644 --- a/include/configs/colibri-imx6ull.h +++ b/include/configs/colibri-imx6ull.h @@ -53,7 +53,7 @@ "ubi part ubi &&" \ "ubi read ${kernel_addr_r} kernel && " \ "ubi read ${fdt_addr_r} dtb && " \ - "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \ + "bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \ #if defined(CONFIG_TARGET_COLIBRI_IMX6ULL_NAND) /* Run Distro Boot script if ubiboot fails */ diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h index c34f1f903df..33133a0b96e 100644 --- a/include/configs/colibri_imx7.h +++ b/include/configs/colibri_imx7.h @@ -94,7 +94,7 @@ "ubi part ubi && run m4boot && " \ "ubi read ${kernel_addr_r} kernel && " \ "ubi read ${fdt_addr_r} dtb && " \ - "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \ + "bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \ #if defined(CONFIG_TARGET_COLIBRI_IMX7_NAND) #define MODULE_EXTRA_ENV_SETTINGS \ diff --git a/include/dt-bindings/clock/imx93-clock.h b/include/dt-bindings/clock/imx93-clock.h index 35a1f62053a..787c9e74dc9 100644 --- a/include/dt-bindings/clock/imx93-clock.h +++ b/include/dt-bindings/clock/imx93-clock.h @@ -203,6 +203,7 @@ #define IMX93_CLK_ARM_PLL 198 #define IMX93_CLK_A55_SEL 199 #define IMX93_CLK_A55_CORE 200 -#define IMX93_CLK_END 201 +#define IMX93_CLK_PDM_IPG 201 +#define IMX93_CLK_END 202 #endif |