diff options
| author | Tom Rini <trini@konsulko.com> | 2024-01-22 09:47:52 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-01-22 09:47:52 -0500 |
| commit | d64e05fc5b82689864fe9c7abeaf240ca0719636 (patch) | |
| tree | fb2f575ced36e64cec39f31b9c6a47bb542157b0 /arch | |
| parent | 79a9697894d75c01cf06ce76dff9821caf69b12b (diff) | |
| parent | a80e0e7711a2b2890a583d88dcd9af978ddada32 (diff) | |
| download | u-boot-d64e05fc5b82689864fe9c7abeaf240ca0719636.tar.gz u-boot-d64e05fc5b82689864fe9c7abeaf240ca0719636.tar.bz2 u-boot-d64e05fc5b82689864fe9c7abeaf240ca0719636.zip | |
Merge tag 'u-boot-imx-master-20240122' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
- Allow i.MX8M Plus DHCOM to operate in overdrive mode.
- Allow i.MX8M Plus eDM SBC to operate in overdrive mode.
- Enable the 'kaslrseed' command on DH i.MX8M Plus DHCOM.
- Select LTO by default on i.MX8M.
- Convert pico-dwarf/hobbit-imx6ul to CONFIG_DM_SERIAL.
- Fix 'reset' command on wandboard.
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/dts/imx6qdl-wandboard-u-boot.dtsi | 10 | ||||
| -rw-r--r-- | arch/arm/mach-imx/imx8m/Kconfig | 1 |
2 files changed, 11 insertions, 0 deletions
diff --git a/arch/arm/dts/imx6qdl-wandboard-u-boot.dtsi b/arch/arm/dts/imx6qdl-wandboard-u-boot.dtsi index 46c4b3b31f..80921e8012 100644 --- a/arch/arm/dts/imx6qdl-wandboard-u-boot.dtsi +++ b/arch/arm/dts/imx6qdl-wandboard-u-boot.dtsi @@ -6,4 +6,14 @@ aliases { mmc0 = &usdhc3; }; + + wdt-reboot { + compatible = "wdt-reboot"; + wdt = <&wdog1>; + bootph-pre-ram; + }; +}; + +&wdog1 { + bootph-pre-ram; }; diff --git a/arch/arm/mach-imx/imx8m/Kconfig b/arch/arm/mach-imx/imx8m/Kconfig index b193719840..328c3e3880 100644 --- a/arch/arm/mach-imx/imx8m/Kconfig +++ b/arch/arm/mach-imx/imx8m/Kconfig @@ -5,6 +5,7 @@ config IMX8M select BINMAN select GICV3 if ARMV8_PSCI select HAS_CAAM + select LTO select ROM_UNIFIED_SECTIONS select ARMV8_CRYPTO |