Hello community,
here is the log from the commit of package u-boot for openSUSE:Factory checked
in at 2019-03-19 10:01:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/u-boot (Old)
and /work/SRC/openSUSE:Factory/.u-boot.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "u-boot"
Tue Mar 19 10:01:37 2019 rev:108 rq:686177 version:2019.01
Changes:
--------
--- /work/SRC/openSUSE:Factory/u-boot/u-boot-a10-olinuxino-lime.changes
2019-03-07 10:50:42.493849192 +0100
+++
/work/SRC/openSUSE:Factory/.u-boot.new.28833/u-boot-a10-olinuxino-lime.changes
2019-03-19 10:01:49.099865119 +0100
@@ -1,0 +2,12 @@
+Mon Mar 18 11:17:54 UTC 2019 - Matthias Brugger <[email protected]>
+
+- Patch queue updated from git://github.com/openSUSE/u-boot.git
tumbleweed-2019.01
+* Fix bsc#1124137 by:
+* Patches dropped:
+ 0008-Revert-efi_loader-query-serial-cons.patch
+ 0009-zynqmp-generic-fix-compilation.patch
+* Patches added:
+ 0008-zynqmp-generic-fix-compilation.patch
+ 0009-efi_loader-Fix-serial-console-size-.patch
+
+-------------------------------------------------------------------
u-boot-a13-olinuxino.changes: same change
u-boot-a13-olinuxinom.changes: same change
u-boot-a20-olinuxino-lime.changes: same change
u-boot-a20-olinuxino-lime2.changes: same change
u-boot-a20-olinuxinomicro.changes: same change
u-boot-am335xboneblack.changes: same change
u-boot-am335xevm.changes: same change
u-boot-am57xxevm.changes: same change
u-boot-arndale.changes: same change
u-boot-bananapi.changes: same change
u-boot-bananapim64.changes: same change
u-boot-clearfog.changes: same change
u-boot-colibrit20.changes: same change
u-boot-cubieboard.changes: same change
u-boot-cubieboard2.changes: same change
u-boot-cubietruck.changes: same change
u-boot-dragonboard410c.changes: same change
u-boot-dragonboard820c.changes: same change
u-boot-evb-rk3399.changes: same change
u-boot-firefly-rk3288.changes: same change
u-boot-firefly-rk3399.changes: same change
u-boot-geekbox.changes: same change
u-boot-highbank.changes: same change
u-boot-hikey.changes: same change
u-boot-hyundaia7hd.changes: same change
u-boot-jetson-tk1.changes: same change
u-boot-khadas-vim.changes: same change
u-boot-khadas-vim2.changes: same change
u-boot-lamobor1.changes: same change
u-boot-ls1012afrdmqspi.changes: same change
u-boot-melea1000.changes: same change
u-boot-merriia80optimus.changes: same change
u-boot-mvebudb-88f3720.changes: same change
u-boot-mvebudbarmada8k.changes: same change
u-boot-mvebuespressobin-88f3720.changes: same change
u-boot-mvebumcbin-88f8040.changes: same change
u-boot-mx53loco.changes: same change
u-boot-mx6cuboxi.changes: same change
u-boot-mx6qsabrelite.changes: same change
u-boot-nanopia64.changes: same change
u-boot-nanopineo.changes: same change
u-boot-nanopineoair.changes: same change
u-boot-odroid-c2.changes: same change
u-boot-odroid-xu3.changes: same change
u-boot-odroid.changes: same change
u-boot-omap3beagle.changes: same change
u-boot-omap4panda.changes: same change
u-boot-orangepipc.changes: same change
u-boot-orangepipc2.changes: same change
u-boot-p2371-2180.changes: same change
u-boot-p2771-0000-500.changes: same change
u-boot-paz00.changes: same change
u-boot-pcm051rev3.changes: same change
u-boot-pine64plus.changes: same change
u-boot-pinebook.changes: same change
u-boot-pineh64.changes: same change
u-boot-poplar.changes: same change
u-boot-qemu-ppce500.changes: same change
u-boot-qemu-riscv64.changes: same change
u-boot-rock960-rk3399.changes: same change
u-boot-rpi.changes: same change
u-boot-rpi2.changes: same change
u-boot-rpi3.changes: same change
u-boot-sinovoipbpim2plus.changes: same change
u-boot-snow.changes: same change
u-boot-socfpgade0nanosoc.changes: same change
u-boot-spring.changes: same change
u-boot-tinker-rk3288.changes: same change
u-boot-turrisomnia.changes: same change
u-boot-udoo.changes: same change
u-boot-udooneo.changes: same change
u-boot-xilinxzynqmpgeneric.changes: same change
u-boot-xilinxzynqmpzcu102rev10.changes: same change
u-boot.changes: same change
Old:
----
0008-Revert-efi_loader-query-serial-cons.patch
0009-zynqmp-generic-fix-compilation.patch
New:
----
0008-zynqmp-generic-fix-compilation.patch
0009-efi_loader-Fix-serial-console-size-.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ u-boot-a10-olinuxino-lime.spec ++++++
--- /var/tmp/diff_new_pack.z7FQnJ/_old 2019-03-19 10:02:31.659827470 +0100
+++ /var/tmp/diff_new_pack.z7FQnJ/_new 2019-03-19 10:02:31.659827470 +0100
@@ -68,8 +68,8 @@
Patch0005: 0005-zynqmp-Add-generic-target.patch
Patch0006: 0006-tools-zynqmpbif-Add-support-for-loa.patch
Patch0007: 0007-boo-1123170-Remove-ubifs-support-fr.patch
-Patch0008: 0008-Revert-efi_loader-query-serial-cons.patch
-Patch0009: 0009-zynqmp-generic-fix-compilation.patch
+Patch0008: 0008-zynqmp-generic-fix-compilation.patch
+Patch0009: 0009-efi_loader-Fix-serial-console-size-.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?is_rk3399} && %{with uboot_atf}
BuildRequires: arm-trusted-firmware-rk3399
u-boot-a13-olinuxino.spec: same change
u-boot-a13-olinuxinom.spec: same change
u-boot-a20-olinuxino-lime.spec: same change
u-boot-a20-olinuxino-lime2.spec: same change
u-boot-a20-olinuxinomicro.spec: same change
u-boot-am335xboneblack.spec: same change
u-boot-am335xevm.spec: same change
u-boot-am57xxevm.spec: same change
u-boot-arndale.spec: same change
u-boot-bananapi.spec: same change
u-boot-bananapim64.spec: same change
u-boot-clearfog.spec: same change
u-boot-colibrit20.spec: same change
u-boot-cubieboard.spec: same change
u-boot-cubieboard2.spec: same change
u-boot-cubietruck.spec: same change
u-boot-dragonboard410c.spec: same change
u-boot-dragonboard820c.spec: same change
u-boot-evb-rk3399.spec: same change
u-boot-firefly-rk3288.spec: same change
u-boot-firefly-rk3399.spec: same change
u-boot-geekbox.spec: same change
u-boot-highbank.spec: same change
u-boot-hikey.spec: same change
u-boot-hyundaia7hd.spec: same change
u-boot-jetson-tk1.spec: same change
u-boot-khadas-vim.spec: same change
u-boot-khadas-vim2.spec: same change
u-boot-lamobor1.spec: same change
u-boot-ls1012afrdmqspi.spec: same change
u-boot-melea1000.spec: same change
u-boot-merriia80optimus.spec: same change
u-boot-mvebudb-88f3720.spec: same change
u-boot-mvebudbarmada8k.spec: same change
u-boot-mvebuespressobin-88f3720.spec: same change
u-boot-mvebumcbin-88f8040.spec: same change
u-boot-mx53loco.spec: same change
u-boot-mx6cuboxi.spec: same change
u-boot-mx6qsabrelite.spec: same change
u-boot-nanopia64.spec: same change
u-boot-nanopineo.spec: same change
u-boot-nanopineoair.spec: same change
u-boot-odroid-c2.spec: same change
u-boot-odroid-xu3.spec: same change
u-boot-odroid.spec: same change
u-boot-omap3beagle.spec: same change
u-boot-omap4panda.spec: same change
u-boot-orangepipc.spec: same change
u-boot-orangepipc2.spec: same change
u-boot-p2371-2180.spec: same change
u-boot-p2771-0000-500.spec: same change
u-boot-paz00.spec: same change
u-boot-pcm051rev3.spec: same change
u-boot-pine64plus.spec: same change
u-boot-pinebook.spec: same change
u-boot-pineh64.spec: same change
u-boot-poplar.spec: same change
u-boot-qemu-ppce500.spec: same change
u-boot-qemu-riscv64.spec: same change
u-boot-rock960-rk3399.spec: same change
u-boot-rpi.spec: same change
u-boot-rpi2.spec: same change
u-boot-rpi3.spec: same change
u-boot-sinovoipbpim2plus.spec: same change
u-boot-snow.spec: same change
u-boot-socfpgade0nanosoc.spec: same change
u-boot-spring.spec: same change
u-boot-tinker-rk3288.spec: same change
u-boot-turrisomnia.spec: same change
u-boot-udoo.spec: same change
u-boot-udooneo.spec: same change
u-boot-xilinxzynqmpgeneric.spec: same change
u-boot-xilinxzynqmpzcu102rev10.spec: same change
++++++ u-boot.spec ++++++
--- /var/tmp/diff_new_pack.z7FQnJ/_old 2019-03-19 10:02:33.551825796 +0100
+++ /var/tmp/diff_new_pack.z7FQnJ/_new 2019-03-19 10:02:33.555825793 +0100
@@ -37,8 +37,8 @@
Patch0005: 0005-zynqmp-Add-generic-target.patch
Patch0006: 0006-tools-zynqmpbif-Add-support-for-loa.patch
Patch0007: 0007-boo-1123170-Remove-ubifs-support-fr.patch
-Patch0008: 0008-Revert-efi_loader-query-serial-cons.patch
-Patch0009: 0009-zynqmp-generic-fix-compilation.patch
+Patch0008: 0008-zynqmp-generic-fix-compilation.patch
+Patch0009: 0009-efi_loader-Fix-serial-console-size-.patch
BuildRequires: bison
BuildRequires: flex
BuildRequires: libopenssl-devel
++++++ 0009-zynqmp-generic-fix-compilation.patch ->
0008-zynqmp-generic-fix-compilation.patch ++++++
--- /work/SRC/openSUSE:Factory/u-boot/0009-zynqmp-generic-fix-compilation.patch
2019-03-07 10:50:42.461849200 +0100
+++
/work/SRC/openSUSE:Factory/.u-boot.new.28833/0008-zynqmp-generic-fix-compilation.patch
2019-03-19 10:01:44.107869551 +0100
@@ -1,4 +1,4 @@
-From 3adeb58c84419891c0127b9ce45d155f76b8437f Mon Sep 17 00:00:00 2001
+From 95e373ddde5bce44e3681810a521b134ea873e1b Mon Sep 17 00:00:00 2001
From: Matthias Brugger <[email protected]>
Date: Tue, 5 Mar 2019 18:09:04 +0100
Subject: [PATCH] zynqmp: generic: fix compilation
++++++ 0009-efi_loader-Fix-serial-console-size-.patch ++++++
>From 029eed9c0d3d43cfa043913254aa0aa904c92f13 Mon Sep 17 00:00:00 2001
From: Matthias Brugger <[email protected]>
Date: Tue, 5 Mar 2019 12:50:18 +0100
Subject: [PATCH] efi_loader: Fix serial console size detection
Function term_read_reply tries to read from the serial console until
the end_char was read. This can hang forever if we are, for some reason,
not able to read the full response (e.g. serial buffer too small,
frame error). This patch moves the timeout detection into
term_read_reply() to assure we will make progress.
Fixes: 6bb591f704 ("efi_loader: query serial console size reliably")
Signed-off-by: Matthias Brugger <[email protected]>
Throw missing error when an incomplete reply for the cursor position is
received.
Change type of argument of term_get_char() *s32. This renders the function
reusable in efi_cin_read_key().
Reviewed-by: Heinrich Schuchardt <[email protected]>
---
lib/efi_loader/efi_console.c | 62 ++++++++++++++++++++----------------
1 file changed, 35 insertions(+), 27 deletions(-)
diff --git a/lib/efi_loader/efi_console.c b/lib/efi_loader/efi_console.c
index 66c33a551d..8e0965bfc8 100644
--- a/lib/efi_loader/efi_console.c
+++ b/lib/efi_loader/efi_console.c
@@ -62,6 +62,21 @@ static struct simple_text_output_mode efi_con_mode = {
.cursor_visible = 1,
};
+static int term_get_char(s32 *c)
+{
+ u64 timeout;
+
+ /* Wait up to 100 ms for a character */
+ timeout = timer_get_us() + 100000;
+
+ while (!tstc())
+ if (timer_get_us() > timeout)
+ return 1;
+
+ *c = getc();
+ return 0;
+}
+
/*
* Receive and parse a reply from the terminal.
*
@@ -72,34 +87,36 @@ static struct simple_text_output_mode efi_con_mode = {
*/
static int term_read_reply(int *n, int num, char end_char)
{
- char c;
+ s32 c;
int i = 0;
- c = getc();
- if (c != cESC)
+ if (term_get_char(&c) || c != cESC)
return -1;
- c = getc();
- if (c != '[')
+
+ if (term_get_char(&c) || c != '[')
return -1;
n[0] = 0;
while (1) {
- c = getc();
- if (c == ';') {
- i++;
- if (i >= num)
+ if (!term_get_char(&c)) {
+ if (c == ';') {
+ i++;
+ if (i >= num)
+ return -1;
+ n[i] = 0;
+ continue;
+ } else if (c == end_char) {
+ break;
+ } else if (c > '9' || c < '0') {
return -1;
- n[i] = 0;
- continue;
- } else if (c == end_char) {
- break;
- } else if (c > '9' || c < '0') {
+ }
+
+ /* Read one more decimal position */
+ n[i] *= 10;
+ n[i] += c - '0';
+ } else {
return -1;
}
-
- /* Read one more decimal position */
- n[i] *= 10;
- n[i] += c - '0';
}
if (i != num - 1)
return -1;
@@ -196,7 +213,6 @@ static int query_console_serial(int *rows, int *cols)
{
int ret = 0;
int n[2];
- u64 timeout;
/* Empty input buffer */
while (tstc())
@@ -216,14 +232,6 @@ static int query_console_serial(int *rows, int *cols)
ESC "[999;999H" /* Move to bottom right corner */
ESC "[6n"); /* Query cursor position */
- /* Allow up to one second for a response */
- timeout = timer_get_us() + 1000000;
- while (!tstc())
- if (timer_get_us() > timeout) {
- ret = -1;
- goto out;
- }
-
/* Read {rows,cols} */
if (term_read_reply(n, 2, 'R')) {
ret = 1;
