From 60f9c9f98b3fef9de5d33b9185c1bd2265766920 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Tue, 30 Jan 2018 18:50:54 -0500 Subject: [PATCH] qemu_x86: use kernel 4.15 Signed-off-by: Adam Duskett Signed-off-by: Peter Korsgaard --- board/qemu/x86/{linux-4.11.config => linux-4.15.config} | 6 +++++- configs/qemu_x86_defconfig | 8 ++++---- 2 files changed, 9 insertions(+), 5 deletions(-) rename board/qemu/x86/{linux-4.11.config => linux-4.15.config} (91%) diff --git a/board/qemu/x86/linux-4.11.config b/board/qemu/x86/linux-4.15.config similarity index 91% rename from board/qemu/x86/linux-4.11.config rename to board/qemu/x86/linux-4.15.config index e3bd1454e6..0e59b87bd6 100644 --- a/board/qemu/x86/linux-4.11.config +++ b/board/qemu/x86/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_defconfig b/configs/qemu_x86_defconfig index c023a8ee19..ed6c198ac2 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 -# Linux headers same as kernel, a 4.11 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11=y +# Linux headers same as kernel, a 4.15 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_15=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/linux-4.11.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux-4.15.config" -- 2.30.2