diff options
author | Josef Schlehofer <pepe.schlehofer@gmail.com> | 2022-04-28 13:34:35 +0200 |
---|---|---|
committer | Petr Štetiar <ynezz@true.cz> | 2022-06-14 21:41:35 +0200 |
commit | 3a02b8a29fff706794cba68e3c821b82fe76d719 (patch) | |
tree | dd9a00ee27064d6883c107a68984e12192002d8f /package/boot/uboot-mvebu/patches/101-arm-mvebu-spl-Add-option-to-reset-the-board-on-DDR-t.patch | |
parent | b65e4d7c5fcc50325b063725f75ab476552d97a6 (diff) | |
download | upstream-3a02b8a29fff706794cba68e3c821b82fe76d719.tar.gz upstream-3a02b8a29fff706794cba68e3c821b82fe76d719.tar.bz2 upstream-3a02b8a29fff706794cba68e3c821b82fe76d719.zip |
uboot-mvebu: update to version v2022.04
Release announcement:
https://lore.kernel.org/u-boot/20220404143253.GQ14476@bill-the-cat/
Release notes between tags:
https://source.denx.de/u-boot/u-boot/-/compare/v2022.01...v2022.04?from_project_id=531
All patches were removed, since they are included in this release.
Run tested: Turris Omnia, mvebu/cortex-a9, OpenWrt daily snapshots
Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
(cherry picked from commit 4f51f1fc9b3597d24de442cfff253fddce478d17)
Diffstat (limited to 'package/boot/uboot-mvebu/patches/101-arm-mvebu-spl-Add-option-to-reset-the-board-on-DDR-t.patch')
-rw-r--r-- | package/boot/uboot-mvebu/patches/101-arm-mvebu-spl-Add-option-to-reset-the-board-on-DDR-t.patch | 49 |
1 files changed, 0 insertions, 49 deletions
diff --git a/package/boot/uboot-mvebu/patches/101-arm-mvebu-spl-Add-option-to-reset-the-board-on-DDR-t.patch b/package/boot/uboot-mvebu/patches/101-arm-mvebu-spl-Add-option-to-reset-the-board-on-DDR-t.patch deleted file mode 100644 index d7ba3ec68f..0000000000 --- a/package/boot/uboot-mvebu/patches/101-arm-mvebu-spl-Add-option-to-reset-the-board-on-DDR-t.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 74767a3875c99b1a3d2818456a5fdc02ec1e4f93 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Marek=20Beh=C3=BAn?= <marek.behun@nic.cz> -Date: Thu, 17 Feb 2022 13:54:42 +0100 -Subject: [PATCH 2/3] arm: mvebu: spl: Add option to reset the board on DDR - training failure -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Some boards may occacionally fail DDR training. Currently we hang() in -this case. Add an option that makes the board do an immediate reset in -such a case, so that a new training is tried as soon as possible, -instead of hanging and possibly waiting for watchdog to reset the board. - -(If the DDR training fails while booting the image via UART, we will - still hang - it doesn't make sense to reset in such a case, because - after reset the board will try booting from another medium, and the - UART booting utility does not expect that.) - -Signed-off-by: Marek Behún <marek.behun@nic.cz> -Reviewed-by: Pali Rohár <pali@kernel.org> -Reviewed-by: Stefan Roese <sr@denx.de> ---- - arch/arm/mach-mvebu/spl.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - ---- a/arch/arm/mach-mvebu/spl.c -+++ b/arch/arm/mach-mvebu/spl.c -@@ -4,6 +4,7 @@ - */ - - #include <common.h> -+#include <cpu_func.h> - #include <dm.h> - #include <debug_uart.h> - #include <fdtdec.h> -@@ -290,7 +291,11 @@ void board_init_f(ulong dummy) - ret = ddr3_init(); - if (ret) { - debug("ddr3_init() failed: %d\n", ret); -- hang(); -+ if (IS_ENABLED(CONFIG_DDR_RESET_ON_TRAINING_FAILURE) && -+ get_boot_device() != BOOT_DEVICE_UART) -+ reset_cpu(); -+ else -+ hang(); - } - #endif - |