configs/qemu: bump to the latest kernel version

Xtensa patches no longer required, the make target name changed
to Image. The Qemu binary for OpenRisc was renamed upstream.
I removed the x86->x86_64 symlink, independent files preferred.

Defconfig               Kernel  Qemu            Network Status
--------------------------------------------------------------
aarch64_virt            4.11.3   2.9.0           YES     OK
arm_versatile           4.11.3   2.9.0           YES     OK
arm_versatile_nommu     4.4.70   2.9.0           YES     OK
arm_vexpress            4.11.3   2.9.0           YES     OK
m68k_mcf5208            4.11.3   2.9.0           YES     OK
m68k_q800               4.11.3   q800-v2.4.0     NO (2)  OK
microblazebe            4.11.3   2.9.0           YES     OK
microblazeel            4.11.3   2.9.0           YES     OK
mips32r2el_malta        4.11.3   2.9.0           YES     OK
mips32r2_malta          4.11.3   2.9.0           YES     OK
mips32r6el_malta        4.11.3   2.9.0           YES     OK
mips32r6_malta          4.11.3   2.9.0           YES     OK
mips64el_malta          4.11.3   2.9.0           YES     OK
mips64_malta            4.11.3   2.9.0           YES     OK
mips64r6el_malta        4.11.3   2.9.0           YES     OK
mips64r6_malta          4.11.3   2.9.0           YES     OK
nios2-10m50             4.11.3   2.9.0           NO      OK
or1k                    4.11.3   2.9.0           NO      OK (5)
ppc_g3beige             4.11.3   2.9.0           YES     OK
ppc_mpc8544ds           4.11.3   2.9.0           YES     OK
ppc_virtex_ml507        4.9.6    2.9.0           NO      OK (3)
ppc64_pseries           4.11.3   2.9.0           YES     OK
sh4                     4.9.6    2.9.0           YES     OK (4)
sh4eb                   4.9.6    2.9.0           NO (1)  OK (4)
sparc_ss10              4.11.3   2.9.0           YES     OK
sparc64_sun4u           4.11.3   2.9.0           YES     OK
sparc_sun4u             4.11.3   2.9.0           YES     OK
x86                     4.11.3   2.9.0           YES     OK
x86_64                  4.11.3   2.9.0           YES     OK
xtensa_lx60             4.11.3   2.9.0           YES     OK
xtensa_lx60_nommu       4.11.3   2.9.0           YES     OK

(1) - Probably an endian issue with 8139 emulation/driver
(2) - There's a network interface, but enabling it in qemu fails
(3) - Kernel oops with 4.11.3 on boot
(4) - System is extremely slow with 4.11.3, needs further investigation
(5) - Qemu binary got renamed to qemu-system-or1k

Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

52 files changed, 68 insertions, 87 deletions

diff --git a/board/qemu/aarch64-virt/linux-4.9.config b/board/qemu/aarch64-virt/linux-4.11.config
index 93cb42f2ea..93cb42f2ea 100644
--- a/board/qemu/aarch64-virt/linux-4.9.config
+++ b/board/qemu/aarch64-virt/linux-4.11.config
diff --git a/board/qemu/aarch64-virt/readme.txt b/board/qemu/aarch64-virt/readme.txt
index 1c4c7f9ccb..ece8a536a7 100644
--- a/board/qemu/aarch64-virt/readme.txt
+++ b/board/qemu/aarch64-virt/readme.txt
@@ -4,4 +4,4 @@ Run the emulation with:
 
 The login prompt will appear in the terminal that started Qemu.
 
-Tested with QEMU 2.6.0
+Tested with QEMU 2.9.0
diff --git a/board/qemu/arm-versatile/linux-4.9.config b/board/qemu/arm-versatile/linux-4.11.config
index b1001d84a7..b1001d84a7 100644
--- a/board/qemu/arm-versatile/linux-4.9.config
+++ b/board/qemu/arm-versatile/linux-4.11.config
diff --git a/board/qemu/arm-versatile/readme.txt b/board/qemu/arm-versatile/readme.txt
index c8ea4cda85..6e899f4b5f 100644
--- a/board/qemu/arm-versatile/readme.txt
+++ b/board/qemu/arm-versatile/readme.txt
@@ -9,4 +9,4 @@ Or for the noMMU emulation:
 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.9.0
