rpi/domo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bump buildroot to 2019.02

Browse Source
This commit is contained in:
NADAL Jean-Baptiste
2019-03-28 22:49:48 +01:00
parent 5598b1b762
commit 920d307141
5121 changed files with 78550 additions and 46132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bsp/buildroot/board/qemu/aarch64-virt/linux-4.13.config → bsp/buildroot/board/qemu/aarch64-virt/linux.config
View File

@@ -1,6 +1,5 @@
CONFIG_SYSVIPC=y
CONFIG_POSIX_MQUEUE=y
CONFIG_FHANDLE=y
CONFIG_NO_HZ_IDLE=y
CONFIG_HIGH_RES_TIMERS=y
CONFIG_TASKSTATS=y
@@ -10,7 +9,6 @@ CONFIG_MODULES=y
CONFIG_MODULE_UNLOAD=y
CONFIG_BLK_DEV_BSGLIB=y
CONFIG_ARCH_VEXPRESS=y
CONFIG_SMP=y
CONFIG_TRANSPARENT_HUGEPAGE=y
CONFIG_BINFMT_MISC=y
CONFIG_COMPAT=y

4
bsp/buildroot/board/qemu/aarch64-virt/readme.txt
View File

@@ -1,7 +1,7 @@
Run the emulation with:
qemu-system-aarch64 -M virt -cpu cortex-a57 -nographic -smp 1 -kernel output/images/Image -append "root=/dev/vda console=ttyAMA0" -netdev user,id=eth0 -device virtio-net-device,netdev=eth0 -drive file=output/images/rootfs.ext4,if=none,format=raw,id=hd0 -device virtio-blk-device,drive=hd0
qemu-system-aarch64 -M virt -cpu cortex-a53 -nographic -smp 1 -kernel output/images/Image -append "root=/dev/vda console=ttyAMA0" -netdev user,id=eth0 -device virtio-net-device,netdev=eth0 -drive file=output/images/rootfs.ext4,if=none,format=raw,id=hd0 -device virtio-blk-device,drive=hd0
The login prompt will appear in the terminal that started Qemu.
Tested with QEMU 2.9.0
Tested with QEMU 2.12.0

3
bsp/buildroot/board/qemu/arm-versatile/linux-4.4-nommu.config → bsp/buildroot/board/qemu/arm-versatile/linux-nommu.config
View File

@@ -1,11 +1,12 @@
# CONFIG_MMU is not set
CONFIG_ARCH_VERSATILE=y
CONFIG_ARM_SINGLE_ARCH_VERSATILE=y
CONFIG_SET_MEM_PARAM=y
CONFIG_DRAM_BASE=0x00000000
CONFIG_DRAM_SIZE=0x08000000
CONFIG_ARCH_VERSATILE_PB=y
CONFIG_MACH_VERSATILE_AB=y
# CONFIG_MACH_VERSATILE_DT is not set
CONFIG_MACH_VERSATILE_DT=y
CONFIG_BINFMT_FLAT=y
CONFIG_SYSVIPC=y
CONFIG_MODULES=y

0
bsp/buildroot/board/qemu/arm-versatile/linux-4.13.config → bsp/buildroot/board/qemu/arm-versatile/linux.config
View File

121
bsp/buildroot/board/qemu/arm-versatile/patches/linux/versatile-nommu.patch
View File

