summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Duskett <aduskett@gmail.com>2018-01-30 18:47:34 -0500
committerPeter Korsgaard <peter@korsgaard.com>2018-02-03 08:25:04 +0100
commita952d24b950413a69b0c254525542824bd65f4f1 (patch)
treed2035cf0dee622d1e7550837f9db5f2b0854f6c7
parent16977664300599cb4ac5c23b6b19382608a019f9 (diff)
downloadbuildroot-a952d24b950413a69b0c254525542824bd65f4f1.tar.gz
buildroot-a952d24b950413a69b0c254525542824bd65f4f1.zip
qemu_x86_64: use kernel 4.15
Signed-off-by: Adam Duskett <Adamduskett@outlook.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--board/qemu/x86_64/linux-4.15.config (renamed from board/qemu/x86_64/linux-4.11.config)6
-rw-r--r--configs/qemu_x86_64_defconfig4
2 files changed, 7 insertions, 3 deletions
diff --git a/board/qemu/x86_64/linux-4.11.config b/board/qemu/x86_64/linux-4.15.config
index e3bd1454e6..0e59b87bd6 100644
--- a/board/qemu/x86_64/linux-4.11.config
+++ b/board/qemu/x86_64/linux-4.15.config
@@ -1,4 +1,5 @@
CONFIG_SYSVIPC=y
+CONFIG_CGROUPS=y
CONFIG_MODULES=y
CONFIG_MODULE_UNLOAD=y
CONFIG_SMP=y
@@ -8,6 +9,8 @@ CONFIG_NET=y
CONFIG_PACKET=y
CONFIG_UNIX=y
CONFIG_INET=y
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
CONFIG_VIRTIO_BLK=y
CONFIG_BLK_DEV_SD=y
CONFIG_SCSI_VIRTIO=y
@@ -23,8 +26,8 @@ CONFIG_SERIAL_8250_CONSOLE=y
CONFIG_VIRTIO_CONSOLE=y
CONFIG_HW_RANDOM_VIRTIO=m
CONFIG_DRM=y
-CONFIG_DRM_BOCHS=y
CONFIG_DRM_QXL=y
+CONFIG_DRM_BOCHS=y
CONFIG_DRM_VIRTIO_GPU=y
CONFIG_SOUND=y
CONFIG_SND=y
@@ -41,5 +44,6 @@ CONFIG_VIRTIO_INPUT=y
CONFIG_VIRTIO_MMIO=y
CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
CONFIG_EXT4_FS=y
+CONFIG_AUTOFS4_FS=y
CONFIG_TMPFS=y
CONFIG_TMPFS_POSIX_ACL=y
diff --git a/configs/qemu_x86_64_defconfig b/configs/qemu_x86_64_defconfig
index aa17ace5b0..92a196790d 100644
--- a/configs/qemu_x86_64_defconfig
+++ b/configs/qemu_x86_64_defconfig
@@ -15,6 +15,6 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11=y
# Kernel
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.3"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.15"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux-4.11.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux-4.15.config"
OpenPOWER on IntegriCloud