diff options
| author | Tom Rini <[email protected]> | 2025-01-20 12:08:16 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2025-01-20 12:08:16 -0600 |
| commit | 9bfc72e3b2af4d426e712fe8d8165ebd1dcf74b9 (patch) | |
| tree | a9dc21a1c030b8a1d67b1b3710b56920803f4214 /configs | |
| parent | 0d837cb075fd0d47a63469c0229966f6328cf165 (diff) | |
| parent | e38a490810af76169f7cf1d298966ea9ba3c005b (diff) | |
Merge tag 'u-boot-imx-master-20250120' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
CI: https://source.denx.de/u-boot/custodians/u-boot-imx/-/pipelines/24263
- Add i.MX95 EMDIO support
- Guard binman nodes with CONFIG_OPTEE on imx8m
- Enable CAAM in phycore-imx8mp SPL.
- Fix Fix NULL dereference in imx_pinctrl_probe().
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/phycore-imx8mp_defconfig | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/configs/phycore-imx8mp_defconfig b/configs/phycore-imx8mp_defconfig index ba716a6875b..c0501907b2c 100644 --- a/configs/phycore-imx8mp_defconfig +++ b/configs/phycore-imx8mp_defconfig @@ -52,7 +52,6 @@ CONFIG_SPL_CUSTOM_SYS_MALLOC_ADDR=0x42200000 CONFIG_SPL_SYS_MALLOC_SIZE=0x80000 CONFIG_SPL_SYS_MMCSD_RAW_MODE=y CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x300 -# CONFIG_SPL_CRYPTO is not set CONFIG_SPL_I2C=y CONFIG_SPL_NOR_SUPPORT=y CONFIG_SPL_POWER=y @@ -180,4 +179,3 @@ CONFIG_USB_GADGET_MANUFACTURER="PHYTEC" CONFIG_USB_GADGET_VENDOR_NUM=0x0525 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_IMX_WATCHDOG=y -# CONFIG_SPL_SHA_HW_ACCEL is not set |