X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=src%2FKconfig;h=c165d932a7ee444fe3347567f5dc58e7533ad7d2;hb=aff6dc21499295fedae35e52bc906a22831df323;hp=e9ceed5e106657d4b8dc259208123be9303ee6c3;hpb=7f0e93060e720149bb59023d608a67cfc21542b1;p=coreboot.git

diff --git a/src/Kconfig b/src/Kconfig
index e9ceed5e1..c165d932a 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -444,7 +444,7 @@ config PAYLOAD_FILE
 
 config PAYLOAD_FILE
 	depends on PAYLOAD_SEABIOS
-	default "payloads/external/SeaBIOS/seabios/out/bios.bin.elf"
+	default "$(obj)/seabios/out/bios.bin.elf"
 
 config PAYLOAD_FILE
 	depends on PAYLOAD_FILO
@@ -516,40 +516,31 @@ config MBI_FILE
 
 endmenu
 
-menu "Bootsplash"
-	depends on PCI_OPTION_ROM_RUN_YABEL
+menu "Display"
+	depends on PCI_OPTION_ROM_RUN_YABEL || PCI_OPTION_ROM_RUN_REALMODE
 
-config BOOTSPLASH
-	prompt "Show graphical bootsplash"
+config FRAMEBUFFER_SET_VESA_MODE
+	prompt "Set VESA framebuffer mode"
 	bool
-	depends on PCI_OPTION_ROM_RUN_YABEL
-	help
-	  This option shows a graphical bootsplash screen. The grapics are
-	  loaded from the CBFS file bootsplash.jpg.
-
-config BOOTSPLASH_FILE
-	string "Bootsplash path and filename"
-	depends on BOOTSPLASH
-	default "bootsplash.jpg"
+	depends on PCI_OPTION_ROM_RUN_YABEL || PCI_OPTION_ROM_RUN_REALMODE
 	help
-	  The path and filename of the file to use as graphical bootsplash
-	  screen. The file format has to be jpg.
+	  Set VESA framebuffer mode (needed for bootsplash)
 
 # TODO: Turn this into a "choice".
 config FRAMEBUFFER_VESA_MODE
 	prompt "VESA framebuffer video mode"
 	hex
 	default 0x117
-	depends on BOOTSPLASH
+	depends on FRAMEBUFFER_SET_VESA_MODE
 	help
-	  This option sets the resolution used for the coreboot framebuffer and
-	  bootsplash screen. Set to 0x117 for 1024x768x16. A diligent soul will
+	  This option sets the resolution used for the coreboot framebuffer (and
+	  bootsplash screen). Set to 0x117 for 1024x768x16. A diligent soul will
 	  some day make this a "choice".
 
-config COREBOOT_KEEP_FRAMEBUFFER
+config FRAMEBUFFER_KEEP_VESA_MODE
 	prompt "Keep VESA framebuffer"
 	bool
-	depends on BOOTSPLASH
+	depends on PCI_OPTION_ROM_RUN_YABEL || PCI_OPTION_ROM_RUN_REALMODE
 	help
 	  This option keeps the framebuffer mode set after coreboot finishes
 	  execution. If this option is enabled, coreboot will pass a
@@ -557,6 +548,21 @@ config COREBOOT_KEEP_FRAMEBUFFER
 	  framebuffer driver. If this option is disabled, coreboot will switch
 	  back to text mode before handing control to a payload.
 
+config BOOTSPLASH
+	prompt "Show graphical bootsplash"
+	bool
+	depends on FRAMEBUFFER_SET_VESA_MODE
+	help
+	  This option shows a graphical bootsplash screen. The grapics are
+	  loaded from the CBFS file bootsplash.jpg.
+
+config BOOTSPLASH_FILE
+	string "Bootsplash path and filename"
+	depends on BOOTSPLASH
+	default "bootsplash.jpg"
+	help
+	  The path and filename of the file to use as graphical bootsplash
+	  screen. The file format has to be jpg.
 endmenu
 
 menu "Debugging"
@@ -877,10 +883,6 @@ config WARNINGS_ARE_ERRORS
 	bool
 	default y
 
-config ID_SECTION_OFFSET
-	hex
-	default 0x10
-
 # The four POWER_BUTTON_DEFAULT_ENABLE, POWER_BUTTON_DEFAULT_DISABLE,
 # POWER_BUTTON_FORCE_ENABLE and POWER_BUTTON_FORCE_DISABLE options are
 # mutually exclusive. One of these options must be selected in the