omnia-uboot: backport newer versions of patches

This adds that it does not do reset while using UART.

hardware/omnia/omnia-uboot/Makefile

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=omnia-uboot
 PKG_VERSION:=2022.01
-PKG_RELEASE:=4
+PKG_RELEASE:=5
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://source.denx.de/u-boot/u-boot.git

hardware/omnia/omnia-uboot/patches/101-arm-mvebu-spl-Add-option-to-reset-the-board-on-DDR-t.patch

-From 155be7f6872bafc586e75f0ddab572b529e630e6 Mon Sep 17 00:00:00 2001
+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 01:08:48 +0100
+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
@@ -12,11 +12,17 @@ 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 | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
+ 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
@@ -28,12 +34,13 @@ Reviewed-by: Stefan Roese <sr@denx.de>
  #include <dm.h>
  #include <debug_uart.h>
  #include <fdtdec.h>
-@@ -290,7 +291,10 @@ void board_init_f(ulong dummy)
+@@ -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))
++		if (IS_ENABLED(CONFIG_DDR_RESET_ON_TRAINING_FAILURE) &&
++		    get_boot_device() != BOOT_DEVICE_UART)
 +			reset_cpu();
 +		else
 +			hang();

hardware/omnia/omnia-uboot/patches/102-arm-mvebu-turris_omnia-Reset-the-board-immediately-o.patch

-From 29784474994a0c882e4a9d960bd7a1c6a8ee477b Mon Sep 17 00:00:00 2001
+From 930c46e86123aeea1c73ae55d70ff3dcfc077992 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Marek=20Beh=C3=BAn?= <marek.behun@nic.cz>
-Date: Thu, 17 Feb 2022 01:08:49 +0100
+Date: Thu, 17 Feb 2022 13:54:43 +0100
 Subject: [PATCH 3/3] arm: mvebu: turris_omnia: Reset the board immediately on
  DDR training failure
 MIME-Version: 1.0
@@ -21,6 +21,7 @@ meant that the board was reset by the MCU after 120 seconds.
 
 Signed-off-by: Marek Behún <marek.behun@nic.cz>
 Reviewed-by: Stefan Roese <sr@denx.de>
+Reviewed-by: Pali Rohár <pali@kernel.org>
 ---
  configs/turris_omnia_defconfig | 1 +
  1 file changed, 1 insertion(+)