summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--board/qemu/x86/linux-3.15.config (renamed from board/qemu/x86/linux-3.13.config)2
-rw-r--r--board/qemu/x86/readme.txt2
-rw-r--r--configs/qemu_x86_defconfig10
3 files changed, 7 insertions, 7 deletions
diff --git a/board/qemu/x86/linux-3.13.config b/board/qemu/x86/linux-3.15.config
index d738e4d374..920a0a6800 100644
--- a/board/qemu/x86/linux-3.13.config
+++ b/board/qemu/x86/linux-3.15.config
@@ -47,7 +47,7 @@ CONFIG_SND_HDA_INTEL=y
# CONFIG_USB_SUPPORT is not set
# CONFIG_X86_PLATFORM_DEVICES is not set
# CONFIG_DMIID is not set
-CONFIG_EXT2_FS=y
+CONFIG_EXT4_FS=y
# CONFIG_DNOTIFY is not set
# CONFIG_INOTIFY_USER is not set
# CONFIG_MISC_FILESYSTEMS is not set
diff --git a/board/qemu/x86/readme.txt b/board/qemu/x86/readme.txt
index c821255a22..9ee2e37e1c 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.7.0
+Tested with QEMU 2.0.0
diff --git a/configs/qemu_x86_defconfig b/configs/qemu_x86_defconfig
index a5040c8952..591dc2b5b7 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.13 headers to avoid breaking with newer kernels
+# Lock to 3.15 headers to avoid breaking with newer kernels
BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.13.5"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_13=y
+BR2_DEFAULT_KERNEL_VERSION="3.15.7"
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_15=y
# Kernel
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.13.5"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.15.7"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux-3.13.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux-3.15.config"
OpenPOWER on IntegriCloud