@@ -1,30 +1,113 @@
From b7c1666813424d329868335c8faf8886b0f85b6c Mon Sep 17 00:00:00 2001
From: Greg Ungerer <gerg@linux-m68k.org>
Date: Thu, 11 Aug 2016 21:33:11 +1000
Subject: [PATCH] arm: fix versatile platform to work in no-MMU mode
From 4ac4324dcdaf237aa34545b3795acb2e5c42d10e Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 1 Feb 2019 11:36:20 +0100
Subject: [PATCH] arm-versatile-nommu: Linux patch
If CONFIG_MMU is disabled then do not carry out the virtual memory address
translation for IO devices.
Originally made by Waldemar Brodkorb <wbx@openadk.org> from LKML.
With this fix in place we can run the ARM Versatile board (including its
qemu emulation) as a no-MMU Linux system.
Signed-Off-by: Waldemar Brodkorb <wbx@openadk.org>
[Gerome: reformated as a Git patch]
Signed-off-by: Gerome Burlats <gerome.burlats@smile.fr>
[Romain: fix Waldemar's authorship in Git patch]
Signed-off-by: Romain Naour <romain.naour@smile.fr>
---
arch/arm/Kconfig | 11 +++++++++++
arch/arm/Kconfig.debug | 3 ++-
arch/arm/include/asm/mach/map.h | 1 +
arch/arm/mach-versatile/Kconfig | 5 +++--
arch/arm/mach-versatile/Makefile.boot | 3 +++
arch/arm/mach-versatile/versatile_dt.c | 4 ++++
6 files changed, 24 insertions(+), 3 deletions(-)
create mode 100644 arch/arm/mach-versatile/Makefile.boot
Signed-off-by: Greg Ungerer <gerg@linux-m68k.org>
Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
diff -Nur linux-4.4.17.orig/arch/arm/mach-versatile/include/mach/hardware.h linux-4.4.17/arch/arm/mach-versatile/include/mach/hardware.h
--- linux-4.4.17.orig/arch/arm/mach-versatile/include/mach/hardware.h 2016-08-10 11:49:43.000000000 +0200
+++ linux-4.4.17/arch/arm/mach-versatile/include/mach/hardware.h 2016-08-25 23:19:03.691716292 +0200
@@ -30,8 +30,12 @@
#define VERSATILE_PCI_VIRT_BASE (void __iomem *)0xe8000000ul
#define VERSATILE_PCI_CFG_VIRT_BASE (void __iomem *)0xe9000000ul
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index e8cd55a5b04c..fc2dbff70394 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -353,6 +353,17 @@ config ARM_SINGLE_ARMV7M
select SPARSE_IRQ
select USE_OF
+config ARM_SINGLE_ARCH_VERSATILE
+ bool "ARM Ltd. Versatile family"
+ depends on !MMU
+ select AUTO_ZRELADDR
+ select CLKSRC_OF
+ select COMMON_CLK
+ select GENERIC_CLOCKEVENTS
+ select GPIOLIB
+ select SPARSE_IRQ
+ select USE_OF
+
config ARCH_EBSA110
bool "EBSA-110"
select ARCH_USES_GETTIMEOFFSET
diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index f6fcb8a79889..92fc637d3db8 100644
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -1843,7 +1843,8 @@ config DEBUG_UNCOMPRESS
config UNCOMPRESS_INCLUDE
string
default "debug/uncompress.h" if ARCH_MULTIPLATFORM || ARCH_MSM || \
- PLAT_SAMSUNG || ARM_SINGLE_ARMV7M
+ PLAT_SAMSUNG || ARM_SINGLE_ARMV7M || \
+ ARM_SINGLE_ARCH_VERSATILE
default "mach/uncompress.h"
config EARLY_PRINTK
diff --git a/arch/arm/include/asm/mach/map.h b/arch/arm/include/asm/mach/map.h
index 9b7c328fb207..b1fe9c8b5c3e 100644
--- a/arch/arm/include/asm/mach/map.h
+++ b/arch/arm/include/asm/mach/map.h
@@ -62,6 +62,7 @@ extern int ioremap_page(unsigned long virt, unsigned long phys,
#else
#define iotable_init(map,num) do { } while (0)
#define vm_reserve_area_early(a,s,c) do { } while (0)
+#define debug_ll_io_init() do { } while (0)
#endif
#endif
diff --git a/arch/arm/mach-versatile/Kconfig b/arch/arm/mach-versatile/Kconfig
index f5c275434d6c..06ad999d5978 100644
--- a/arch/arm/mach-versatile/Kconfig
+++ b/arch/arm/mach-versatile/Kconfig
@@ -1,7 +1,8 @@
# SPDX-License-Identifier: GPL-2.0
config ARCH_VERSATILE
- bool "ARM Ltd. Versatile family"
- depends on ARCH_MULTI_V5
+ bool "ARM Ltd. Versatile family" if ARCH_MULTI_V5
+ depends on ARCH_MULTI_V5 || ARM_SINGLE_ARCH_VERSATILE
+ default y if ARM_SINGLE_ARCH_VERSATILE
select ARM_AMBA
select ARM_TIMER_SP804
select ARM_VIC
diff --git a/arch/arm/mach-versatile/Makefile.boot b/arch/arm/mach-versatile/Makefile.boot
new file mode 100644
index 000000000000..eacfc3f5c33e
--- /dev/null
+++ b/arch/arm/mach-versatile/Makefile.boot
@@ -0,0 +1,3 @@
+# Empty file waiting for deletion once Makefile.boot isn't needed any more.
+# Patch waits for application at
+# http://www.arm.linux.org.uk/developer/patches/viewpatch.php?id=7889/1 .
diff --git a/arch/arm/mach-versatile/versatile_dt.c b/arch/arm/mach-versatile/versatile_dt.c
index 3c8d39c12909..8cfa05a37295 100644
--- a/arch/arm/mach-versatile/versatile_dt.c
+++ b/arch/arm/mach-versatile/versatile_dt.c
@@ -37,7 +37,11 @@
#include <asm/mach/map.h>
+#ifdef CONFIG_MMU
/* macro to get at MMIO space when running virtually */
+#ifdef CONFIG_MMU
#define IO_ADDRESS(x) (((x) & 0x0fffffff) + (((x) >> 4) & 0x0f000000) + 0xf0000000)
+#else
+#define IO_ADDRESS(x) (x)
+#endif
#define __io_address(n) ((void __iomem __force *)IO_ADDRESS(n))
/*
--
2.14.5

4
bsp/buildroot/board/qemu/arm-versatile/readme.txt
View File

@@ -4,9 +4,9 @@ Run the emulation with:
Or for the noMMU emulation:
qemu-system-arm -M versatilepb -kernel output/images/zImage -append "console=ttyAMA0,115200" -serial stdio -net user -net nic,model=smc91c111
qemu-system-arm -M versatilepb -kernel output/images/zImage -dtb output/images/versatile-pb.dtb -append "console=ttyAMA0,115200" -serial stdio -net user -net nic,model=smc91c111
The login prompt will appear in the terminal that started Qemu. The
graphical window is the framebuffer.
Tested with QEMU 2.9.0
Tested with QEMU 2.12.0

2
bsp/buildroot/board/qemu/arm-vexpress/readme.txt
View File

@@ -8,4 +8,4 @@ graphical window is the framebuffer.
If you want to emulate more cores change "-smp 1" to "-smp 2" for
dual-core or even "smp -4" for a quad-core configuration.
Tested with QEMU 2.9.0
Tested with QEMU 2.12.0

0
bsp/buildroot/board/qemu/m68k-mcf5208/linux-4.11.config → bsp/buildroot/board/qemu/m68k-mcf5208/linux.config
View File

2
bsp/buildroot/board/qemu/m68k-mcf5208/readme.txt
View File

@@ -4,4 +4,4 @@ Run the emulation with:
The login prompt will appear in the terminal that started Qemu.
Tested with QEMU 2.9.0
Tested with QEMU 2.12.0

0
bsp/buildroot/board/qemu/m68k-q800/linux-4.11.config → bsp/buildroot/board/qemu/m68k-q800/linux.config
View File

4
bsp/buildroot/board/qemu/m68k-q800/readme.txt
View File

@@ -4,5 +4,5 @@ Run the emulation with:
The login prompt will appear in the terminal that started Qemu.
Tested with QEMU 2.4.0 from https://github.com/vivier/qemu-m68k
You need following branch: q800-v2.4.0
Tested with QEMU 2.11.0 from https://github.com/vivier/qemu-m68k
You need following branch: q800-v2.11.0

0
bsp/buildroot/board/qemu/microblazebe-mmu/linux-4.11.config → bsp/buildroot/board/qemu/microblazebe-mmu/linux.config
View File

2
bsp/buildroot/board/qemu/microblazebe-mmu/readme.txt
View File

@@ -4,4 +4,4 @@ Run the emulation with:
The login prompt will appear in the terminal that started Qemu.
Tested with QEMU 2.9.0
Tested with QEMU 2.12.0

0
bsp/buildroot/board/qemu/microblazeel-mmu/linux-4.11.config → bsp/buildroot/board/qemu/microblazeel-mmu/linux.config
View File

2
bsp/buildroot/board/qemu/microblazeel-mmu/readme.txt
View File

@@ -4,4 +4,4 @@ Run the emulation with:
The login prompt will appear in the terminal that started Qemu.
Tested with QEMU 2.9.0
Tested with QEMU 2.12.0

0
bsp/buildroot/board/qemu/mips32r2-malta/linux-4.11.config → bsp/buildroot/board/qemu/mips32r2-malta/linux.config
View File

2
bsp/buildroot/board/qemu/mips32r2-malta/readme.txt
View File

@@ -6,4 +6,4 @@ The login prompt will appear in the terminal that started Qemu. The
graphical window is the framebuffer. No keyboard support has been
enabled.
Tested with QEMU 2.9.0
Tested with QEMU 2.12.0

0
bsp/buildroot/board/qemu/mips32r2el-malta/linux-4.11.config → bsp/buildroot/board/qemu/mips32r2el-malta/linux.config
View File

2
bsp/buildroot/board/qemu/mips32r2el-malta/readme.txt
View File

@@ -6,4 +6,4 @@ The login prompt will appear in the terminal that started Qemu. The
graphical window is the framebuffer. No keyboard support has been
enabled.
Tested with QEMU 2.9.0
Tested with QEMU 2.12.0

0
bsp/buildroot/board/qemu/mips32r6-malta/linux-4.11.config → bsp/buildroot/board/qemu/mips32r6-malta/linux.config
View File

2
bsp/buildroot/board/qemu/mips32r6-malta/readme.txt
View File

@@ -4,4 +4,4 @@ qemu-system-mips -M malta -cpu mips32r6-generic -kernel output/images/vmlinux -d
The login prompt will appear in the terminal that started Qemu.
Tested with QEMU 2.9.0
Tested with QEMU 2.12.0

0
bsp/buildroot/board/qemu/mips32r6el-malta/linux-4.11.config → bsp/buildroot/board/qemu/mips32r6el-malta/linux.config
View File

2
bsp/buildroot/board/qemu/mips32r6el-malta/readme.txt
View File

@@ -4,4 +4,4 @@ qemu-system-mipsel -M malta -cpu mips32r6-generic -kernel output/images/vmlinux
The login prompt will appear in the terminal that started Qemu.
Tested with QEMU 2.9.0
Tested with QEMU 2.12.0

0
bsp/buildroot/board/qemu/mips64-malta/linux-4.11.config → bsp/buildroot/board/qemu/mips64-malta/linux.config
View File

2
bsp/buildroot/board/qemu/mips64-malta/readme.txt
View File

@@ -5,4 +5,4 @@ Run the emulation with:
The login prompt will appear in the terminal that started Qemu. The
graphical window is the framebuffer.
Tested with QEMU 2.9.0
Tested with QEMU 2.12.0

0
bsp/buildroot/board/qemu/mips64el-malta/linux-4.11.config → bsp/buildroot/board/qemu/mips64el-malta/linux.config
View File

2
bsp/buildroot/board/qemu/mips64el-malta/readme.txt
View File

@@ -5,4 +5,4 @@ Run the emulation with:
The login prompt will appear in the terminal that started Qemu. The
graphical window is the framebuffer.
Tested with QEMU 2.5.0
Tested with QEMU 2.12.0

0
bsp/buildroot/board/qemu/mips64r6-malta/linux-4.11.config → bsp/buildroot/board/qemu/mips64r6-malta/linux.config
View File

5
bsp/buildroot/board/qemu/mips64r6-malta/readme.txt
View File

@@ -4,7 +4,4 @@ Run the emulation with:
The login prompt will appear in the terminal that started Qemu.
Tested with QEMU 2.7.0
Might work with 2.6.0 by changing the -cpu entry to MIPS64R6-generic
since the naming was updated and the old name removed in 2.7.0
Tested with QEMU 2.12.0

0
bsp/buildroot/board/qemu/mips64r6el-malta/linux-4.11.config → bsp/buildroot/board/qemu/mips64r6el-malta/linux.config
View File

2
bsp/buildroot/board/qemu/mips64r6el-malta/readme.txt
View File

@@ -4,4 +4,4 @@ Run the emulation with:
The login prompt will appear in the terminal that started Qemu.
Tested with QEMU 2.9.0
Tested with QEMU 2.12.0

0
bsp/buildroot/board/qemu/nios2-10m50/linux-4.11.fragment → bsp/buildroot/board/qemu/nios2-10m50/linux.fragment
View File

2
bsp/buildroot/board/qemu/nios2-10m50/readme.txt
View File

@@ -4,4 +4,4 @@ Run the emulation with:
The login prompt will appear in the terminal that started Qemu.
Tested with QEMU 2.9.0.
Tested with QEMU 2.12.0.

2
bsp/buildroot/board/qemu/or1k/readme.txt
View File

@@ -6,4 +6,4 @@ The login prompt will appear in the terminal that started Qemu.
Ethernet support is not working, yet.
Tested with QEMU 2.9.0.
Tested with QEMU 2.12.0.

0
bsp/buildroot/board/qemu/ppc-g3beige/linux-4.11.config → bsp/buildroot/board/qemu/ppc-g3beige/linux.config
View File

2
bsp/buildroot/board/qemu/ppc-g3beige/readme.txt
View File

@@ -5,4 +5,4 @@ Run the emulation with:
The login prompt will appear in the terminal that started Qemu. The
graphical window is the framebuffer.
Tested with QEMU 2.9.0
Tested with QEMU 2.12.0

0
bsp/buildroot/board/qemu/ppc-mpc8544ds/linux-4.11.config → bsp/buildroot/board/qemu/ppc-mpc8544ds/linux.config
View File

2
bsp/buildroot/board/qemu/ppc-mpc8544ds/readme.txt
View File

@@ -4,4 +4,4 @@ Run the emulation with:
The login prompt will appear in the terminal that started Qemu.
Tested with QEMU 2.9.0
Tested with QEMU 2.12.0

0
bsp/buildroot/board/qemu/ppc-virtex-ml507/linux-4.9.config → bsp/buildroot/board/qemu/ppc-virtex-ml507/linux.config
View File

2
bsp/buildroot/board/qemu/ppc-virtex-ml507/readme.txt
View File

@@ -4,4 +4,4 @@ Run the emulation with:
The login prompt will appear in the terminal that started Qemu.
Tested with QEMU 2.5.0
Tested with QEMU 2.12.0

10
bsp/buildroot/board/qemu/ppc64-e5500/linux.fragment Normal file
View File

@@ -0,0 +1,10 @@
# Enables generic PPC e500 base arch support for QEMU.
# The e5500 is a variant of the e500 arch.
CONFIG_PPC_QEMU_E500=y
# Enable virtio (blk, rng and net devices)
CONFIG_VIRTIO=y
CONFIG_VIRTIO_PCI=y
CONFIG_HW_RANDOM_VIRTIO=y
CONFIG_VIRTIO_BLK=y
CONFIG_VIRTIO_NET=y

7
bsp/buildroot/board/qemu/ppc64-e5500/readme.txt Normal file
View File

@@ -0,0 +1,7 @@
Run the emulation with:
qemu-system-ppc64 -M ppce500 -cpu e5500 -m 256 -kernel output/images/uImage -drive file=output/images/rootfs.ext2,if=virtio,format=raw -append "console=ttyS0 root=/dev/vda" -serial mon:stdio -nographic
The login prompt will appear in the terminal that started Qemu.
Tested with QEMU 2.12.0

2
bsp/buildroot/board/qemu/ppc64-pseries/readme.txt
View File

@@ -4,4 +4,4 @@ Run the emulation with:
The login prompt will appear in the terminal that started Qemu.
Tested with QEMU 2.9.0
Tested with QEMU 2.12.0

2
bsp/buildroot/board/qemu/ppc64le-pseries/readme.txt
View File

@@ -4,4 +4,4 @@ qemu-system-ppc64 -M pseries -cpu POWER8 -m 256 -kernel output/images/vmlinux -a
The login prompt will appear in the terminal window.
Tested with QEMU 2.10.0
Tested with QEMU 2.12.0

23
bsp/buildroot/board/qemu/riscv32-virt/linux.config Normal file
View File

@@ -0,0 +1,23 @@
CONFIG_ARCH_RV32I=y
CONFIG_SMP=y
CONFIG_NR_CPUS=8
CONFIG_PCI=y
CONFIG_SYSVIPC=y
CONFIG_NET=y
CONFIG_PACKET=y
CONFIG_UNIX=y
CONFIG_INET=y
# CONFIG_WIRELESS is not set
CONFIG_VIRTIO_BLK=y
CONFIG_NETDEVICES=y
CONFIG_VIRTIO_NET=y
# CONFIG_ETHERNET is not set
# CONFIG_WLAN is not set
CONFIG_SERIAL_8250=y
CONFIG_SERIAL_8250_CONSOLE=y
CONFIG_SERIAL_OF_PLATFORM=y
CONFIG_VIRT_DRIVERS=y
CONFIG_VIRTIO_MMIO=y
CONFIG_EXT2_FS=y
CONFIG_EXT4_FS=y
CONFIG_TMPFS=y

7
bsp/buildroot/board/qemu/riscv32-virt/readme.txt Normal file
View File

@@ -0,0 +1,7 @@
Run the emulation with:
qemu-system-riscv32 -M virt -kernel output/images/bbl -append "root=/dev/vda ro console=ttyS0" -drive file=output/images/rootfs.ext2,format=raw,id=hd0 -device virtio-blk-device,drive=hd0 -netdev user,id=net0 -device virtio-net-device,netdev=net0 -nographic
The login prompt will appear in the terminal that started Qemu.
Tested with QEMU 2.12.1

7
bsp/buildroot/board/qemu/riscv64-virt/readme.txt Normal file
View File

@@ -0,0 +1,7 @@
Run the emulation with:
qemu-system-riscv64 -M virt -kernel output/images/bbl -append "root=/dev/vda ro console=ttyS0" -drive file=output/images/rootfs.ext2,format=raw,id=hd0 -device virtio-blk-device,drive=hd0 -netdev user,id=net0 -device virtio-net-device,netdev=net0 -nographic
The login prompt will appear in the terminal that started Qemu.
Tested with QEMU 2.12.1

0
bsp/buildroot/board/qemu/sh4-r2d/linux-4.9.config → bsp/buildroot/board/qemu/sh4-r2d/linux.config
View File

61
bsp/buildroot/board/qemu/sh4-r2d/patches/linux/0001-Revert-serial-sh-sci-increase-RX-FIFO-trigger-defaul.patch Normal file
View File

@@ -0,0 +1,61 @@
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

2
bsp/buildroot/board/qemu/sh4-r2d/readme.txt
View File

@@ -5,4 +5,4 @@ Run the emulation with:
The login prompt will appear in the terminal that started Qemu.
The graphical window is the framebuffer.
Tested with QEMU 2.5.0
Tested with QEMU 2.12.0

0
bsp/buildroot/board/qemu/sh4eb-r2d/linux-4.9.config → bsp/buildroot/board/qemu/sh4eb-r2d/linux.config
View File

61
bsp/buildroot/board/qemu/sh4eb-r2d/patches/linux/0001-Revert-serial-sh-sci-increase-RX-FIFO-trigger-defaul.patch Normal file
View File

@@ -0,0 +1,61 @@
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

2
bsp/buildroot/board/qemu/sh4eb-r2d/readme.txt
View File

@@ -5,4 +5,4 @@ Run the emulation with:
The login prompt will appear in the terminal that started Qemu.
The graphical window is the framebuffer.
Tested with QEMU 2.5.0
Tested with QEMU 2.12.0

0
bsp/buildroot/board/qemu/sparc-ss10/linux-4.11.config → bsp/buildroot/board/qemu/sparc-ss10/linux.config
View File

2
bsp/buildroot/board/qemu/sparc-ss10/readme.txt
View File

@@ -4,4 +4,4 @@ Run the emulation with:
The login prompt will appear in the terminal that started Qemu.
Tested with QEMU 2.9.0
Tested with QEMU 2.12.0

0
bsp/buildroot/board/qemu/sparc64-sun4u/linux-4.11.config → bsp/buildroot/board/qemu/sparc64-sun4u/linux.config
View File

2
bsp/buildroot/board/qemu/sparc64-sun4u/readme.txt
View File

@@ -4,4 +4,4 @@ Run the emulation with:
The login prompt will appear in the terminal that started Qemu.
Tested with QEMU 2.9.0
Tested with QEMU 2.12.0

0
bsp/buildroot/board/qemu/x86/linux-4.15.config → bsp/buildroot/board/qemu/x86/linux.config
View File

2
bsp/buildroot/board/qemu/x86/readme.txt
View File

@@ -6,4 +6,4 @@ Optionally add -smp N to emulate a SMP system with N CPUs.
The login prompt will appear in the graphical window.
Tested with QEMU 2.9.0
Tested with QEMU 2.12.0

0
bsp/buildroot/board/qemu/x86_64/linux-4.15.config → bsp/buildroot/board/qemu/x86_64/linux.config
View File

2
bsp/buildroot/board/qemu/x86_64/readme.txt
View File

@@ -6,4 +6,4 @@ Optionally add -smp N to emulate a SMP system with N CPUs.
The login prompt will appear in the graphical window.
Tested with QEMU 2.9.0
Tested with QEMU 2.12.0

1
bsp/buildroot/board/qemu/xtensa-lx60/linux-4.11-nommu.config → bsp/buildroot/board/qemu/xtensa-lx60/linux-nommu.config
View File

@@ -6,6 +6,7 @@ CONFIG_XTENSA_VARIANT_CUSTOM_NAME="dc233c"
# CONFIG_XTENSA_VARIANT_MMU is not set
CONFIG_XTENSA_UNALIGNED_USER=y
CONFIG_PREEMPT=y
CONFIG_MEMMAP_CACHEATTR=0x2cccccc7
CONFIG_KERNEL_LOAD_ADDRESS=0x00003000
# CONFIG_PCI is not set
CONFIG_XTENSA_PLATFORM_XTFPGA=y

0
bsp/buildroot/board/qemu/xtensa-lx60/linux-4.11.config → bsp/buildroot/board/qemu/xtensa-lx60/linux.config
View File

2
bsp/buildroot/board/qemu/xtensa-lx60/readme.txt
View File

@@ -4,4 +4,4 @@ Run the emulation with:
The login prompt will appear in the terminal that started Qemu.
Tested with QEMU 2.9.0
Tested with QEMU 2.12.0