aboutsummaryrefslogtreecommitdiff
path: root/board/qemu
diff options
context:
space:
mode:
authorGravatar Peter Korsgaard <peter@korsgaard.com>2018-03-05 21:04:14 +0100
committerGravatar Peter Korsgaard <peter@korsgaard.com>2018-03-05 21:04:14 +0100
commit92b8bd0879e5f594d1233091437ac9a8b0c240d7 (patch)
treec0196bf0d0ad2603198f469e0eda88fe71b7abc0 /board/qemu
parent528f16547689fa771bc7cb8de0885286dd439c17 (diff)
parentfb4a33e586bc041a43cd415869e91d29287dcefd (diff)
downloadbuildroot-92b8bd0879e5f594d1233091437ac9a8b0c240d7.tar.gz
buildroot-92b8bd0879e5f594d1233091437ac9a8b0c240d7.tar.bz2
Merge branch 'next'
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'board/qemu')
-rw-r--r--board/qemu/aarch64-virt/linux-4.15.config (renamed from board/qemu/aarch64-virt/linux-4.13.config)2
-rw-r--r--board/qemu/aarch64-virt/readme.txt2
2 files changed, 1 insertions, 3 deletions
diff --git a/board/qemu/aarch64-virt/linux-4.13.config b/board/qemu/aarch64-virt/linux-4.15.config
index 93cb42f2ea..c9f2708ad5 100644
--- a/board/qemu/aarch64-virt/linux-4.13.config
+++ b/board/qemu/aarch64-virt/linux-4.15.config
@@ -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
diff --git a/board/qemu/aarch64-virt/readme.txt b/board/qemu/aarch64-virt/readme.txt
index 9e09d953f9..ce0b621366 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.9.0
+Tested with QEMU 2.11.0