Patchwork #166: Compiling a Geode target without CONFIG_VGA_ROM_RUN fails to find VSA functions.

login
register
about
Submitter Myles Watson
Date 2010-06-04 14:45:01
Message ID <AANLkTinHso8KrZBH4NdAcr073OvtP-pEiD8Jh-6mF9bD@mail.gmail.com>
Download mbox | patch
Permalink /patch/1464/
State Accepted
Commit r5608
Headers show

Comments

Myles Watson - 2010-06-04 14:45:01
Here's the patch for those that don't use the tracker.

you can't use "secure mode" with VSA, either

Signed-off-by: Myles Watson <mylesgw@gmail.com>

Thanks,
Myles
Peter Stuge - 2010-06-04 15:48:52
Myles Watson wrote:
> you can't use "secure mode" with VSA, either
> 
> Signed-off-by: Myles Watson <mylesgw@gmail.com>

Acked-by: Peter Stuge <peter@stuge.se>
Myles Watson - 2010-06-04 15:55:40
On Fri, Jun 4, 2010 at 9:48 AM, Peter Stuge <peter@stuge.se> wrote:
> Myles Watson wrote:
>> you can't use "secure mode" with VSA, either
>>
>> Signed-off-by: Myles Watson <mylesgw@gmail.com>
>
> Acked-by: Peter Stuge <peter@stuge.se>

Rev 5608.

Thanks,
Myles

Patch

Index: src/devices/Kconfig
===================================================================
--- src/devices/Kconfig	(revision 5606)
+++ src/devices/Kconfig	(working copy)
@@ -46,7 +46,7 @@ 
 	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_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.
Index: src/devices/Makefile.inc
===================================================================
--- src/devices/Makefile.inc	(revision 5606)
+++ src/devices/Makefile.inc	(working copy)
@@ -11,11 +11,11 @@ 
 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