diff --git a/board/qemu/arm-vexpress/readme.txt b/board/qemu/arm-vexpress/readme.txt
index 99812b9a0f..57bb814198 100644
--- a/board/qemu/arm-vexpress/readme.txt
+++ b/board/qemu/arm-vexpress/readme.txt
@@ -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.5.0
+Tested with QEMU 2.9.0
diff --git a/board/qemu/m68k-mcf5208/linux-4.8.config b/board/qemu/m68k-mcf5208/linux-4.11.config
index 09a89d7255..09a89d7255 100644
--- a/board/qemu/m68k-mcf5208/linux-4.8.config
+++ b/board/qemu/m68k-mcf5208/linux-4.11.config
diff --git a/board/qemu/m68k-mcf5208/readme.txt b/board/qemu/m68k-mcf5208/readme.txt
index 00deb2c39c..014a0dc09f 100644
--- a/board/qemu/m68k-mcf5208/readme.txt
+++ b/board/qemu/m68k-mcf5208/readme.txt
@@ -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.9.0
diff --git a/board/qemu/m68k-q800/linux-4.9.config b/board/qemu/m68k-q800/linux-4.11.config
index 44eb70e2d7..44eb70e2d7 100644
--- a/board/qemu/m68k-q800/linux-4.9.config
+++ b/board/qemu/m68k-q800/linux-4.11.config
diff --git a/board/qemu/microblazebe-mmu/linux-4.9.config b/board/qemu/microblazebe-mmu/linux-4.11.config
index 7bcd382060..7bcd382060 100644
--- a/board/qemu/microblazebe-mmu/linux-4.9.config
+++ b/board/qemu/microblazebe-mmu/linux-4.11.config
diff --git a/board/qemu/microblazebe-mmu/readme.txt b/board/qemu/microblazebe-mmu/readme.txt
index 25fc35ca19..cf0afdaff8 100644
--- a/board/qemu/microblazebe-mmu/readme.txt
+++ b/board/qemu/microblazebe-mmu/readme.txt
@@ -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.9.0
diff --git a/board/qemu/microblazeel-mmu/linux-4.9.config b/board/qemu/microblazeel-mmu/linux-4.11.config
index a6228280bd..a6228280bd 100644
--- a/board/qemu/microblazeel-mmu/linux-4.9.config
+++ b/board/qemu/microblazeel-mmu/linux-4.11.config
diff --git a/board/qemu/microblazeel-mmu/readme.txt b/board/qemu/microblazeel-mmu/readme.txt
index 1a77a56ff3..9edf101afd 100644
--- a/board/qemu/microblazeel-mmu/readme.txt
+++ b/board/qemu/microblazeel-mmu/readme.txt
@@ -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.9.0
diff --git a/board/qemu/mips32r2-malta/linux-4.9.config b/board/qemu/mips32r2-malta/linux-4.11.config
index 3a26ac830f..3a26ac830f 100644
--- a/board/qemu/mips32r2-malta/linux-4.9.config
+++ b/board/qemu/mips32r2-malta/linux-4.11.config
diff --git a/board/qemu/mips32r2-malta/readme.txt b/board/qemu/mips32r2-malta/readme.txt
index 13f8910b2f..7002ab1d86 100644
--- a/board/qemu/mips32r2-malta/readme.txt
+++ b/board/qemu/mips32r2-malta/readme.txt
@@ -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.5.0
+Tested with QEMU 2.9.0
diff --git a/board/qemu/mips32r2el-malta/linux-4.9.config b/board/qemu/mips32r2el-malta/linux-4.11.config
index 79d7352474..79d7352474 100644
--- a/board/qemu/mips32r2el-malta/linux-4.9.config
+++ b/board/qemu/mips32r2el-malta/linux-4.11.config
diff --git a/board/qemu/mips32r2el-malta/readme.txt b/board/qemu/mips32r2el-malta/readme.txt
index 5c4bbda6a4..bfc9c49d5a 100644
--- a/board/qemu/mips32r2el-malta/readme.txt
+++ b/board/qemu/mips32r2el-malta/readme.txt
@@ -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.5.0
+Tested with QEMU 2.9.0
diff --git a/board/qemu/mips32r6-malta/linux-4.9.config b/board/qemu/mips32r6-malta/linux-4.11.config
index d559676615..d559676615 100644
--- a/board/qemu/mips32r6-malta/linux-4.9.config
+++ b/board/qemu/mips32r6-malta/linux-4.11.config
diff --git a/board/qemu/mips32r6-malta/readme.txt b/board/qemu/mips32r6-malta/readme.txt
index 107c47d8d2..7d79c6602c 100644
--- a/board/qemu/mips32r6-malta/readme.txt
+++ b/board/qemu/mips32r6-malta/readme.txt
@@ -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.6.0
+Tested with QEMU 2.9.0
diff --git a/board/qemu/mips32r6el-malta/linux-4.9.config b/board/qemu/mips32r6el-malta/linux-4.11.config
index d559676615..d559676615 100644
--- a/board/qemu/mips32r6el-malta/linux-4.9.config
+++ b/board/qemu/mips32r6el-malta/linux-4.11.config
diff --git a/board/qemu/mips32r6el-malta/readme.txt b/board/qemu/mips32r6el-malta/readme.txt
index e29115f702..78f8350506 100644
--- a/board/qemu/mips32r6el-malta/readme.txt
+++ b/board/qemu/mips32r6el-malta/readme.txt
@@ -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.6.0
+Tested with QEMU 2.9.0
diff --git a/board/qemu/mips64-malta/linux-4.8.config b/board/qemu/mips64-malta/linux-4.11.config
index cd0b560634..cd0b560634 100644
--- a/board/qemu/mips64-malta/linux-4.8.config
+++ b/board/qemu/mips64-malta/linux-4.11.config
diff --git a/board/qemu/mips64-malta/readme.txt b/board/qemu/mips64-malta/readme.txt
index a89985ddea..8a732101a8 100644
--- a/board/qemu/mips64-malta/readme.txt
+++ b/board/qemu/mips64-malta/readme.txt
@@ -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.9.0
diff --git a/board/qemu/mips64el-malta/linux-4.9.config b/board/qemu/mips64el-malta/linux-4.11.config
index c6b46d4d7f..c6b46d4d7f 100644
--- a/board/qemu/mips64el-malta/linux-4.9.config
+++ b/board/qemu/mips64el-malta/linux-4.11.config
diff --git a/board/qemu/mips64r6-malta/linux-4.9.config b/board/qemu/mips64r6-malta/linux-4.11.config
index 0ebfdbdb05..0ebfdbdb05 100644
--- a/board/qemu/mips64r6-malta/linux-4.9.config
+++ b/board/qemu/mips64r6-malta/linux-4.11.config
diff --git a/board/qemu/mips64r6el-malta/linux-4.9.config b/board/qemu/mips64r6el-malta/linux-4.11.config
index 0ebfdbdb05..0ebfdbdb05 100644
--- a/board/qemu/mips64r6el-malta/linux-4.9.config
+++ b/board/qemu/mips64r6el-malta/linux-4.11.config
diff --git a/board/qemu/mips64r6el-malta/readme.txt b/board/qemu/mips64r6el-malta/readme.txt
index b1dc23a22f..9250cf3791 100644
--- a/board/qemu/mips64r6el-malta/readme.txt
+++ b/board/qemu/mips64r6el-malta/readme.txt
@@ -4,7 +4,4 @@ Run the emulation with:
 
 The login prompt will appear in the terminal that started Qemu.
 
