summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGustavo Zacarias <gustavo@zacarias.com.ar>2012-11-15 10:25:34 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2012-11-15 21:43:24 (GMT)
commit38c42da73e81ce2af168b88ed9e6edd99639a8af (patch)
treeb8d3d7744110489f180cba7ada2c8e47213a342d
parenta064238c3c0e5743e1f66353e620bd35399d6a76 (diff)
downloadbuildroot-38c42da73e81ce2af168b88ed9e6edd99639a8af.tar.gz
buildroot-38c42da73e81ce2af168b88ed9e6edd99639a8af.tar.bz2
qemu/x86: update to use kernel 3.6.6
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--board/qemu/x86/linux-3.6.config (renamed from board/qemu/x86/linux-3.5.config)0
-rw-r--r--board/qemu/x86/readme.txt2
-rw-r--r--configs/qemu_x86_defconfig8
3 files changed, 5 insertions, 5 deletions
diff --git a/board/qemu/x86/linux-3.5.config b/board/qemu/x86/linux-3.6.config
index 5bf6944..5bf6944 100644
--- a/board/qemu/x86/linux-3.5.config
+++ b/board/qemu/x86/linux-3.6.config
diff --git a/board/qemu/x86/readme.txt b/board/qemu/x86/readme.txt
index f6f5437..3cca682 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 1.1.1
+Tested with QEMU 1.2.0
diff --git a/configs/qemu_x86_defconfig b/configs/qemu_x86_defconfig
index 73c16a3..90524b5 100644
--- a/configs/qemu_x86_defconfig
+++ b/configs/qemu_x86_defconfig
@@ -10,12 +10,12 @@ BR2_TARGET_GENERIC_GETTY_PORT="tty1"
BR2_TARGET_ROOTFS_EXT2=y
# BR2_TARGET_ROOTFS_TAR is not set
-# Lock to 3.5 headers to avoid breaking with newer kernels
-BR2_KERNEL_HEADERS_3_5=y
+# Lock to 3.6 headers to avoid breaking with newer kernels
+BR2_KERNEL_HEADERS_3_6=y
# Kernel
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.5.4"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.6.6"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux-3.5.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux-3.6.config"