Version in base suite: 2023.01+dfsg-2 Base version: u-boot_2023.01+dfsg-2 Target version: u-boot_2023.01+dfsg-2+deb12u1 Base file: /srv/ftp-master.debian.org/ftp/pool/main/u/u-boot/u-boot_2023.01+dfsg-2.dsc Target file: /srv/ftp-master.debian.org/policy/pool/main/u/u-boot/u-boot_2023.01+dfsg-2+deb12u1.dsc 0001-u-boot-qemu-Add-malta64el-and-maltael.patch | 45 ---------- changelog | 7 + patches/series | 2 patches/upstream/0001-timer-orion-timer-Fix-problem-in-early_init_done.patch | 45 ++++++++++ 4 files changed, 54 insertions(+), 45 deletions(-) diff -Nru u-boot-2023.01+dfsg/debian/0001-u-boot-qemu-Add-malta64el-and-maltael.patch u-boot-2023.01+dfsg/debian/0001-u-boot-qemu-Add-malta64el-and-maltael.patch --- u-boot-2023.01+dfsg/debian/0001-u-boot-qemu-Add-malta64el-and-maltael.patch 2022-05-13 23:18:33.000000000 +0000 +++ u-boot-2023.01+dfsg/debian/0001-u-boot-qemu-Add-malta64el-and-maltael.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,45 +0,0 @@ -From 5e81b8161625dac608376348abe371de511ca83b Mon Sep 17 00:00:00 2001 -From: Vagrant Cascadian -Date: Fri, 13 May 2022 14:47:02 -0700 -Subject: [PATCH] u-boot-qemu: Add malta64el and maltael. - ---- - debian/control | 2 ++ - debian/targets.mk | 8 ++++++++ - 2 files changed, 10 insertions(+) - -diff --git a/debian/control b/debian/control -index e7ba5a19bc..531c0e6377 100644 ---- a/debian/control -+++ b/debian/control -@@ -36,6 +36,8 @@ Build-Depends-Indep: - gcc-riscv64-linux-gnu [!riscv64], - gcc-x86-64-linux-gnu [!amd64], - gcc-powerpc-linux-gnu [!powerpc], -+ gcc-mips64el-linux-gnuabi64 [!mips64el], -+ gcc-mipsel-linux-gnu [!mipsel], - Rules-Requires-Root: no - Standards-Version: 4.6.0 - Homepage: https://www.denx.de/wiki/U-Boot/ -diff --git a/debian/targets.mk b/debian/targets.mk -index 333488b8c0..889ea93df4 100644 ---- a/debian/targets.mk -+++ b/debian/targets.mk -@@ -569,6 +569,14 @@ endif - - # u-boot-qemu (Architecture: all) - -+ u-boot-qemu_platforms += malta64el -+ malta64el_CROSS_COMPILE := mips64el-linux-gnuabi64- -+ malta64el_targets := u-boot.bin uboot.elf -+ -+ u-boot-qemu_platforms += maltael -+ maltael_CROSS_COMPILE := mipsel-linux-gnu- -+ maltael_targets := u-boot.bin uboot.elf -+ - u-boot-qemu_platforms += qemu-ppce500 - qemu-ppce500_CROSS_COMPILE := powerpc-linux-gnu- - qemu-ppce500_targets := u-boot.bin uboot.elf --- -2.30.2 - diff -Nru u-boot-2023.01+dfsg/debian/changelog u-boot-2023.01+dfsg/debian/changelog --- u-boot-2023.01+dfsg/debian/changelog 2023-01-18 01:57:16.000000000 +0000 +++ u-boot-2023.01+dfsg/debian/changelog 2024-04-18 22:00:21.000000000 +0000 @@ -1,3 +1,10 @@ +u-boot (2023.01+dfsg-2+deb12u1) bookworm; urgency=medium + + * debian/patches: Apply fix from upstream for orion-timer, affecting + sheevaplug and related platforms. (Closes: #1061137) + + -- Vagrant Cascadian Thu, 18 Apr 2024 15:00:21 -0700 + u-boot (2023.01+dfsg-2) unstable; urgency=medium * debian/patches: Apply patch submitted upstream fixing booting with diff -Nru u-boot-2023.01+dfsg/debian/patches/series u-boot-2023.01+dfsg/debian/patches/series --- u-boot-2023.01+dfsg/debian/patches/series 2023-01-18 01:30:58.000000000 +0000 +++ u-boot-2023.01+dfsg/debian/patches/series 2024-04-18 21:28:30.000000000 +0000 @@ -21,3 +21,5 @@ tools-disable-video-logo riscv64/vbe-Allow-probing-the-VBE-bootmeth-to-fail-in-OS-fixup.patch + +upstream/0001-timer-orion-timer-Fix-problem-in-early_init_done.patch diff -Nru u-boot-2023.01+dfsg/debian/patches/upstream/0001-timer-orion-timer-Fix-problem-in-early_init_done.patch u-boot-2023.01+dfsg/debian/patches/upstream/0001-timer-orion-timer-Fix-problem-in-early_init_done.patch --- u-boot-2023.01+dfsg/debian/patches/upstream/0001-timer-orion-timer-Fix-problem-in-early_init_done.patch 1970-01-01 00:00:00.000000000 +0000 +++ u-boot-2023.01+dfsg/debian/patches/upstream/0001-timer-orion-timer-Fix-problem-in-early_init_done.patch 2024-04-18 21:28:30.000000000 +0000 @@ -0,0 +1,45 @@ +From 9a13a76e6256c51d04f41139733dbb31755e8d30 Mon Sep 17 00:00:00 2001 +From: Stefan Roese +Date: Mon, 16 Jan 2023 09:01:48 +0100 +Subject: [PATCH] timer: orion-timer: Fix problem in early_init_done() +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +It was noticed that Clearfog is currently broken with this newly +introduced early_init_done() function. Apparently the timer is enabled +here when U-Boot is run but not configured - at least not correctly. +Resulting in a hangup in the timer reading functions. + +To fix this, also read the value of the reload register and check it's +value with the one written to by U-Boot. Only if this matches, the +init has already been done. + +Fixes: 5387b093cb79 ("timer: orion-timer: Fix problem with early static variable") +Signed-off-by: Stefan Roese +Acked-by: Pali Rohár +Cc: Martin Rowe +Cc: Tony Dinh +Cc: Pali Rohár +Cc: Michael Walle +--- + drivers/timer/orion-timer.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/drivers/timer/orion-timer.c b/drivers/timer/orion-timer.c +index 810a03d549..9cab27f2e4 100644 +--- a/drivers/timer/orion-timer.c ++++ b/drivers/timer/orion-timer.c +@@ -25,7 +25,8 @@ struct orion_timer_priv { + + static bool early_init_done(void *base) + { +- if (readl(base + TIMER_CTRL) & TIMER0_EN) ++ if ((readl(base + TIMER_CTRL) & TIMER0_EN) && ++ (readl(base + TIMER0_RELOAD) == ~0)) + return true; + return false; + } +-- +2.39.2 +