summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGustavo Zacarias <gustavo@zacarias.com.ar>2014-10-07 09:29:50 -0300
committerPeter Korsgaard <peter@korsgaard.com>2014-10-07 17:01:03 +0200
commitdeec9a03202c5fd036be802c3920cd635def6c86 (patch)
treeae806cb2a0025091b89ee0bcbeff776283dead60
parenteca8acf79d4d3e6479acf4266d6246ebac03f7cd (diff)
downloadbuildroot-deec9a03202c5fd036be802c3920cd635def6c86.tar.gz
buildroot-deec9a03202c5fd036be802c3920cd635def6c86.zip
qemu/x86: update to the latest versions
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--board/qemu/x86/linux-3.17.config (renamed from board/qemu/x86/linux-3.16.config)0
-rw-r--r--board/qemu/x86/readme.txt2
-rw-r--r--configs/qemu_x86_defconfig10
3 files changed, 6 insertions, 6 deletions
diff --git a/board/qemu/x86/linux-3.16.config b/board/qemu/x86/linux-3.17.config
index 920a0a6800..920a0a6800 100644
--- a/board/qemu/x86/linux-3.16.config
+++ b/board/qemu/x86/linux-3.17.config
diff --git a/board/qemu/x86/readme.txt b/board/qemu/x86/readme.txt
index 92ce47c30a..c70255705b 100644
--- a/board/qemu/x86/readme.txt
+++ b/board/qemu/x86/readme.txt
@@ -4,4 +4,4 @@ Run the emulation with:
The login prompt will appear in the graphical window.
-Tested with QEMU 2.1.0
+Tested with QEMU 2.1.2
diff --git a/configs/qemu_x86_defconfig b/configs/qemu_x86_defconfig
index 998e2265c3..2653166468 100644
--- a/configs/qemu_x86_defconfig
+++ b/configs/qemu_x86_defconfig
@@ -10,14 +10,14 @@ BR2_TARGET_GENERIC_GETTY_PORT="tty1"
BR2_TARGET_ROOTFS_EXT2=y
# BR2_TARGET_ROOTFS_TAR is not set
-# Lock to 3.16 headers to avoid breaking with newer kernels
+# Lock to 3.17 headers to avoid breaking with newer kernels
BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.16.3"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_16=y
+BR2_DEFAULT_KERNEL_VERSION="3.17"
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_17=y
# Kernel
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.16.3"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.17"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux-3.16.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux-3.17.config"
OpenPOWER on IntegriCloud