Patch attached.

//Peter
Move VGA BIOS settings from payload menu into a menu of it's own.

Depending on PAYLOAD_ELF also stopped the config items from being shown.
Build tested, with this coreboot.rom correctly includes the VGA BIOS.

Signed-off-by: Peter Stuge <[email protected]>

Index: src/Kconfig
===================================================================
--- src/Kconfig (revision 4640)
+++ src/Kconfig (working copy)
@@ -238,17 +238,6 @@
 
          You will be able to specify the location and file name of the
          payload image later.
-
-config VGA_BIOS
-       bool "Add a VGA BIOS image"
-       depends on PAYLOAD_ELF
-       help
-         Select this option if you have a VGA BIOS image that you would
-         like to add to your ROM.
-
-         You will be able to specify the location and file name of the
-         image later.
-
 config PAYLOAD_NONE
        bool "No payload"
        help
@@ -268,6 +257,30 @@
        help
          The path and filename of the ELF executable file to use as payload.
 
+endmenu
+
+menu "VGA BIOS"
+
+choice
+       prompt "VGA BIOS"
+       default VGA_NONE
+
+config VGA_NONE
+       bool "None"
+       help
+         Select this option if you don't want to include a VGA BIOS in
+         the coreboot image.
+config VGA_BIOS
+       bool "Add a VGA BIOS image"
+       depends on PAYLOAD_ELF
+       help
+         Select this option if you have a VGA BIOS image that you would
+         like to add to your ROM.
+
+         You will be able to specify the location and file name of the
+         image later.
+endchoice
+
 config FALLBACK_VGA_BIOS_FILE
        string "VGA BIOS path and filename"
        depends on VGA_BIOS
-- 
coreboot mailing list: [email protected]
http://www.coreboot.org/mailman/listinfo/coreboot

Reply via email to