X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=arch%2Fx86%2Flib%2Fbootm.c;h=f441c84df5628290bd1803c6c4c0a58753b910c1;hb=4acc83d437da7a40e7c2b1874eaba23273ec6bc2;hp=445ee6e45546a9e9c1d1d41fe8c5871d03a277af;hpb=8b097916faa20f04ff4b0147ebcf0331204ec96b;p=u-boot

diff --git a/arch/x86/lib/bootm.c b/arch/x86/lib/bootm.c
index 445ee6e455..f441c84df5 100644
--- a/arch/x86/lib/bootm.c
+++ b/arch/x86/lib/bootm.c
@@ -164,7 +164,11 @@ int boot_linux_kernel(ulong setup_base, ulong load_address, bool image_64bit)
 		* the data segments are 0x18, 4GB flat, and read/write.
 		* U-boot is setting them up that way for itself in
 		* arch/i386/cpu/cpu.c.
+		*
+		* Note that we cannot currently boot a kernel while running as
+		* an EFI application. Please use the payload option for that.
 		*/
+#ifndef CONFIG_EFI_APP
 		__asm__ __volatile__ (
 		"movl $0, %%ebp\n"
 		"cli\n"
@@ -173,6 +177,7 @@ int boot_linux_kernel(ulong setup_base, ulong load_address, bool image_64bit)
 		[boot_params] "S"(setup_base),
 		"b"(0), "D"(0)
 		);
+#endif
 	}
 
 	/* We can't get to here */