Patchwork unify types in kconfig

login
register
about
Submitter Myles Watson
Date 2009-08-25 18:41:12
Message ID <2831fecf0908251141j656bc12dg17eb4ef5c362c0e@mail.gmail.com>
Download mbox | patch
Permalink /patch/191/
State Superseded
Headers show

Comments

Myles Watson - 2009-08-25 18:41:12
On Tue, Aug 25, 2009 at 11:37 AM, ron minnich<rminnich@gmail.com> wrote:
> On Tue, Aug 25, 2009 at 10:14 AM, Uwe Hermann<uwe@hermann-uwe.de> wrote:
>
>> Hm, you could be right. This was per-mainboard in Config.lb, but in
>> kconfig it should be a global/common option, and not set in each board.
>
> yes, we really need to start using the power of Kconfig now. Let's
> make it so people can choose this in menuconfig.

Here's my attempt.  It doesn't build yet due to my util confusion.

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

Thanks,
Myles

Patch

Index: src/Kconfig
===================================================================
--- src/Kconfig	(revision 4580)
+++ src/Kconfig	(working copy)
@@ -84,10 +84,6 @@ 
 	int
 	default 1
 
-config PCI_ROM_RUN
-	bool
-	default n
-
 config HT_CHAIN_UNITID_BASE
 	int
 	default 1
Index: src/mainboard/amd/serengeti_cheetah/Kconfig
===================================================================
--- src/mainboard/amd/serengeti_cheetah/Kconfig	(revision 4580)
+++ src/mainboard/amd/serengeti_cheetah/Kconfig	(working copy)
@@ -188,8 +188,3 @@ 
 	default y
 	depends on BOARD_AMD_SERENGETI_CHEETAH
 
-config PCI_ROM_RUN
-	bool
-	default y
-	depends on BOARD_AMD_SERENGETI_CHEETAH
-
Index: src/devices/Kconfig
===================================================================
--- src/devices/Kconfig	(revision 4580)
+++ src/devices/Kconfig	(working copy)
@@ -21,33 +21,35 @@ 
 menu "Devices"
 
 config VGA_ROM_RUN
-	bool
+	bool "Run VGA Option ROMs"
 	help
-	  Execute PCI/AGP option ROMs if available. This is required to
-	  enable PCI/AGP VGA plugin cards.
+	  Execute VGA option ROMs if found. This is required to enable PCI/AGP
+	  VGA plugin cards. 
 
-choice
-	prompt "Execute PCI option ROMs"
-	default PCI_OPTION_ROM_RUN_REALMODE
+config PCI_ROM_RUN
+	bool "Run non-VGA Option ROMs"
 	help
-	  Execute PCI/AGP option ROMs if available. You can choose to
-	  execute PCI option ROMs natively (32bit x86 system required),
-	  in an emulator (x86emu), or ignore option ROM execution.
+	  Execute non-VGA PCI option ROMs if found.
 
-config PCI_OPTION_ROM_RUN_REALMODE
-	prompt "Run VGA ROMs"
-	bool
-	select VGA_ROM_RUN
-	help
-	  Execute PCI/AGP option ROMs if available. This is required to
-	  enable PCI/AGP VGA plugin cards.
+choice
+        prompt "Option ROM Execution"
+        default  PCI_OPTION_ROM_RUN_REALMODE
+	depends on PCI_ROM_RUN || VGA_ROM_RUN
+        help
+          You can choose to execute PCI option ROMs natively (32bit x86 system
+	  required) or in an emulator (x86emu or YABEL).
 
-config NO_RUN
-	prompt "Do NOT run VGA ROMs"
-	bool
-	help
-	  Do not execute PCI/AGP option ROMs.
+	config PCI_OPTION_ROM_RUN_REALMODE
+		prompt "Real mode"
+		bool
 
+	config PCI_OPTION_ROM_RUN_YABEL
+		prompt "YABEL"
+		bool
+
+	config PCI_OPTION_ROM_RUN_X86EMU
+		prompt "X86EMU"
+		bool
 endchoice
 
 endmenu