mirror of
https://github.com/MiyooCFW/buildroot.git
synced 2025-09-27 22:24:19 +03:00
Merge from bittboy/buildroot@26c91a9
This commit is contained in:
TriForceX
@@ -1,61 +0,0 @@
|
||||
From aaaced6d2d6f796ed77e4725ed7ccbedb189c180 Mon Sep 17 00:00:00 2001
|
||||
From: Romain Naour <romain.naour@gmail.com>
|
||||
Date: Fri, 15 Jun 2018 17:43:38 +0200
|
||||
Subject: [PATCH] Revert: serial: sh-sci: increase RX FIFO trigger defaults for
|
||||
(H)SCIF
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
This reverts commit 18e8cf159177100e69d528293f8cf6875c0b1bca (kernel)
|
||||
|
||||
The last Qemu kernel update [1] introduced a regresion in sh4 SCIF
|
||||
serial device. Some keyboard presses are very slow to be taken into
|
||||
account, perhaps not even taken into account at all. This would
|
||||
explain why our test infrastructure doesn’t manage to login as root
|
||||
[2][3][4].
|
||||
|
||||
git bisect reported a kernel patch from 4.11, increasing RX FIFO
|
||||
trigger defaults value for sh-sci (H)SCIF. The kernel patch itself
|
||||
looks good but the Qemu emulation is not ready to handle this new
|
||||
setting.
|
||||
|
||||
From Qemu (2.12.0): target/sh4/README.sh4
|
||||
"Configuration of the second serial port (SCIF) is supported. FIFO
|
||||
handling infrastructure has been started but is not completed yet."
|
||||
|
||||
In order to be able to test sh4 architecture with newer kernel,
|
||||
revert to the old behaviour.
|
||||
|
||||
[1] https://git.buildroot.net/buildroot/commit/?id=03fb00f2175cdb4565e26fcb9b3da1c1059de1bd
|
||||
[2] https://gitlab.com/free-electrons/toolchains-builder/-/jobs/72006425
|
||||
[3] https://gitlab.com/free-electrons/toolchains-builder/-/jobs/72006427
|
||||
[4] https://gitlab.com/free-electrons/toolchains-builder/-/jobs/72006426
|
||||
|
||||
Signed-off-by: Romain Naour <romain.naour@gmail.com>
|
||||
Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
||||
---
|
||||
drivers/tty/serial/sh-sci.c | 7 ++-----
|
||||
1 file changed, 2 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
|
||||
index ab757546c6db..138e4dec44fb 100644
|
||||
--- a/drivers/tty/serial/sh-sci.c
|
||||
+++ b/drivers/tty/serial/sh-sci.c
|
||||
@@ -2793,11 +2793,8 @@ static int sci_init_single(struct platform_device *dev,
|
||||
sci_port->rx_trigger = 32;
|
||||
break;
|
||||
case PORT_SCIF:
|
||||
- if (p->regtype == SCIx_SH7705_SCIF_REGTYPE)
|
||||
- /* RX triggering not implemented for this IP */
|
||||
- sci_port->rx_trigger = 1;
|
||||
- else
|
||||
- sci_port->rx_trigger = 8;
|
||||
+ /* RX triggering not implemented in Qemu emulation */
|
||||
+ sci_port->rx_trigger = 1;
|
||||
break;
|
||||
default:
|
||||
sci_port->rx_trigger = 1;
|
||||
--
|
||||
2.14.4
|
||||
|
||||
@@ -0,0 +1,32 @@
|
||||
From fe657afd48fc67841d32207ef9eeeb5f099764cd Mon Sep 17 00:00:00 2001
|
||||
From: Romain Naour <romain.naour@gmail.com>
|
||||
Date: Sat, 21 Dec 2019 11:52:04 +0100
|
||||
Subject: [PATCH] arch/sh: vmlinux.scr
|
||||
|
||||
Building the kernel using a toolchain built with Binutils 2.33.1 prevent
|
||||
booting a sh4 system under Qemu.
|
||||
Apply the patch provided by Alan Modra [2] that fix alignment of rodata.
|
||||
|
||||
[1] https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=ebd2263ba9a9124d93bbc0ece63d7e0fae89b40e
|
||||
[2] https://www.sourceware.org/ml/binutils/2019-12/msg00112.html
|
||||
|
||||
Signed-off-by: Romain Naour <romain.naour@gmail.com>
|
||||
---
|
||||
arch/sh/boot/compressed/vmlinux.scr | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/arch/sh/boot/compressed/vmlinux.scr b/arch/sh/boot/compressed/vmlinux.scr
|
||||
index 862d74808236..dd292b4b9082 100644
|
||||
--- a/arch/sh/boot/compressed/vmlinux.scr
|
||||
+++ b/arch/sh/boot/compressed/vmlinux.scr
|
||||
@@ -1,6 +1,6 @@
|
||||
SECTIONS
|
||||
{
|
||||
- .rodata..compressed : {
|
||||
+ .rodata..compressed : ALIGN(8) {
|
||||
input_len = .;
|
||||
LONG(input_data_end - input_data) input_data = .;
|
||||
*(.data)
|
||||
--
|
||||
2.24.1
|
||||
|
||||
@@ -0,0 +1,27 @@
|
||||
From 7f92adbba385a4e512abfd6633ac0f9f0cdf91f8 Mon Sep 17 00:00:00 2001
|
||||
From: Romain Naour <romain.naour@gmail.com>
|
||||
Date: Sat, 21 Dec 2019 11:54:07 +0100
|
||||
Subject: [PATCH] include/asm-generic: vmlinux.lds.h
|
||||
|
||||
https://www.sourceware.org/ml/binutils/2019-12/msg00112.html
|
||||
|
||||
Signed-off-by: Romain Naour <romain.naour@gmail.com>
|
||||
---
|
||||
include/asm-generic/vmlinux.lds.h | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
|
||||
index d7701d466b60..1aa33597e91e 100644
|
||||
--- a/include/asm-generic/vmlinux.lds.h
|
||||
+++ b/include/asm-generic/vmlinux.lds.h
|
||||
@@ -306,6 +306,7 @@
|
||||
*/
|
||||
#ifndef RO_AFTER_INIT_DATA
|
||||
#define RO_AFTER_INIT_DATA \
|
||||
+ . = ALIGN(8); \
|
||||
__start_ro_after_init = .; \
|
||||
*(.data..ro_after_init) \
|
||||
__end_ro_after_init = .;
|
||||
--
|
||||
2.24.1
|
||||
|
||||
@@ -1,8 +1,6 @@
|
||||
Run the emulation with:
|
||||
|
||||
qemu-system-sh4eb -M r2d -kernel output/images/zImage -drive file=output/images/rootfs.ext2,if=ide,format=raw -append "rootwait root=/dev/sda console=ttySC1,115200 noiotrap" -serial null -serial stdio -net nic,model=rtl8139 -net user
|
||||
qemu-system-sh4eb -M r2d -kernel output/images/zImage -drive file=output/images/rootfs.ext2,if=ide,format=raw -append "rootwait root=/dev/sda console=ttySC1,115200 noiotrap" -serial null -serial stdio -net nic,model=rtl8139 -net user # qemu_sh4eb_r2d_defconfig
|
||||
|
||||
The login prompt will appear in the terminal that started Qemu.
|
||||
The graphical window is the framebuffer.
|
||||
|
||||
Tested with QEMU 2.12.0
|
||||
|
||||
Reference in New Issue
Block a user