From 2012495fbd6bafaff15b10364cf4a44055def15f Mon Sep 17 00:00:00 2001 From: David Abdurachmanov Date: Sat, 21 Mar 2020 20:23:25 +0200 Subject: [PATCH] Update configs for riscv64 BUILDSTDERR: WARNING: unmet direct dependencies detected for DRM_VIRTIO_GPU BUILDSTDERR: Depends on [m]: HAS_IOMEM [=y] && DRM [=m] && VIRTIO [=y] && MMU [=y] BUILDSTDERR: Selected by [y]: BUILDSTDERR: - SOC_VIRT [=y] BUILDSTDERR: WARNING: unmet direct dependencies detected for NET_9P_VIRTIO BUILDSTDERR: Depends on [m]: NET [=y] && NET_9P [=m] && VIRTIO [=y] BUILDSTDERR: Selected by [y]: BUILDSTDERR: - SOC_VIRT [=y] Error: Mismatches found in configuration files Found CONFIG_NET_9P_VIRTIO=y after generation, had CONFIG_NET_9P_VIRTIO=m in Source tree Found CONFIG_VIRTIO_BLK=y after generation, had CONFIG_VIRTIO_BLK=m in Source tree Found CONFIG_SCSI_VIRTIO=y after generation, had CONFIG_SCSI_VIRTIO=m in Source tree Found CONFIG_VIRTIO_NET=y after generation, had CONFIG_VIRTIO_NET=m in Source tree Found CONFIG_VIRTIO_CONSOLE=y after generation, had CONFIG_VIRTIO_CONSOLE=m in Source tree Found CONFIG_DRM_VIRTIO_GPU=y after generation, had CONFIG_DRM_VIRTIO_GPU=m in Source tree Found CONFIG_VIRTIO_BALLOON=y after generation, had CONFIG_VIRTIO_BALLOON=m in Source tree Found CONFIG_VIRTIO_INPUT=y after generation, had CONFIG_VIRTIO_INPUT=m in Source tree Found CONFIG_VIRTIO_MMIO=y after generation, had CONFIG_VIRTIO_MMIO=m in Source tree Found CONFIG_GOLDFISH=y after generation, had CONFIG_GOLDFISH=is not set in Source tree Found CONFIG_RPMSG_CHAR=y after generation, had CONFIG_RPMSG_CHAR=is not set in Source tree Found CONFIG_RPMSG_VIRTIO=y after generation, had CONFIG_RPMSG_VIRTIO=m in Source tree Found CONFIG_CRYPTO_DEV_VIRTIO=y after generation, had CONFIG_CRYPTO_DEV_VIRTIO=m in Source tree RPM build errors: BUILDSTDERR: error: Bad exit status from /var/tmp/rpm-tmp.a26I8d (%prep) Signed-off-by: David Abdurachmanov --- .../generic/riscv/CONFIG_CRYPTO_DEV_VIRTIO | 1 + configs/fedora/generic/riscv/CONFIG_DRM | 1 + .../generic/riscv/CONFIG_DRM_VIRTIO_GPU | 1 + configs/fedora/generic/riscv/CONFIG_GOLDFISH | 1 + configs/fedora/generic/riscv/CONFIG_NET_9P | 1 + .../fedora/generic/riscv/CONFIG_NET_9P_VIRTIO | 1 + .../fedora/generic/riscv/CONFIG_RPMSG_CHAR | 1 + .../fedora/generic/riscv/CONFIG_RPMSG_VIRTIO | 1 + .../fedora/generic/riscv/CONFIG_SCSI_VIRTIO | 1 + .../generic/riscv/CONFIG_VIRTIO_BALLOON | 1 + .../fedora/generic/riscv/CONFIG_VIRTIO_BLK | 1 + .../generic/riscv/CONFIG_VIRTIO_CONSOLE | 1 + .../fedora/generic/riscv/CONFIG_VIRTIO_INPUT | 1 + .../fedora/generic/riscv/CONFIG_VIRTIO_MMIO | 1 + .../fedora/generic/riscv/CONFIG_VIRTIO_NET | 1 + kernel-riscv64-debug-fedora.config | 30 +++++++++---------- kernel-riscv64-fedora.config | 30 +++++++++---------- 17 files changed, 45 insertions(+), 30 deletions(-) create mode 100644 configs/fedora/generic/riscv/CONFIG_CRYPTO_DEV_VIRTIO create mode 100644 configs/fedora/generic/riscv/CONFIG_DRM create mode 100644 configs/fedora/generic/riscv/CONFIG_DRM_VIRTIO_GPU create mode 100644 configs/fedora/generic/riscv/CONFIG_GOLDFISH create mode 100644 configs/fedora/generic/riscv/CONFIG_NET_9P create mode 100644 configs/fedora/generic/riscv/CONFIG_NET_9P_VIRTIO create mode 100644 configs/fedora/generic/riscv/CONFIG_RPMSG_CHAR create mode 100644 configs/fedora/generic/riscv/CONFIG_RPMSG_VIRTIO create mode 100644 configs/fedora/generic/riscv/CONFIG_SCSI_VIRTIO create mode 100644 configs/fedora/generic/riscv/CONFIG_VIRTIO_BALLOON create mode 100644 configs/fedora/generic/riscv/CONFIG_VIRTIO_BLK create mode 100644 configs/fedora/generic/riscv/CONFIG_VIRTIO_CONSOLE create mode 100644 configs/fedora/generic/riscv/CONFIG_VIRTIO_INPUT create mode 100644 configs/fedora/generic/riscv/CONFIG_VIRTIO_MMIO create mode 100644 configs/fedora/generic/riscv/CONFIG_VIRTIO_NET diff --git a/configs/fedora/generic/riscv/CONFIG_CRYPTO_DEV_VIRTIO b/configs/fedora/generic/riscv/CONFIG_CRYPTO_DEV_VIRTIO new file mode 100644 index 000000000..772991472 --- /dev/null +++ b/configs/fedora/generic/riscv/CONFIG_CRYPTO_DEV_VIRTIO @@ -0,0 +1 @@ +CONFIG_CRYPTO_DEV_VIRTIO=y diff --git a/configs/fedora/generic/riscv/CONFIG_DRM b/configs/fedora/generic/riscv/CONFIG_DRM new file mode 100644 index 000000000..517f31840 --- /dev/null +++ b/configs/fedora/generic/riscv/CONFIG_DRM @@ -0,0 +1 @@ +CONFIG_DRM=y diff --git a/configs/fedora/generic/riscv/CONFIG_DRM_VIRTIO_GPU b/configs/fedora/generic/riscv/CONFIG_DRM_VIRTIO_GPU new file mode 100644 index 000000000..5db61502b --- /dev/null +++ b/configs/fedora/generic/riscv/CONFIG_DRM_VIRTIO_GPU @@ -0,0 +1 @@ +CONFIG_DRM_VIRTIO_GPU=y diff --git a/configs/fedora/generic/riscv/CONFIG_GOLDFISH b/configs/fedora/generic/riscv/CONFIG_GOLDFISH new file mode 100644 index 000000000..57c6071ce --- /dev/null +++ b/configs/fedora/generic/riscv/CONFIG_GOLDFISH @@ -0,0 +1 @@ +CONFIG_GOLDFISH=y diff --git a/configs/fedora/generic/riscv/CONFIG_NET_9P b/configs/fedora/generic/riscv/CONFIG_NET_9P new file mode 100644 index 000000000..8a28464c8 --- /dev/null +++ b/configs/fedora/generic/riscv/CONFIG_NET_9P @@ -0,0 +1 @@ +CONFIG_NET_9P=y diff --git a/configs/fedora/generic/riscv/CONFIG_NET_9P_VIRTIO b/configs/fedora/generic/riscv/CONFIG_NET_9P_VIRTIO new file mode 100644 index 000000000..916352061 --- /dev/null +++ b/configs/fedora/generic/riscv/CONFIG_NET_9P_VIRTIO @@ -0,0 +1 @@ +CONFIG_NET_9P_VIRTIO=y diff --git a/configs/fedora/generic/riscv/CONFIG_RPMSG_CHAR b/configs/fedora/generic/riscv/CONFIG_RPMSG_CHAR new file mode 100644 index 000000000..cea1989e0 --- /dev/null +++ b/configs/fedora/generic/riscv/CONFIG_RPMSG_CHAR @@ -0,0 +1 @@ +CONFIG_RPMSG_CHAR=y diff --git a/configs/fedora/generic/riscv/CONFIG_RPMSG_VIRTIO b/configs/fedora/generic/riscv/CONFIG_RPMSG_VIRTIO new file mode 100644 index 000000000..a3923c195 --- /dev/null +++ b/configs/fedora/generic/riscv/CONFIG_RPMSG_VIRTIO @@ -0,0 +1 @@ +CONFIG_RPMSG_VIRTIO=y diff --git a/configs/fedora/generic/riscv/CONFIG_SCSI_VIRTIO b/configs/fedora/generic/riscv/CONFIG_SCSI_VIRTIO new file mode 100644 index 000000000..6e9e40429 --- /dev/null +++ b/configs/fedora/generic/riscv/CONFIG_SCSI_VIRTIO @@ -0,0 +1 @@ +CONFIG_SCSI_VIRTIO=y diff --git a/configs/fedora/generic/riscv/CONFIG_VIRTIO_BALLOON b/configs/fedora/generic/riscv/CONFIG_VIRTIO_BALLOON new file mode 100644 index 000000000..1992c34fd --- /dev/null +++ b/configs/fedora/generic/riscv/CONFIG_VIRTIO_BALLOON @@ -0,0 +1 @@ +CONFIG_VIRTIO_BALLOON=y diff --git a/configs/fedora/generic/riscv/CONFIG_VIRTIO_BLK b/configs/fedora/generic/riscv/CONFIG_VIRTIO_BLK new file mode 100644 index 000000000..a98570e79 --- /dev/null +++ b/configs/fedora/generic/riscv/CONFIG_VIRTIO_BLK @@ -0,0 +1 @@ +CONFIG_VIRTIO_BLK=y diff --git a/configs/fedora/generic/riscv/CONFIG_VIRTIO_CONSOLE b/configs/fedora/generic/riscv/CONFIG_VIRTIO_CONSOLE new file mode 100644 index 000000000..390e7e6d8 --- /dev/null +++ b/configs/fedora/generic/riscv/CONFIG_VIRTIO_CONSOLE @@ -0,0 +1 @@ +CONFIG_VIRTIO_CONSOLE=y diff --git a/configs/fedora/generic/riscv/CONFIG_VIRTIO_INPUT b/configs/fedora/generic/riscv/CONFIG_VIRTIO_INPUT new file mode 100644 index 000000000..28465c74e --- /dev/null +++ b/configs/fedora/generic/riscv/CONFIG_VIRTIO_INPUT @@ -0,0 +1 @@ +CONFIG_VIRTIO_INPUT=y diff --git a/configs/fedora/generic/riscv/CONFIG_VIRTIO_MMIO b/configs/fedora/generic/riscv/CONFIG_VIRTIO_MMIO new file mode 100644 index 000000000..8d3f6df40 --- /dev/null +++ b/configs/fedora/generic/riscv/CONFIG_VIRTIO_MMIO @@ -0,0 +1 @@ +CONFIG_VIRTIO_MMIO=y diff --git a/configs/fedora/generic/riscv/CONFIG_VIRTIO_NET b/configs/fedora/generic/riscv/CONFIG_VIRTIO_NET new file mode 100644 index 000000000..53245ae58 --- /dev/null +++ b/configs/fedora/generic/riscv/CONFIG_VIRTIO_NET @@ -0,0 +1 @@ +CONFIG_VIRTIO_NET=y diff --git a/kernel-riscv64-debug-fedora.config b/kernel-riscv64-debug-fedora.config index 4cb5eff17..c5de9fa51 100644 --- a/kernel-riscv64-debug-fedora.config +++ b/kernel-riscv64-debug-fedora.config @@ -878,7 +878,7 @@ CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y # CONFIG_CRYPTO_DEV_NITROX_CNN55XX is not set # CONFIG_CRYPTO_DEV_SAFEXCEL is not set # CONFIG_CRYPTO_DEV_SP_CCP is not set -CONFIG_CRYPTO_DEV_VIRTIO=m +CONFIG_CRYPTO_DEV_VIRTIO=y CONFIG_CRYPTO_DH=y CONFIG_CRYPTO_DRBG_CTR=y CONFIG_CRYPTO_DRBG_HASH=y @@ -1162,7 +1162,6 @@ CONFIG_DRM_I2C_SIL164=m # CONFIG_DRM_LEGACY is not set CONFIG_DRM_LOAD_EDID_FIRMWARE=y # CONFIG_DRM_LVDS_CODEC is not set -CONFIG_DRM=m # CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set CONFIG_DRM_MGAG200=m # CONFIG_DRM_MGA is not set @@ -1238,9 +1237,10 @@ CONFIG_DRM_UDL=m # CONFIG_DRM_VBOXVIDEO is not set CONFIG_DRM_VGEM=m # CONFIG_DRM_VIA is not set -CONFIG_DRM_VIRTIO_GPU=m +CONFIG_DRM_VIRTIO_GPU=y # CONFIG_DRM_VKMS is not set # CONFIG_DRM_XEN is not set +CONFIG_DRM=y # CONFIG_DS1682 is not set # CONFIG_DS1803 is not set # CONFIG_DS4424 is not set @@ -1620,9 +1620,9 @@ CONFIG_GFS2_FS=m # CONFIG_GLOB_SELFTEST is not set # CONFIG_GNSS is not set # CONFIG_GOLDFISH_AUDIO is not set -# CONFIG_GOLDFISH is not set # CONFIG_GOLDFISH_PIPE is not set # CONFIG_GOLDFISH_TTY is not set +CONFIG_GOLDFISH=y # CONFIG_GOOGLE_FIRMWARE is not set # CONFIG_GP2AP020A00F is not set # CONFIG_GPIO_74X164 is not set @@ -3147,10 +3147,10 @@ CONFIG_NCSI_OEM_CMD_GET_MAC=y # CONFIG_NDC_DIS_DYNAMIC_CACHING is not set CONFIG_NE2K_PCI=m # CONFIG_NET_9P_DEBUG is not set -CONFIG_NET_9P=m CONFIG_NET_9P_RDMA=m -CONFIG_NET_9P_VIRTIO=m +CONFIG_NET_9P_VIRTIO=y CONFIG_NET_9P_XEN=m +CONFIG_NET_9P=y CONFIG_NET_ACT_BPF=m CONFIG_NET_ACT_CONNMARK=m CONFIG_NET_ACT_CSUM=m @@ -4242,10 +4242,10 @@ CONFIG_ROMFS_FS=m CONFIG_ROOT_NFS=y CONFIG_ROSE=m CONFIG_RPCSEC_GSS_KRB5=m -# CONFIG_RPMSG_CHAR is not set +CONFIG_RPMSG_CHAR=y # CONFIG_RPMSG_QCOM_GLINK_RPM is not set # CONFIG_RPMSG_QCOM_GLINK_SMEM is not set -CONFIG_RPMSG_VIRTIO=m +CONFIG_RPMSG_VIRTIO=y CONFIG_RPR0521=m CONFIG_RSI_91X=m CONFIG_RSI_COEX=y @@ -4525,7 +4525,7 @@ CONFIG_SCSI_UFS_CDNS_PLATFORM=m # CONFIG_SCSI_UFS_DWC_TC_PCI is not set # CONFIG_SCSI_UFS_DWC_TC_PLATFORM is not set # CONFIG_SCSI_UFSHCD is not set -CONFIG_SCSI_VIRTIO=m +CONFIG_SCSI_VIRTIO=y CONFIG_SCSI_WD719X=m CONFIG_SCSI=y CONFIG_SCTP_COOKIE_HMAC_MD5=y @@ -6110,16 +6110,16 @@ CONFIG_VIDEO_V4L2_SUBDEV_API=y # CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set # CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set # CONFIG_VIRT_DRIVERS is not set -CONFIG_VIRTIO_BALLOON=m -CONFIG_VIRTIO_BLK=m -CONFIG_VIRTIO_CONSOLE=m +CONFIG_VIRTIO_BALLOON=y +CONFIG_VIRTIO_BLK=y +CONFIG_VIRTIO_CONSOLE=y CONFIG_VIRTIO_FS=m -CONFIG_VIRTIO_INPUT=m +CONFIG_VIRTIO_INPUT=y # CONFIG_VIRTIO_IOMMU is not set CONFIG_VIRTIO_MENU=y # CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set -CONFIG_VIRTIO_MMIO=m -CONFIG_VIRTIO_NET=m +CONFIG_VIRTIO_MMIO=y +CONFIG_VIRTIO_NET=y CONFIG_VIRTIO_PCI_LEGACY=y CONFIG_VIRTIO_PCI=y # CONFIG_VIRTIO_PMEM is not set diff --git a/kernel-riscv64-fedora.config b/kernel-riscv64-fedora.config index a2a0b3947..a055188b3 100644 --- a/kernel-riscv64-fedora.config +++ b/kernel-riscv64-fedora.config @@ -877,7 +877,7 @@ CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y # CONFIG_CRYPTO_DEV_NITROX_CNN55XX is not set # CONFIG_CRYPTO_DEV_SAFEXCEL is not set # CONFIG_CRYPTO_DEV_SP_CCP is not set -CONFIG_CRYPTO_DEV_VIRTIO=m +CONFIG_CRYPTO_DEV_VIRTIO=y CONFIG_CRYPTO_DH=y CONFIG_CRYPTO_DRBG_CTR=y CONFIG_CRYPTO_DRBG_HASH=y @@ -1153,7 +1153,6 @@ CONFIG_DRM_I2C_SIL164=m # CONFIG_DRM_LEGACY is not set CONFIG_DRM_LOAD_EDID_FIRMWARE=y # CONFIG_DRM_LVDS_CODEC is not set -CONFIG_DRM=m # CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set CONFIG_DRM_MGAG200=m # CONFIG_DRM_MGA is not set @@ -1229,9 +1228,10 @@ CONFIG_DRM_UDL=m # CONFIG_DRM_VBOXVIDEO is not set CONFIG_DRM_VGEM=m # CONFIG_DRM_VIA is not set -CONFIG_DRM_VIRTIO_GPU=m +CONFIG_DRM_VIRTIO_GPU=y # CONFIG_DRM_VKMS is not set # CONFIG_DRM_XEN is not set +CONFIG_DRM=y # CONFIG_DS1682 is not set # CONFIG_DS1803 is not set # CONFIG_DS4424 is not set @@ -1603,9 +1603,9 @@ CONFIG_GFS2_FS=m # CONFIG_GLOB_SELFTEST is not set # CONFIG_GNSS is not set # CONFIG_GOLDFISH_AUDIO is not set -# CONFIG_GOLDFISH is not set # CONFIG_GOLDFISH_PIPE is not set # CONFIG_GOLDFISH_TTY is not set +CONFIG_GOLDFISH=y # CONFIG_GOOGLE_FIRMWARE is not set # CONFIG_GP2AP020A00F is not set # CONFIG_GPIO_74X164 is not set @@ -3126,10 +3126,10 @@ CONFIG_NCSI_OEM_CMD_GET_MAC=y # CONFIG_NDC_DIS_DYNAMIC_CACHING is not set CONFIG_NE2K_PCI=m # CONFIG_NET_9P_DEBUG is not set -CONFIG_NET_9P=m CONFIG_NET_9P_RDMA=m -CONFIG_NET_9P_VIRTIO=m +CONFIG_NET_9P_VIRTIO=y CONFIG_NET_9P_XEN=m +CONFIG_NET_9P=y CONFIG_NET_ACT_BPF=m CONFIG_NET_ACT_CONNMARK=m CONFIG_NET_ACT_CSUM=m @@ -4220,10 +4220,10 @@ CONFIG_ROMFS_FS=m CONFIG_ROOT_NFS=y CONFIG_ROSE=m CONFIG_RPCSEC_GSS_KRB5=m -# CONFIG_RPMSG_CHAR is not set +CONFIG_RPMSG_CHAR=y # CONFIG_RPMSG_QCOM_GLINK_RPM is not set # CONFIG_RPMSG_QCOM_GLINK_SMEM is not set -CONFIG_RPMSG_VIRTIO=m +CONFIG_RPMSG_VIRTIO=y CONFIG_RPR0521=m CONFIG_RSI_91X=m CONFIG_RSI_COEX=y @@ -4503,7 +4503,7 @@ CONFIG_SCSI_UFS_CDNS_PLATFORM=m # CONFIG_SCSI_UFS_DWC_TC_PCI is not set # CONFIG_SCSI_UFS_DWC_TC_PLATFORM is not set # CONFIG_SCSI_UFSHCD is not set -CONFIG_SCSI_VIRTIO=m +CONFIG_SCSI_VIRTIO=y CONFIG_SCSI_WD719X=m CONFIG_SCSI=y CONFIG_SCTP_COOKIE_HMAC_MD5=y @@ -6087,16 +6087,16 @@ CONFIG_VIDEO_V4L2_SUBDEV_API=y # CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set # CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set # CONFIG_VIRT_DRIVERS is not set -CONFIG_VIRTIO_BALLOON=m -CONFIG_VIRTIO_BLK=m -CONFIG_VIRTIO_CONSOLE=m +CONFIG_VIRTIO_BALLOON=y +CONFIG_VIRTIO_BLK=y +CONFIG_VIRTIO_CONSOLE=y CONFIG_VIRTIO_FS=m -CONFIG_VIRTIO_INPUT=m +CONFIG_VIRTIO_INPUT=y # CONFIG_VIRTIO_IOMMU is not set CONFIG_VIRTIO_MENU=y # CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set -CONFIG_VIRTIO_MMIO=m -CONFIG_VIRTIO_NET=m +CONFIG_VIRTIO_MMIO=y +CONFIG_VIRTIO_NET=y CONFIG_VIRTIO_PCI_LEGACY=y CONFIG_VIRTIO_PCI=y # CONFIG_VIRTIO_PMEM is not set