Commit 4921d0a7535b ('i386: switch boards to "default y"') makes CONIFG_X86_64 select CONFIG_I386, which makes it difficult to define X86_64 only configs, e.g., for TDX.
Decouple I386 from X86_64. Signed-off-by: Xiaoyao Li <xiaoyao...@intel.com> --- hw/i386/Kconfig | 10 +++++----- target/i386/Kconfig | 1 - 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig index eb65bda6e071..6fc353930985 100644 --- a/hw/i386/Kconfig +++ b/hw/i386/Kconfig @@ -74,7 +74,7 @@ config PC_ACPI config I440FX bool default y - depends on I386 + depends on (I386 || X86_64) imply E1000_PCI imply VMPORT imply VMMOUSE @@ -91,7 +91,7 @@ config I440FX config ISAPC bool default y - depends on I386 + depends on (I386 || X86_64) imply VGA_ISA select ISA_BUS select PC @@ -103,7 +103,7 @@ config ISAPC config Q35 bool default y - depends on I386 + depends on (I386 || X86_64) imply VTD imply AMD_IOMMU imply E1000E_PCI_EXPRESS @@ -122,7 +122,7 @@ config Q35 config MICROVM bool default y - depends on I386 && FDT + depends on (I386 || X86_64) && FDT select DEVICE_TREE select SERIAL_ISA # for serial_hds_isa_init() select ISA_BUS @@ -168,4 +168,4 @@ config VMMOUSE config XEN_EMU bool default y - depends on KVM && I386 + depends on KVM && (I386 || X86_64) diff --git a/target/i386/Kconfig b/target/i386/Kconfig index 6b0feef02997..f16efa7137d5 100644 --- a/target/i386/Kconfig +++ b/target/i386/Kconfig @@ -6,4 +6,3 @@ config I386 config X86_64 bool - select I386 -- 2.43.0