aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--board/qemu/arm-versatile/linux-3.6.config (renamed from board/qemu/arm-versatile/linux-3.5.config)0
-rw-r--r--board/qemu/arm-versatile/readme.txt2
-rw-r--r--configs/qemu_arm_versatile_defconfig8
3 files changed, 6 insertions, 4 deletions
diff --git a/board/qemu/arm-versatile/linux-3.5.config b/board/qemu/arm-versatile/linux-3.6.config
index 5f58b973a4..5f58b973a4 100644
--- a/board/qemu/arm-versatile/linux-3.5.config
+++ b/board/qemu/arm-versatile/linux-3.6.config
diff --git a/board/qemu/arm-versatile/readme.txt b/board/qemu/arm-versatile/readme.txt
index 2ca5dec512..78682048f0 100644
--- a/board/qemu/arm-versatile/readme.txt
+++ b/board/qemu/arm-versatile/readme.txt
@@ -4,3 +4,5 @@ Run the emulation with:
The login prompt will appear in the terminal that started Qemu. The
graphical window is the framebuffer.
+
+Tested with QEMU 1.2.0
diff --git a/configs/qemu_arm_versatile_defconfig b/configs/qemu_arm_versatile_defconfig
index 2037565690..85efa2b1ad 100644
--- a/configs/qemu_arm_versatile_defconfig
+++ b/configs/qemu_arm_versatile_defconfig
@@ -10,13 +10,13 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0"
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/arm-versatile/linux-3.5.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux-3.6.config"
BR2_LINUX_KERNEL_ZIMAGE=y