[efi] Add support for EFI_GRAPHICS_OUTPUT_PROTOCOL frame buffer consoles

Signed-off-by: Michael Brown <mcb30@ipxe.org>
ipxe · Oct 16, 2015 · 6847232 · 6847232
1 parent 4b7443d
commit 6847232
Show file tree

Hide file tree

Showing 5 changed files with 566 additions and 0 deletions.
diff --git a/src/config/config_efi.c b/src/config/config_efi.c
@@ -39,3 +39,9 @@ PROVIDE_REQUIRING_SYMBOL();
 #ifdef CONSOLE_EFI
 REQUIRE_OBJECT ( efi_console );
 #endif
+#ifdef CONSOLE_EFIFB
+REQUIRE_OBJECT ( efi_fbcon );
+#endif
+#ifdef CONSOLE_FRAMEBUFFER
+REQUIRE_OBJECT ( efi_fbcon );
+#endif
diff --git a/src/image/efi_image.c b/src/image/efi_image.c
@@ -34,6 +34,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <ipxe/init.h>
 #include <ipxe/features.h>
 #include <ipxe/uri.h>
+#include <ipxe/console.h>
 
 FEATURE ( FEATURE_IMAGE, "EFI", DHCP_EB_FEATURE_EFI, 1 );
 
@@ -236,6 +237,9 @@ static int efi_image_exec ( struct image *image ) {
 	/* Wrap calls made by the loaded image (for debugging) */
 	efi_wrap ( handle );
 
+	/* Reset console since image will probably use it */
+	console_reset();
+
 	/* Start the image */
 	if ( ( efirc = bs->StartImage ( handle, NULL, NULL ) ) != 0 ) {
 		rc = -EEFI_START ( efirc );

diff --git a/src/include/ipxe/errfile.h b/src/include/ipxe/errfile.h
@@ -342,6 +342,7 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 #define ERRFILE_efi_watchdog	      ( ERRFILE_OTHER | 0x00490000 )
 #define ERRFILE_efi_pxe		      ( ERRFILE_OTHER | 0x004a0000 )
 #define ERRFILE_efi_usb		      ( ERRFILE_OTHER | 0x004b0000 )
+#define ERRFILE_efi_fbcon	      ( ERRFILE_OTHER | 0x004c0000 )
 
 /** @} */