Merge tag 'upstream/3.14'

[debian/elilo] / ia32 / system.c

diff --git a/ia32/system.c b/ia32/system.c
index 078d40650a2aca096be6704653f0549a65b7e544..520946a44f1aaf9fe870b573da2ef9594bb2b9fb 100644 (file)
--- a/ia32/system.c
+++ b/ia32/system.c
@@ -149,6 +149,12 @@ sysdeps_initrd_get_addr(kdesc_t *kd, memdesc_t *imem)
        return 0;
 }
 
+VOID *
+sysdeps_checkfix_initrd(VOID *start_addr, memdesc_t *imem)
+{
+       return start_addr;
+}
+
 VOID
 sysdeps_free_boot_params(boot_params_t *bp)
 {
@@ -201,7 +207,19 @@ static INTN get_video_info(boot_params_t * bp) {
                        (VOID **)Gop_handle);
 
        if (EFI_ERROR(efi_status) && efi_status != EFI_BUFFER_TOO_SMALL) {
-               ERR_PRT((L"LocateHandle GopProtocol failed."));
+                Print(L"LocateHandle GopProtocol failed.\n");
+                Print(L"--Either no graphics head is installed,\n" \ 
+                       "--efi console is set to serial, or,\n" \
+                       "--the EFI firmware version of this machine is\n" \
+                       "--older than UEFI 2.0. and does not support GOP");
+                Print(L"you can SAFELY IGNORE this error. elilo will\n" \
+                       "default to text-mode.\n Alternatively you can " \
+                       "now force text mode by setting config variable\n" \
+                       "text_mode=1 for x86 in elilo.conf or via cmdline.\n\n");
+                Print(L"However if this is the last text output you see\n" \
+                       "ensure that your kernel console command line\n " \
+                       "variable matches up with the actual efi boot menu\n" \
+                       "console output settings. for example efi console\n\n");
                return -1;
        }
        Gop_handle = alloc(size, 0);