virt: coco: Add a coco/Makefile and coco/Kconfig

In preparation for adding another coco build target, relieve
drivers/virt/Makefile of the responsibility to track new compilation
unit additions to drivers/virt/coco/, and do the same for
drivers/virt/Kconfig.

Reviewed-by: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
Tested-by: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
Reviewed-by: Tom Lendacky <thomas.lendacky@amd.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>

diff --git a/drivers/virt/Kconfig b/drivers/virt/Kconfig
index f79ab13a5c28b0cd7a71d41ba8d3177914946351..40129b6f0eca41ced6c6213776571a5ae8374ebe 100644 (file)
--- a/drivers/virt/Kconfig
+++ b/drivers/virt/Kconfig
@@ -48,10 +48,6 @@ source "drivers/virt/nitro_enclaves/Kconfig"
 
 source "drivers/virt/acrn/Kconfig"
 
-source "drivers/virt/coco/efi_secret/Kconfig"
-
-source "drivers/virt/coco/sev-guest/Kconfig"
-
-source "drivers/virt/coco/tdx-guest/Kconfig"
+source "drivers/virt/coco/Kconfig"
 
 endif

diff --git a/drivers/virt/Makefile b/drivers/virt/Makefile
index e9aa6fc96fab7242a9963d9a834722af24e4b6a2..f29901bd782058d3552cdec2c2128ad47ce6fe27 100644 (file)
--- a/drivers/virt/Makefile
+++ b/drivers/virt/Makefile
@@ -9,6 +9,4 @@ obj-y                           += vboxguest/
 
 obj-$(CONFIG_NITRO_ENCLAVES)   += nitro_enclaves/
 obj-$(CONFIG_ACRN_HSM)         += acrn/
-obj-$(CONFIG_EFI_SECRET)       += coco/efi_secret/
-obj-$(CONFIG_SEV_GUEST)                += coco/sev-guest/
-obj-$(CONFIG_INTEL_TDX_GUEST)  += coco/tdx-guest/
+obj-y                          += coco/

diff --git a/drivers/virt/coco/Kconfig b/drivers/virt/coco/Kconfig
new file mode 100644 (file)
index 0000000..fc5c64f
--- /dev/null
+++ b/drivers/virt/coco/Kconfig
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Confidential computing related collateral
+#
+source "drivers/virt/coco/efi_secret/Kconfig"
+
+source "drivers/virt/coco/sev-guest/Kconfig"
+
+source "drivers/virt/coco/tdx-guest/Kconfig"

diff --git a/drivers/virt/coco/Makefile b/drivers/virt/coco/Makefile
new file mode 100644 (file)
index 0000000..55302ef
--- /dev/null
+++ b/drivers/virt/coco/Makefile
@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Confidential computing related collateral
+#
+obj-$(CONFIG_EFI_SECRET)       += efi_secret/
+obj-$(CONFIG_SEV_GUEST)                += sev-guest/
+obj-$(CONFIG_INTEL_TDX_GUEST)  += tdx-guest/