diff options
| author | Tom Rini <trini@konsulko.com> | 2024-03-30 14:07:37 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-03-30 14:07:37 -0400 |
| commit | 425dc46a2c8ebe6d1a5a7d2d7ac5506aa7783409 (patch) | |
| tree | 9afc8cefa3f28efdaecfcc4cea378c87d88b6e2c /configs | |
| parent | 9468bf3a69b05bda05adb06f954b089ace301afc (diff) | |
| parent | fc07cac02adebc87b69cd82f6ca6f0283d11cd5a (diff) | |
Merge tag 'u-boot-imx-master-20240330' of https://gitlab.denx.de/u-boot/custodians/u-boot-imxmaster
CI: https://source.denx.de/u-boot/custodians/u-boot-imx/-/pipelines/20122
- Fix reset regression on mx6cuboxi and warp7.
- Fix Fix board revision detection on mx6cuboxi.
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/mx6cuboxi_defconfig | 3 | ||||
| -rw-r--r-- | configs/warp7_defconfig | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/configs/mx6cuboxi_defconfig b/configs/mx6cuboxi_defconfig index 66d4aaeda2..27ceb22599 100644 --- a/configs/mx6cuboxi_defconfig +++ b/configs/mx6cuboxi_defconfig @@ -71,6 +71,8 @@ CONFIG_DM_REGULATOR=y CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_SERIAL=y CONFIG_MXC_UART=y +CONFIG_SYSRESET=y +CONFIG_SYSRESET_WATCHDOG=y CONFIG_DM_THERMAL=y CONFIG_IMX_THERMAL=y CONFIG_USB=y @@ -89,3 +91,4 @@ CONFIG_IMX_HDMI=y CONFIG_SPLASH_SCREEN=y CONFIG_SPLASH_SCREEN_ALIGN=y CONFIG_BMP_16BPP=y +CONFIG_IMX_WATCHDOG=y diff --git a/configs/warp7_defconfig b/configs/warp7_defconfig index 9b518a121b..48042b702c 100644 --- a/configs/warp7_defconfig +++ b/configs/warp7_defconfig @@ -67,6 +67,8 @@ CONFIG_DM_REGULATOR_GPIO=y CONFIG_SPECIFY_CONSOLE_INDEX=y CONFIG_DM_SERIAL=y CONFIG_MXC_UART=y +CONFIG_SYSRESET=y +CONFIG_SYSRESET_WATCHDOG=y CONFIG_IMX_THERMAL=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y @@ -80,5 +82,6 @@ CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USB_ETHER=y CONFIG_USB_ETH_CDC=y CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00" +CONFIG_IMX_WATCHDOG=y CONFIG_OPTEE_TZDRAM_SIZE=0x3000000 CONFIG_BOOTM_OPTEE=y |