diff --git a/src/devices/Kconfig b/src/devices/Kconfig
index 151492d6c8..3d0049e28d 100644
--- a/src/devices/Kconfig
+++ b/src/devices/Kconfig
@@ -46,7 +46,7 @@ choice
 	prompt "Option ROM execution type"
 	default PCI_OPTION_ROM_RUN_YABEL if !ARCH_X86
 	default PCI_OPTION_ROM_RUN_REALMODE if ARCH_X86
-	depends on PCI_ROM_RUN || VGA_ROM_RUN
+	depends on PCI_ROM_RUN || VGA_ROM_RUN || GEODE_VSA
 
 config PCI_OPTION_ROM_RUN_REALMODE
 	prompt "Native mode"
@@ -61,6 +61,7 @@ config PCI_OPTION_ROM_RUN_REALMODE
 config PCI_OPTION_ROM_RUN_YABEL
 	prompt "Secure mode"
 	bool
+	depends on !GEODE_VSA
 	help
 	  If you select this option, the x86emu CPU emulator will be used to
 	  execute PCI option ROMs.
diff --git a/src/devices/Makefile.inc b/src/devices/Makefile.inc
index 4516401cc3..dd518bd16b 100644
--- a/src/devices/Makefile.inc
+++ b/src/devices/Makefile.inc
@@ -11,11 +11,11 @@ obj-y += pnp_device.o
 obj-y += pci_ops.o
 obj-y += smbus_ops.o
 
+subdirs-y += oprom
+
 ifeq ($(CONFIG_PCI_ROM_RUN),y)
 obj-y += pci_rom.o
-subdirs-y += oprom
 else
 obj-$(CONFIG_VGA_ROM_RUN) += pci_rom.o
-subdirs-$(CONFIG_VGA_ROM_RUN) += oprom
 endif