-Tested with QEMU 2.6.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.9.0
diff --git a/board/qemu/nios2-10m50/linux-4.9.fragment b/board/qemu/nios2-10m50/linux-4.11.fragment
index 76c864f5c3..76c864f5c3 100644
--- a/board/qemu/nios2-10m50/linux-4.9.fragment
+++ b/board/qemu/nios2-10m50/linux-4.11.fragment
diff --git a/board/qemu/nios2-10m50/readme.txt b/board/qemu/nios2-10m50/readme.txt
index 978ba95cbe..f7dee370f7 100644
--- a/board/qemu/nios2-10m50/readme.txt
+++ b/board/qemu/nios2-10m50/readme.txt
@@ -4,6 +4,4 @@ Run the emulation with:
 
 The login prompt will appear in the terminal that started Qemu.
 
-Tested with the upcoming QEMU 2.9.0 [1]
-
-[1] http://git.qemu.org/?p=qemu.git;h=ae5045ae5b2bbd8ce1335d1b05f9ecacca83a6cf
+Tested with QEMU 2.9.0.
diff --git a/board/qemu/or1k/linux-4.9.config b/board/qemu/or1k/linux-4.11.config
index 0a817b1e7f..0a817b1e7f 100644
--- a/board/qemu/or1k/linux-4.9.config
+++ b/board/qemu/or1k/linux-4.11.config
diff --git a/board/qemu/or1k/patches/linux/0001-ld-or1k.patch b/board/qemu/or1k/patches/linux/0001-ld-or1k.patch
deleted file mode 100644
index aba2463c5f..0000000000
--- a/board/qemu/or1k/patches/linux/0001-ld-or1k.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-OpenRISC arch name was in the beginning or32
-
-Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
-
-diff -Nur linux-4.4.5.orig/arch/openrisc/kernel/vmlinux.lds.S linux-4.4.5/arch/openrisc/kernel/vmlinux.lds.S
---- linux-4.4.5.orig/arch/openrisc/kernel/vmlinux.lds.S	2016-03-10 00:35:58.000000000 +0100
-+++ linux-4.4.5/arch/openrisc/kernel/vmlinux.lds.S	2016-03-16 09:21:07.933535532 +0100
-@@ -30,7 +30,7 @@
- #include <asm/cache.h>
- #include <asm-generic/vmlinux.lds.h>
- 
--OUTPUT_FORMAT("elf32-or32", "elf32-or32", "elf32-or32")
-+OUTPUT_FORMAT("elf32-or1k", "elf32-or1k", "elf32-or1k")
- jiffies = jiffies_64 + 4;
- 
- SECTIONS
diff --git a/board/qemu/or1k/patches/linux/0002-kallsyms.patch b/board/qemu/or1k/patches/linux/0002-kallsyms.patch
deleted file mode 100644
index e788a7a9b4..0000000000
--- a/board/qemu/or1k/patches/linux/0002-kallsyms.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: https://lkml.org/lkml/2016/12/31/13
-
-The build robot reports:
-
-   .tmp_kallsyms1.o: In function `kallsyms_relative_base':
->> (.rodata+0x8a18): undefined reference to `_text'
-
-This is when using 'make alldefconfig'. Adding this _text symbol to mark
-the start of the kernel as in other architecture fixes this.
-
-Signed-off-by: Stafford Horne <shorne@gmail.com>
-Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
-
-diff -Nur linux-4.9.orig/arch/openrisc/kernel/vmlinux.lds.S linux-4.9/arch/openrisc/kernel/vmlinux.lds.S
---- linux-4.9.orig/arch/openrisc/kernel/vmlinux.lds.S	2016-12-11 20:17:54.000000000 +0100
-+++ linux-4.9/arch/openrisc/kernel/vmlinux.lds.S	2017-01-01 12:13:43.039107518 +0100
-@@ -38,6 +38,8 @@
-         /* Read-only sections, merged into text segment: */
-         . = LOAD_BASE ;
- 
-+	_text = .;
-+
- 	/* _s_kernel_ro must be page aligned */
- 	. = ALIGN(PAGE_SIZE);
- 	_s_kernel_ro = .;
diff --git a/board/qemu/or1k/readme.txt b/board/qemu/or1k/readme.txt
index 53c66ad989..a04314e750 100644
--- a/board/qemu/or1k/readme.txt
+++ b/board/qemu/or1k/readme.txt
@@ -1,9 +1,9 @@
 Run the emulation with:
 
