From 533b130adcc109ff257bfc4447cade2358c1eb7c Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E6=9D=8E=E5=9B=BD?= Date: Fri, 27 Mar 2020 19:16:26 +0800 Subject: [PATCH] x86/64: add cdrom and iso9660 drivers MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The iso image need cdrom and iso9660 drivers to boot, otherwise it will hang when mounting the root file system Signed-off-by: 李国 --- target/linux/x86/64/config-4.19 | 4 ++++ target/linux/x86/64/config-5.4 | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/target/linux/x86/64/config-4.19 b/target/linux/x86/64/config-4.19 index f5c82dcb91..00ed09a4a6 100644 --- a/target/linux/x86/64/config-4.19 +++ b/target/linux/x86/64/config-4.19 @@ -69,12 +69,15 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_BACKLIGHT_GENERIC=y CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_BALLOON_COMPACTION=y +CONFIG_BLK_DEV_SR=y +# CONFIG_BLK_DEV_SR_VENDOR is not set CONFIG_BLK_DEV_INTEGRITY=y CONFIG_BLK_DEV_NVME=y CONFIG_NVME_MULTIPATH=y CONFIG_BLK_MQ_VIRTIO=y # CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set CONFIG_BTT=y +CONFIG_CDROM=y # CONFIG_CALGARY_IOMMU is not set # CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT is not set CONFIG_CONNECTOR=y @@ -294,6 +297,7 @@ CONFIG_IOSF_MBI=y # CONFIG_IOSF_MBI_DEBUG is not set # CONFIG_ISCSI_IBFT is not set # CONFIG_ISCSI_IBFT_FIND is not set +CONFIG_ISO9660_FS=y CONFIG_KALLSYMS_ABSOLUTE_PERCPU=y # CONFIG_KVM_DEBUG_FS is not set CONFIG_KVM_GUEST=y diff --git a/target/linux/x86/64/config-5.4 b/target/linux/x86/64/config-5.4 index ceee923b0f..899668f77e 100644 --- a/target/linux/x86/64/config-5.4 +++ b/target/linux/x86/64/config-5.4 @@ -64,12 +64,15 @@ CONFIG_AUDIT_ARCH=y CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_BACKLIGHT_GENERIC=y CONFIG_BALLOON_COMPACTION=y +CONFIG_BLK_DEV_SR=y +# CONFIG_BLK_DEV_SR_VENDOR is not set CONFIG_BLK_DEV_INTEGRITY=y CONFIG_BLK_DEV_NVME=y CONFIG_BLK_MQ_VIRTIO=y CONFIG_BLK_PM=y # CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set CONFIG_BTT=y +CONFIG_CDROM=y # CONFIG_CALGARY_IOMMU is not set # CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT is not set CONFIG_CONNECTOR=y @@ -280,6 +283,7 @@ CONFIG_IOMMU_HELPER=y CONFIG_IOSF_MBI=y # CONFIG_IOSF_MBI_DEBUG is not set # CONFIG_ISCSI_IBFT is not set +CONFIG_ISO9660_FS=y CONFIG_KALLSYMS_ABSOLUTE_PERCPU=y # CONFIG_KVM_DEBUG_FS is not set CONFIG_KVM_GUEST=y -- 2.25.1