aboutsummaryrefslogtreecommitdiff
path: root/board/qemu
diff options
context:
space:
mode:
authorGravatar Gustavo Zacarias <gustavo@zacarias.com.ar>2016-06-07 09:13:01 -0300
committerGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2016-06-08 22:23:33 +0200
commitd7eb5c56bb3ee7a62eae6b66b4c84c2a61be0480 (patch)
tree2d0fcdf034b1fea89066a38404d0fa4b7dd16466 /board/qemu
parent752989b2cca664b1bd8b004b8d25f3b40409b061 (diff)
downloadbuildroot-d7eb5c56bb3ee7a62eae6b66b4c84c2a61be0480.tar.gz
buildroot-d7eb5c56bb3ee7a62eae6b66b4c84c2a61be0480.tar.bz2
configs/qemu: bump to latest version
Also bump the pc samples since they're tied to the (base) qemu config. Results table: Defconfig Kernel Qemu Network Status -------------------------------------------------------------- aarch64_virt 4.5.6 2.5.0 YES OK (4) arm_versatile 4.6.1 2.5.0 YES OK arm_vexpress 4.6.1 2.5.0 YES OK m68k_mcf5208 4.6.1 2.5.0 YES OK m68k_q800 4.6.1 q800-v2.4.0 NO (3) OK microblazebe 4.6.1 2.5.0 YES OK microblazeel 4.6.1 2.5.0 YES OK mips64el_malta 4.6.1 2.5.0 YES OK mips64_malta 4.6.1 2.5.0 YES OK mipsel_malta 4.6.1 2.5.0 YES OK mips_malta 4.6.1 2.5.0 YES OK ppc_g3beige 4.6.1 2.5.0 YES OK ppc_mpc8544ds 4.6.1 2.5.0 YES OK ppc_virtex_ml507 4.6.1 2.5.0 NO OK ppc64_pseries 4.6.1 2.5.0 YES OK sh4 4.6.1 2.5.0 YES OK sh4eb 4.6.1 2.5.0 NO (1) OK sparc_ss10 4.6.1 2.5.0 YES OK sparc64_sun4u 4.6.1 2.5.0 YES OK sparc_sun4u 4.6.1 2.5.0 YES OK x86 4.6.1 2.5.0 YES OK x86_64 4.6.1 2.5.0 YES OK xtensa_lx60 4.6.1 2.6.0 YES OK (2) xtensa_lx60_nommu 4.6.1 2.6.0 YES OK (2) (1) - Probably an endian issue with 8139 emulation/driver (2) - Linux 4.5/4.6 doesn't work with older Qemu versions (3) - There's a network interface, but enabling it in qemu fails (4) - Console looks dead in 4.6 Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'board/qemu')
-rw-r--r--board/qemu/arm-versatile/linux-4.6.config (renamed from board/qemu/arm-versatile/linux-4.5.config)0
-rw-r--r--board/qemu/m68k-mcf5208/linux-4.6.config (renamed from board/qemu/m68k-mcf5208/linux-4.5.config)0
-rw-r--r--board/qemu/m68k-mcf5208/patches/linux/0001-fix-do_sigreturn.patch100
-rw-r--r--board/qemu/m68k-q800/linux-4.6.config (renamed from board/qemu/m68k-q800/linux-4.5.config)0
-rw-r--r--board/qemu/microblazebe-mmu/linux-4.6.config (renamed from board/qemu/microblazebe-mmu/linux-4.5.config)0
-rw-r--r--board/qemu/microblazeel-mmu/linux-4.6.config (renamed from board/qemu/microblazeel-mmu/linux-4.5.config)0
-rw-r--r--board/qemu/mips-malta/linux-4.6.config (renamed from board/qemu/mips-malta/linux-4.5.config)0
-rw-r--r--board/qemu/mips64-malta/linux-4.6.config (renamed from board/qemu/mips64-malta/linux-4.5.config)0
-rw-r--r--board/qemu/mips64el-malta/linux-4.6.config (renamed from board/qemu/mips64el-malta/linux-4.5.config)0
-rw-r--r--board/qemu/mipsel-malta/linux-4.6.config (renamed from board/qemu/mipsel-malta/linux-4.5.config)0
-rw-r--r--board/qemu/ppc-g3beige/linux-4.6.config (renamed from board/qemu/ppc-g3beige/linux-4.5.config)0
-rw-r--r--board/qemu/ppc-mpc8544ds/linux-4.6.config (renamed from board/qemu/ppc-mpc8544ds/linux-4.5.config)0
-rw-r--r--board/qemu/ppc-virtex-ml507/linux-4.6.config (renamed from board/qemu/ppc-virtex-ml507/linux-4.5.config)0
-rw-r--r--board/qemu/sh4-r2d/linux-4.6.config (renamed from board/qemu/sh4-r2d/linux-4.5.config)0
-rw-r--r--board/qemu/sh4eb-r2d/linux-4.6.config (renamed from board/qemu/sh4eb-r2d/linux-4.5.config)0
-rw-r--r--board/qemu/sparc-ss10/linux-4.6.config (renamed from board/qemu/sparc-ss10/linux-4.5.config)0
-rw-r--r--board/qemu/sparc64-sun4u/linux-4.6.config (renamed from board/qemu/sparc64-sun4u/linux-4.5.config)0
l---------board/qemu/x86/linux-4.5.config1
l---------board/qemu/x86/linux-4.6.config1
-rw-r--r--board/qemu/x86_64/linux-4.6.config (renamed from board/qemu/x86_64/linux-4.5.config)0
-rw-r--r--board/qemu/xtensa-lx60/linux-4.6-nommu.config (renamed from board/qemu/xtensa-lx60/linux-4.4-nommu.config)0
-rw-r--r--board/qemu/xtensa-lx60/linux-4.6.config (renamed from board/qemu/xtensa-lx60/linux-4.4.config)0
-rw-r--r--board/qemu/xtensa-lx60/readme.txt3
23 files changed, 3 insertions, 102 deletions
diff --git a/board/qemu/arm-versatile/linux-4.5.config b/board/qemu/arm-versatile/linux-4.6.config
index b1001d84a7..b1001d84a7 100644
--- a/board/qemu/arm-versatile/linux-4.5.config
+++ b/board/qemu/arm-versatile/linux-4.6.config
diff --git a/board/qemu/m68k-mcf5208/linux-4.5.config b/board/qemu/m68k-mcf5208/linux-4.6.config
index 09a89d7255..09a89d7255 100644
--- a/board/qemu/m68k-mcf5208/linux-4.5.config
+++ b/board/qemu/m68k-mcf5208/linux-4.6.config
diff --git a/board/qemu/m68k-mcf5208/patches/linux/0001-fix-do_sigreturn.patch b/board/qemu/m68k-mcf5208/patches/linux/0001-fix-do_sigreturn.patch
deleted file mode 100644
index c52a4e2288..0000000000
--- a/board/qemu/m68k-mcf5208/patches/linux/0001-fix-do_sigreturn.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From a95517992a37488c0bc8b629c47c570e580e407d Mon Sep 17 00:00:00 2001
-From: Greg Ungerer <gerg@uclinux.org>
-Date: Mon, 15 Feb 2016 16:36:29 +1000
-Subject: m68k: Use conventional function parameters for do_sigreturn
-
-Create conventional stack parameters for the calls to do_sigreturn and
-do_rt_sigreturn. The current C code for do_sigreturn and do_rt_sigreturn
-dig into the stack to create local pointers to the saved switch stack
-and the pt_regs structs.
-
-The motivation for this change is a problem with non-MMU targets that
-have broken signal return paths on newer versions of gcc. It appears as
-though gcc has determined that the pointers into the saved stack structs,
-and the saved structs themselves, are function parameters and updates to
-them will be lost on function return, so they are optimized away. This
-results in large parts of restore_sigcontext() and mangle_kernel_stack()
-functions being removed. Of course this results in non-functional code
-causing kernel oops. This problem has been observed with gcc version
-5.2 and 5.3, and probably exists in earlier versions as well.
-
-Using conventional stack parameter pointers passed to these functions has
-the advantage of the code here not needing to know the exact details of
-how the underlying entry handler layed these structs out on the stack.
-So the rather ugly pointer setup casting and arg referencing can be
-removed.
-
-The resulting code after this change is a few bytes larger (due to the
-overhead of creating the stack args and their tear down). Not being hot
-paths I don't think this is too much of a problem here.
-
-An alternative solution is to put a barrier() in the do_sigreturn() code,
-but this doesn't feel quite as clean as this solution.
-
-This change has been compile tested on all defconfigs, and run tested on
-Atari (through aranym), ColdFire with MMU (M5407EVB) and ColdFire with
-no-MMU (QEMU and M5208EVB).
-
-Signed-off-by: Greg Ungerer <gerg@uclinux.org>
-Acked-by: Andreas Schwab <schwab@linux-m68k.org>
-Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
----
- arch/m68k/kernel/entry.S | 6 ++++++
- arch/m68k/kernel/signal.c | 8 ++------
- 2 files changed, 8 insertions(+), 6 deletions(-)
-
-diff --git a/arch/m68k/kernel/entry.S b/arch/m68k/kernel/entry.S
-index b54ac7a..97cd3ea 100644
---- a/arch/m68k/kernel/entry.S
-+++ b/arch/m68k/kernel/entry.S
-@@ -71,13 +71,19 @@ ENTRY(__sys_vfork)
-
- ENTRY(sys_sigreturn)
- SAVE_SWITCH_STACK
-+ movel %sp,%sp@- | switch_stack pointer
-+ pea %sp@(SWITCH_STACK_SIZE+4) | pt_regs pointer
- jbsr do_sigreturn
-+ addql #8,%sp
- RESTORE_SWITCH_STACK
- rts
-
- ENTRY(sys_rt_sigreturn)
- SAVE_SWITCH_STACK
-+ movel %sp,%sp@- | switch_stack pointer
-+ pea %sp@(SWITCH_STACK_SIZE+4) | pt_regs pointer
- jbsr do_rt_sigreturn
-+ addql #8,%sp
- RESTORE_SWITCH_STACK
- rts
-
-diff --git a/arch/m68k/kernel/signal.c b/arch/m68k/kernel/signal.c
-index af1c4f3..2dcee3a 100644
---- a/arch/m68k/kernel/signal.c
-+++ b/arch/m68k/kernel/signal.c
-@@ -737,10 +737,8 @@ badframe:
- return 1;
- }
-
--asmlinkage int do_sigreturn(unsigned long __unused)
-+asmlinkage int do_sigreturn(struct pt_regs *regs, struct switch_stack *sw)
- {
-- struct switch_stack *sw = (struct switch_stack *) &__unused;
-- struct pt_regs *regs = (struct pt_regs *) (sw + 1);
- unsigned long usp = rdusp();
- struct sigframe __user *frame = (struct sigframe __user *)(usp - 4);
- sigset_t set;
-@@ -764,10 +762,8 @@ badframe:
- return 0;
- }
-
--asmlinkage int do_rt_sigreturn(unsigned long __unused)
-+asmlinkage int do_rt_sigreturn(struct pt_regs *regs, struct switch_stack *sw)
- {
-- struct switch_stack *sw = (struct switch_stack *) &__unused;
-- struct pt_regs *regs = (struct pt_regs *) (sw + 1);
- unsigned long usp = rdusp();
- struct rt_sigframe __user *frame = (struct rt_sigframe __user *)(usp - 4);
- sigset_t set;
---
-cgit v0.12
-
diff --git a/board/qemu/m68k-q800/linux-4.5.config b/board/qemu/m68k-q800/linux-4.6.config
index 44eb70e2d7..44eb70e2d7 100644
--- a/board/qemu/m68k-q800/linux-4.5.config
+++ b/board/qemu/m68k-q800/linux-4.6.config
diff --git a/board/qemu/microblazebe-mmu/linux-4.5.config b/board/qemu/microblazebe-mmu/linux-4.6.config
index 7bcd382060..7bcd382060 100644
--- a/board/qemu/microblazebe-mmu/linux-4.5.config
+++ b/board/qemu/microblazebe-mmu/linux-4.6.config
diff --git a/board/qemu/microblazeel-mmu/linux-4.5.config b/board/qemu/microblazeel-mmu/linux-4.6.config
index a6228280bd..a6228280bd 100644
--- a/board/qemu/microblazeel-mmu/linux-4.5.config
+++ b/board/qemu/microblazeel-mmu/linux-4.6.config
diff --git a/board/qemu/mips-malta/linux-4.5.config b/board/qemu/mips-malta/linux-4.6.config
index 3a26ac830f..3a26ac830f 100644
--- a/board/qemu/mips-malta/linux-4.5.config
+++ b/board/qemu/mips-malta/linux-4.6.config
diff --git a/board/qemu/mips64-malta/linux-4.5.config b/board/qemu/mips64-malta/linux-4.6.config
index cd0b560634..cd0b560634 100644
--- a/board/qemu/mips64-malta/linux-4.5.config
+++ b/board/qemu/mips64-malta/linux-4.6.config
diff --git a/board/qemu/mips64el-malta/linux-4.5.config b/board/qemu/mips64el-malta/linux-4.6.config
index c6b46d4d7f..c6b46d4d7f 100644
--- a/board/qemu/mips64el-malta/linux-4.5.config
+++ b/board/qemu/mips64el-malta/linux-4.6.config
diff --git a/board/qemu/mipsel-malta/linux-4.5.config b/board/qemu/mipsel-malta/linux-4.6.config
index 79d7352474..79d7352474 100644
--- a/board/qemu/mipsel-malta/linux-4.5.config
+++ b/board/qemu/mipsel-malta/linux-4.6.config
diff --git a/board/qemu/ppc-g3beige/linux-4.5.config b/board/qemu/ppc-g3beige/linux-4.6.config
index 7994553544..7994553544 100644
--- a/board/qemu/ppc-g3beige/linux-4.5.config
+++ b/board/qemu/ppc-g3beige/linux-4.6.config
diff --git a/board/qemu/ppc-mpc8544ds/linux-4.5.config b/board/qemu/ppc-mpc8544ds/linux-4.6.config
index b36847c93d..b36847c93d 100644
--- a/board/qemu/ppc-mpc8544ds/linux-4.5.config
+++ b/board/qemu/ppc-mpc8544ds/linux-4.6.config
diff --git a/board/qemu/ppc-virtex-ml507/linux-4.5.config b/board/qemu/ppc-virtex-ml507/linux-4.6.config
index ed4eb792b6..ed4eb792b6 100644
--- a/board/qemu/ppc-virtex-ml507/linux-4.5.config
+++ b/board/qemu/ppc-virtex-ml507/linux-4.6.config
diff --git a/board/qemu/sh4-r2d/linux-4.5.config b/board/qemu/sh4-r2d/linux-4.6.config
index a3d6544549..a3d6544549 100644
--- a/board/qemu/sh4-r2d/linux-4.5.config
+++ b/board/qemu/sh4-r2d/linux-4.6.config
diff --git a/board/qemu/sh4eb-r2d/linux-4.5.config b/board/qemu/sh4eb-r2d/linux-4.6.config
index 6ead626c41..6ead626c41 100644
--- a/board/qemu/sh4eb-r2d/linux-4.5.config
+++ b/board/qemu/sh4eb-r2d/linux-4.6.config
diff --git a/board/qemu/sparc-ss10/linux-4.5.config b/board/qemu/sparc-ss10/linux-4.6.config
index cb8d01dc02..cb8d01dc02 100644
--- a/board/qemu/sparc-ss10/linux-4.5.config
+++ b/board/qemu/sparc-ss10/linux-4.6.config
diff --git a/board/qemu/sparc64-sun4u/linux-4.5.config b/board/qemu/sparc64-sun4u/linux-4.6.config
index 0e1e16879d..0e1e16879d 100644
--- a/board/qemu/sparc64-sun4u/linux-4.5.config
+++ b/board/qemu/sparc64-sun4u/linux-4.6.config
diff --git a/board/qemu/x86/linux-4.5.config b/board/qemu/x86/linux-4.5.config
deleted file mode 120000
index 735bcf7a15..0000000000
--- a/board/qemu/x86/linux-4.5.config
+++ /dev/null
@@ -1 +0,0 @@
-../x86_64/linux-4.5.config \ No newline at end of file
diff --git a/board/qemu/x86/linux-4.6.config b/board/qemu/x86/linux-4.6.config
new file mode 120000
index 0000000000..62e694fad4
--- /dev/null
+++ b/board/qemu/x86/linux-4.6.config
@@ -0,0 +1 @@
+../x86_64/linux-4.6.config \ No newline at end of file
diff --git a/board/qemu/x86_64/linux-4.5.config b/board/qemu/x86_64/linux-4.6.config
index e3bd1454e6..e3bd1454e6 100644
--- a/board/qemu/x86_64/linux-4.5.config
+++ b/board/qemu/x86_64/linux-4.6.config
diff --git a/board/qemu/xtensa-lx60/linux-4.4-nommu.config b/board/qemu/xtensa-lx60/linux-4.6-nommu.config
index 29f6fa4cb9..29f6fa4cb9 100644
--- a/board/qemu/xtensa-lx60/linux-4.4-nommu.config
+++ b/board/qemu/xtensa-lx60/linux-4.6-nommu.config
diff --git a/board/qemu/xtensa-lx60/linux-4.4.config b/board/qemu/xtensa-lx60/linux-4.6.config
index 2d8e58d782..2d8e58d782 100644
--- a/board/qemu/xtensa-lx60/linux-4.4.config
+++ b/board/qemu/xtensa-lx60/linux-4.6.config
diff --git a/board/qemu/xtensa-lx60/readme.txt b/board/qemu/xtensa-lx60/readme.txt
index 22f5e5a4ca..be77345e44 100644
--- a/board/qemu/xtensa-lx60/readme.txt
+++ b/board/qemu/xtensa-lx60/readme.txt
@@ -4,4 +4,5 @@ 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.6.0
+Known to fail with 2.5.0