x86: acpi: Various changes to acpi_table.h

[u-boot] / arch / x86 / lib / bootm.c

diff --git a/arch/x86/lib/bootm.c b/arch/x86/lib/bootm.c
index 86030cf52aab1c3994d805d47d16c17e27178f05..783be691aff9afd9c83fb3895f9151a20d03854e 100644 (file)
--- a/arch/x86/lib/bootm.c
+++ b/arch/x86/lib/bootm.c
@@ -22,6 +22,8 @@
 #include <asm/arch/timestamp.h>
 #endif
 
+DECLARE_GLOBAL_DATA_PTR;
+
 #define COMMAND_LINE_OFFSET 0x9000
 
 /*
@@ -160,9 +162,13 @@ int boot_linux_kernel(ulong setup_base, ulong load_address, bool image_64bit)
                * boot_params structure, and then jump to the kernel. We
                * assume that %cs is 0x10, 4GB flat, and read/execute, and
                * the data segments are 0x18, 4GB flat, and read/write.
-               * U-boot is setting them up that way for itself in
+               * 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"
@@ -171,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 */