- qemu-system-or32 -kernel output/images/vmlinux -nographic
+ qemu-system-or1k -kernel output/images/vmlinux -nographic
 
 The login prompt will appear in the terminal that started Qemu.
 
 Ethernet support is not working, yet.
 
-Tested with QEMU 2.8.0.
+Tested with QEMU 2.9.0.
diff --git a/board/qemu/ppc-g3beige/linux-4.9.config b/board/qemu/ppc-g3beige/linux-4.11.config
index 7994553544..7994553544 100644
--- a/board/qemu/ppc-g3beige/linux-4.9.config
+++ b/board/qemu/ppc-g3beige/linux-4.11.config
diff --git a/board/qemu/ppc-g3beige/readme.txt b/board/qemu/ppc-g3beige/readme.txt
index 3bd88a6e39..42c97a0c14 100644
--- a/board/qemu/ppc-g3beige/readme.txt
+++ b/board/qemu/ppc-g3beige/readme.txt
@@ -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.9.0
diff --git a/board/qemu/ppc-mpc8544ds/linux-4.9.config b/board/qemu/ppc-mpc8544ds/linux-4.11.config
index b36847c93d..b36847c93d 100644
--- a/board/qemu/ppc-mpc8544ds/linux-4.9.config
+++ b/board/qemu/ppc-mpc8544ds/linux-4.11.config
diff --git a/board/qemu/ppc-mpc8544ds/readme.txt b/board/qemu/ppc-mpc8544ds/readme.txt
index d8f31cbc94..0008c84b20 100644
--- a/board/qemu/ppc-mpc8544ds/readme.txt
+++ b/board/qemu/ppc-mpc8544ds/readme.txt
@@ -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.9.0
diff --git a/board/qemu/ppc64-pseries/readme.txt b/board/qemu/ppc64-pseries/readme.txt
index 94fa228b4b..7cc0c67d61 100644
--- a/board/qemu/ppc64-pseries/readme.txt
+++ b/board/qemu/ppc64-pseries/readme.txt
@@ -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.9.0
diff --git a/board/qemu/sh4-r2d/linux-4.9.config b/board/qemu/sh4-r2d/linux-4.11.config
index a3d6544549..a3d6544549 100644
--- a/board/qemu/sh4-r2d/linux-4.9.config
+++ b/board/qemu/sh4-r2d/linux-4.11.config
diff --git a/board/qemu/sh4eb-r2d/linux-4.9.config b/board/qemu/sh4eb-r2d/linux-4.11.config
index 6ead626c41..6ead626c41 100644
--- a/board/qemu/sh4eb-r2d/linux-4.9.config
+++ b/board/qemu/sh4eb-r2d/linux-4.11.config
diff --git a/board/qemu/sparc-ss10/linux-4.9.config b/board/qemu/sparc-ss10/linux-4.11.config
index cb8d01dc02..cb8d01dc02 100644
--- a/board/qemu/sparc-ss10/linux-4.9.config
+++ b/board/qemu/sparc-ss10/linux-4.11.config
diff --git a/board/qemu/sparc-ss10/readme.txt b/board/qemu/sparc-ss10/readme.txt
index 5a07ee0002..0ce461d2ea 100644
--- a/board/qemu/sparc-ss10/readme.txt
+++ b/board/qemu/sparc-ss10/readme.txt
@@ -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.9.0
diff --git a/board/qemu/sparc64-sun4u/linux-4.9.config b/board/qemu/sparc64-sun4u/linux-4.11.config
index 0e1e16879d..0e1e16879d 100644
--- a/board/qemu/sparc64-sun4u/linux-4.9.config
+++ b/board/qemu/sparc64-sun4u/linux-4.11.config
diff --git a/board/qemu/sparc64-sun4u/readme.txt b/board/qemu/sparc64-sun4u/readme.txt
index aaf96c3572..adfff7089e 100644
--- a/board/qemu/sparc64-sun4u/readme.txt
+++ b/board/qemu/sparc64-sun4u/readme.txt
@@ -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.9.0
diff --git a/board/qemu/x86_64/linux-4.9.config b/board/qemu/x86/linux-4.11.config
index e3bd1454e6..e3bd1454e6 100644
--- a/board/qemu/x86_64/linux-4.9.config
+++ b/board/qemu/x86/linux-4.11.config
diff --git a/board/qemu/x86/linux-4.9.config b/board/qemu/x86/linux-4.9.config
deleted file mode 120000
index 44b2fa1270..0000000000
--- a/board/qemu/x86/linux-4.9.config
+++ /dev/null
@@ -1 +0,0 @@
-../x86_64/linux-4.9.config
\ No newline at end of file
diff --git a/board/qemu/x86/readme.txt b/board/qemu/x86/readme.txt
index 4f2e4c7da3..17500961d3 100644
--- a/board/qemu/x86/readme.txt
+++ b/board/qemu/x86/readme.txt
@@ -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.5.0
+Tested with QEMU 2.9.0
diff --git a/board/qemu/x86_64/linux-4.11.config b/board/qemu/x86_64/linux-4.11.config
new file mode 100644
index 0000000000..e3bd1454e6
--- /dev/null
+++ b/board/qemu/x86_64/linux-4.11.config
@@ -0,0 +1,45 @@
+CONFIG_SYSVIPC=y
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_SMP=y
+CONFIG_HYPERVISOR_GUEST=y
+CONFIG_PARAVIRT=y
+CONFIG_NET=y
+CONFIG_PACKET=y
+CONFIG_UNIX=y
+CONFIG_INET=y
+CONFIG_VIRTIO_BLK=y
+CONFIG_BLK_DEV_SD=y
+CONFIG_SCSI_VIRTIO=y
+CONFIG_ATA=y
+CONFIG_ATA_PIIX=y
+CONFIG_NETDEVICES=y
+CONFIG_VIRTIO_NET=y
+CONFIG_NE2K_PCI=y
+CONFIG_8139CP=y
+CONFIG_INPUT_EVDEV=y
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_VIRTIO_CONSOLE=y
+CONFIG_HW_RANDOM_VIRTIO=m
+CONFIG_DRM=y
+CONFIG_DRM_BOCHS=y
+CONFIG_DRM_QXL=y
+CONFIG_DRM_VIRTIO_GPU=y
+CONFIG_SOUND=y
+CONFIG_SND=y
+CONFIG_SND_HDA_INTEL=y
+CONFIG_SND_HDA_GENERIC=y
+CONFIG_USB=y
+CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_UHCI_HCD=y
+CONFIG_USB_STORAGE=y
+CONFIG_VIRTIO_PCI=y
+CONFIG_VIRTIO_BALLOON=y
+CONFIG_VIRTIO_INPUT=y
+CONFIG_VIRTIO_MMIO=y
+CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
+CONFIG_EXT4_FS=y
+CONFIG_TMPFS=y
+CONFIG_TMPFS_POSIX_ACL=y
diff --git a/board/qemu/x86_64/readme.txt b/board/qemu/x86_64/readme.txt
index 6ea28d397f..ecd7813a1e 100644
--- a/board/qemu/x86_64/readme.txt
+++ b/board/qemu/x86_64/readme.txt
@@ -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.5.0
+Tested with QEMU 2.9.0
diff --git a/board/qemu/xtensa-lx60/linux-4.9-nommu.config b/board/qemu/xtensa-lx60/linux-4.11-nommu.config
index 10f7ee125c..10f7ee125c 100644
--- a/board/qemu/xtensa-lx60/linux-4.9-nommu.config
+++ b/board/qemu/xtensa-lx60/linux-4.11-nommu.config
diff --git a/board/qemu/xtensa-lx60/linux-4.9.config b/board/qemu/xtensa-lx60/linux-4.11.config
index 625b86049f..625b86049f 100644
--- a/board/qemu/xtensa-lx60/linux-4.9.config
+++ b/board/qemu/xtensa-lx60/linux-4.11.config
diff --git a/board/qemu/xtensa-lx60/linux/linux-0001-disable-redboot-and-uboot.patch b/board/qemu/xtensa-lx60/linux/linux-0001-disable-redboot-and-uboot.patch
deleted file mode 100644
index c0ccf48466..0000000000
--- a/board/qemu/xtensa-lx60/linux/linux-0001-disable-redboot-and-uboot.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-disable boot-uboot and boot-redboot, requires a patched u-boot and mkimage
-
-Signed-off-by:Waldemar Brodkorb <wbx@openadk.org>
-
-diff -Nur linux-3.15.orig/arch/xtensa/boot/Makefile linux-3.15/arch/xtensa/boot/Makefile
---- linux-3.15.orig/arch/xtensa/boot/Makefile	2014-06-08 20:19:54.000000000 +0200
-+++ linux-3.15/arch/xtensa/boot/Makefile	2014-06-14 20:07:15.206091165 +0200
-@@ -23,7 +23,7 @@
- 
- bootdir-$(CONFIG_XTENSA_PLATFORM_ISS)	 += boot-elf
- bootdir-$(CONFIG_XTENSA_PLATFORM_XT2000) += boot-redboot boot-elf boot-uboot
--bootdir-$(CONFIG_XTENSA_PLATFORM_XTFPGA) += boot-redboot boot-elf boot-uboot
-+bootdir-$(CONFIG_XTENSA_PLATFORM_XTFPGA) += boot-elf
- 
- zImage Image: $(bootdir-y)
- 
diff --git a/board/qemu/xtensa-lx60/readme.txt b/board/qemu/xtensa-lx60/readme.txt
index be77345e44..9a82c53752 100644
--- a/board/qemu/xtensa-lx60/readme.txt
+++ b/board/qemu/xtensa-lx60/readme.txt
@@ -4,5 +4,4 @@ Run the emulation with:
 
 The login prompt will appear in the terminal that started Qemu.
 
-Tested with QEMU 2.6.0
-Known to fail with 2.5.0
+Tested with QEMU 2.9.0