Add support for running U-Boot as an EFI payload/application

The CFLAGS_REMOVE_<file> feature allows default C compiler flags to be removed for particular files. Add the same feature for assembler, using AFLAGS_REMOVE_<file>.

Signed-off-by Simon Glass <[email protected]>

---

 scripts/Makefile.lib | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

scripts/Makefile.lib +0 -0

index 8731fc6..3d5c872 100644
@@ -104,8 +104,9 @@ modname_flags  = $(if $(filter 1,$(words $(modname))),\
 orig_c_flags   = $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS) $(KBUILD_SUBDIR_CCFLAGS) \

This function needs to check the list has entries before traversing it. Fix this bug.

Signed-off-by Simon Glass <[email protected]>

---

 drivers/core/uclass.c | 2 ++
 1 file changed, 2 insertions(+)

drivers/core/uclass.c +0 -0

index 7de8173..a930c30 100644

In a final attempt to find a console UART this function uses the first first available serial device. However the check for a valid device is inverted.

This code is only executed when there is in fact no serial UART, but at present it can fail to reach the panic_str() call in this case, and start trying to use a non-existent UART.

Signed-off-by Simon Glass <[email protected]>

---

 drivers/serial/serial-uclass.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

drivers/serial/serial-uclass.c +0 -0

index 815fec3..bbc366b 100644

Provide the types necessary to relocate 64-bit images.

Signed-off-by Simon Glass <[email protected]>

---

 include/elf.h | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

include/elf.h +0 -0

index 63d9341..1936ef6 100644
@@ -28,6 +28,16 @@ typedef int32_t              Elf32_Sword;    /* Signed large integer */
 typedef uint32_t       Elf32_Word;     /* Unsigned large integer */
 typedef uint16_t       Elf32_Half;     /* Unsigned medium integer */
 

include/elf.h +5 -0

 /* Extract relocation info - r_info */
 #define ELF32_R_SYM(i)         ((i) >> 8)
 #define ELF32_R_TYPE(i)                ((unsigned char) (i))

@@ -431,6 +446,17 @@ typedef struct
 
 extern Elf32_Dyn       _DYNAMIC[];
 
+typedef struct {
+       Elf64_Sxword d_tag;             /* entry tag value */
+       union {
+               Elf64_Xword d_val;
+               Elf64_Addr d_ptr;

When running U-Boot as an EFI application we cannot relocate since we do not have relocation information. U-Boot has already been relocated to a suitable address.

Add a global_data flag to control skipping relocation.

Signed-off-by Simon Glass <[email protected]>

---

 common/board_f.c                  | 7 +++++++
 include/asm-generic/global_data.h | 1 +
 2 files changed, 8 insertions(+)

common/board_f.c +7 -0

index 21be26f..5e09c5f 100644
@@ -664,6 +664,11 @@ static int reloc_fdt(void)
 
 static int setup_reloc(void)
 {
+       if (gd->flags & GD_FLG_SKIP_RELOC) {
+               debug("Skipping relocation due to flag\n");
+               return 0;
+       }
+
 #ifdef CONFIG_SYS_TEXT_BASE
        gd->reloc_off = gd->relocaddr - CONFIG_SYS_TEXT_BASE;
 #ifdef CONFIG_M68K

@@ -689,6 +694,8 @@ static int setup_reloc(void)
 
 static int jump_to_copy(void)
 {
+       if (gd->flags & GD_FLG_SKIP_RELOC)
+               return 0;
        /*
         * x86 is special, but in a nice way. It uses a trampoline which
         * enables the dcache if possible.

include/asm-generic/global_data.h +0 -0

index db0550b..086ee96 100644

Hi Simon,

Quoted 48 lines · Simon Glass

When running U-Boot as an EFI application we cannot relocate since we do not have relocation information. U-Boot has already been relocated to a suitable address.

Add a global_data flag to control skipping relocation.

Signed-off-by Simon Glass <[email protected]>

---

 common/board_f.c                  | 7 +++++++
 include/asm-generic/global_data.h | 1 +
 2 files changed, 8 insertions(+)

common/board_f.c +7 -0

index 21be26f..5e09c5f 100644
@@ -664,6 +664,11 @@ static int reloc_fdt(void)
 
 static int setup_reloc(void)
 {
+       if (gd->flags & GD_FLG_SKIP_RELOC) {
+               debug("Skipping relocation due to flag\n");
+               return 0;
+       }
+
 #ifdef CONFIG_SYS_TEXT_BASE
        gd->reloc_off = gd->relocaddr - CONFIG_SYS_TEXT_BASE;
 #ifdef CONFIG_M68K

@@ -689,6 +694,8 @@ static int setup_reloc(void)
 
 static int jump_to_copy(void)
 {
+       if (gd->flags & GD_FLG_SKIP_RELOC)
+               return 0;
        /*
         * x86 is special, but in a nice way. It uses a trampoline which
         * enables the dcache if possible.

include/asm-generic/global_data.h +1 -0

index db0550b..086ee96 100644
@@ -116,5 +116,6 @@ typedef struct global_data {
 #define GD_FLG_ENV_READY       0x00080 /* Env. imported into hash table   */
 #define GD_FLG_SERIAL_READY    0x00100 /* Pre-reloc serial console ready  */
 #define GD_FLG_FULL_MALLOC_INIT        0x00200 /* Full malloc() is ready          */
+#define GD_FLG_SKIP_RELOC      0x00400 /* Don't relocate */
 

include/asm-generic/global_data.h typedef struct global_data {

Quoted 2 lines

include/asm-generic/global_data.h +0 -1

 #endif /* __ASM_GENERIC_GBL_DATA_H */
--

What about reloc_fdt() and do_elf_reloc_fixups()?

Regards,
Bin

This is currently done for all targets, since 0xff is the default erased value for most flash devices. In some cases this is not what we want (e.g. for EFI images) so provide a command to do a vanilla objcopy.

Signed-off-by Simon Glass <[email protected]>

---

 Makefile  | 8 +++++++-
 config.mk | 2 --
 2 files changed, 7 insertions(+), 3 deletions(-)

Makefile +7 -1

index b6f83a5..e0218b3 100644
@@ -778,8 +778,14 @@ ifneq ($(CONFIG_SYS_TEXT_BASE),)
 LDFLAGS_u-boot += -Ttext $(CONFIG_SYS_TEXT_BASE)
 endif
 
+# Normally we fill empty space with 0xff
 quiet_cmd_objcopy = OBJCOPY $@
-cmd_objcopy = $(OBJCOPY) $(OBJCOPYFLAGS) $(OBJCOPYFLAGS_$(@F)) $< $@
+cmd_objcopy = $(OBJCOPY) --gap-fill=0xff $(OBJCOPYFLAGS) \
+       $(OBJCOPYFLAGS_$(@F)) $< $@
+
+# Provide a version which does not do this, for use by EFI
+quiet_cmd_zobjcopy = OBJCOPY $@
+cmd_zobjcopy = $(OBJCOPY) $(OBJCOPYFLAGS) $(OBJCOPYFLAGS_$(@F)) $< $@
 
 quiet_cmd_mkimage = MKIMAGE $@
 cmd_mkimage = $(objtree)/tools/mkimage $(MKIMAGEFLAGS_$(@F)) -d $< $@ \

config.mk +0 -0

index 6282919..b77d589 100644

These will be used for efi.h both for U-Boot running as an EFI application and as a payload. They come from Linux 4.1.

Signed-off-by Simon Glass <[email protected]>

---

 include/linux/types.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

include/linux/types.h +0 -0

index c9a8d9a..255967f 100644

Fix a typo, improve some comments and add a little more detail in some cases.

Signed-off-by Simon Glass <[email protected]>

---

 arch/x86/cpu/start.S | 46 ++++++++++++++++++++++++++--------------------
 1 file changed, 26 insertions(+), 20 deletions(-)

arch/x86/cpu/start.S +24 -19

index 00e585e..7ef8b88 100644
@@ -25,11 +25,11 @@
 .globl _x86boot_start
 _x86boot_start:
        /*
-        * This is the fail safe 32-bit bootstrap entry point. The
-        * following code is not executed from a cold-reset (actually, a
-        * lot of it is, but from real-mode after cold reset. It is
-        * repeated here to put the board into a state as close to cold
-        * reset as necessary)
+        * This is the fail-safe 32-bit bootstrap entry point.
+        *
+        * This code is used when booting from another boot loader like
+        * coreboot or EFI. So we repeat some of the same init found in
+        * start16.
         */
        cli
        cld

@@ -45,15 +45,15 @@ _x86boot_start:
        jmp     1f
 _start:
        /*
-        * This is the 32-bit cold-reset entry point. Initialize %bx to 0
-        * in case we're preceeded by some sort of boot stub.
+        * This is the 32-bit cold-reset entry point, coming from start16.
+        * Set %bx to 0 to indicate this.
         */
        movw    $GD_FLG_COLD_BOOT, %bx
 1:
        /* Save BIST */
        movl    %eax, %ebp
 
-       /* Load the segement registes to match the gdt loaded in start16.S */
+       /* Load the segement registers to match the GDT loaded in start16.S */
        movl    $(X86_GDT_ENTRY_32BIT_DS * X86_GDT_ENTRY_SIZE), %eax
        movw    %ax, %fs
        movw    %ax, %ds

@@ -64,7 +64,11 @@ _start:
        /* Clear the interrupt vectors */
        lidt    blank_idt_ptr
 
-       /* Early platform init (setup gpio, etc ) */
+       /*
+        * Critical early platform init - generally not used, we prefer init
+        * to happen later when we have a console, in case something goes
+        * wrong.
+        */
        jmp     early_board_init
 .globl early_board_init_ret
 early_board_init_ret:

@@ -79,7 +83,7 @@ car_init_ret:
         * We now have CONFIG_SYS_CAR_SIZE bytes of Cache-As-RAM (or SRAM,
         * or fully initialised SDRAM - we really don't care which)
         * starting at CONFIG_SYS_CAR_ADDR to be used as a temporary stack
-        * and early malloc area. The MRC requires some space at the top.
+        * and early malloc() area. The MRC requires some space at the top.
         *
         * Stack grows down from top of CAR. We have:
         *

@@ -97,7 +101,7 @@ car_init_ret:
 #endif
 #else
        /*
-        * When we get here after car_init, esp points to a temporary stack
+        * When we get here after car_init(), esp points to a temporary stack
         * and esi holds the HOB list address returned by the FSP.
         */
 #endif

@@ -137,17 +141,18 @@ skip_hob:
        movl    %esp, %ecx
 
 #if defined(CONFIG_SYS_MALLOC_F_LEN)
+       /* Set up the pre-relocation malloc pool */
        subl    $CONFIG_SYS_MALLOC_F_LEN, %esp
        movl    %eax, %edx
        addl    $GD_MALLOC_BASE, %edx
        movl    %esp, (%edx)
 #endif
-       /* Store BIST */
+       /* Store BIST into global_data */
        movl    %eax, %edx
        addl    $GD_BIST, %edx
        movl    %ebp, (%edx)
 
-       /* Set second parameter to setup_gdt */
+       /* Set second parameter to setup_gdt() */
        movl    %ecx, %edx
 
        /* Setup global descriptor table so gd->xyz works */

@@ -157,7 +162,7 @@ skip_hob:
        post_code(POST_START_DONE)
        xorl    %eax, %eax
 
-       /* Enter, U-boot! */
+       /* Enter, U-Boot! */
        call    board_init_f
 
        /* indicate (lack of) progress */

@@ -184,13 +189,13 @@ board_init_f_r_trampoline:
        /* Align global data to 16-byte boundary */
        andl    $0xfffffff0, %esp
 
-       /* Setup first parameter to memcpy (and setup_gdt) */
+       /* Setup first parameter to memcpy() and setup_gdt() */
        movl    %esp, %eax
 
-       /* Setup second parameter to memcpy */
+       /* Setup second parameter to memcpy() */
        fs movl 0, %edx
 
-       /* Set third parameter to memcpy */
+       /* Set third parameter to memcpy() */
        movl    $GENERATED_GBL_DATA_SIZE, %ecx
 
        /* Copy global data from CAR to SDRAM stack */

@@ -202,7 +207,7 @@ board_init_f_r_trampoline:
        /* Align global descriptor table to 16-byte boundary */
        andl    $0xfffffff0, %esp
 
-       /* Set second parameter to setup_gdt */
+       /* Set second parameter to setup_gdt() */
        movl    %esp, %edx
 
        /* Setup global descriptor table so gd->xyz works */

@@ -216,7 +221,7 @@ board_init_f_r_trampoline:
 
        call    car_uninit
 1:
-       /* Re-enter U-Boot by calling board_init_f_r */
+       /* Re-enter U-Boot by calling board_init_f_r() */
        call    board_init_f_r
 
 die:

@@ -230,9 +235,10 @@ blank_idt_ptr:
 
        .p2align        2       /* force 4-byte alignment */

We should use these constants where possible.

Signed-off-by Simon Glass <[email protected]>

---

 arch/x86/cpu/cpu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

arch/x86/cpu/cpu.c +0 -0

index b9134cf..d233a45 100644

These flags now overlap some global ones. Adjust the x86-specific flags to avoid this.

Signed-off-by Simon Glass <[email protected]>

---

 arch/x86/include/asm/global_data.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

arch/x86/include/asm/global_data.h +2 -0

index 4d9eac6..abd70b9 100644
@@ -87,14 +87,14 @@ static inline __attribute__((no_instrument_function)) gd_t *get_fs_gd_ptr(void)
 
 #define gd     get_fs_gd_ptr()
 
+#define DECLARE_GLOBAL_DATA_PTR
+
 #endif
 

This is now handled by generic U-Boot code so we do not need an x86 version. It is no-longer called, so remove it.

Signed-off-by Simon Glass <[email protected]>

---

 arch/x86/include/asm/relocate.h |  1 -
 arch/x86/lib/relocate.c         | 18 ------------------
 2 files changed, 19 deletions(-)

arch/x86/include/asm/relocate.h +0 -1

index eb186b9..cff3abc 100644
@@ -11,7 +11,6 @@
 #include <common.h>
 
 int copy_uboot_to_ram(void);
-int copy_fdt_to_ram(void);
 int clear_bss(void);
 int do_elf_reloc_fixups(void);
 

arch/x86/lib/relocate.c +0 -12

index b33586b..1a62142 100644
@@ -17,8 +17,6 @@
 
 #include <common.h>
 #include <inttypes.h>
-#include <libfdt.h>
-#include <malloc.h>
 #include <asm/u-boot-x86.h>
 #include <asm/relocate.h>
 #include <asm/sections.h>

@@ -35,22 +33,6 @@ int copy_uboot_to_ram(void)
        return 0;
 }
 
-int copy_fdt_to_ram(void)
-{
-       if (gd->new_fdt) {
-               ulong fdt_size;
-
-               fdt_size = ALIGN(fdt_totalsize(gd->fdt_blob) + 0x1000, 32);
-
-               memcpy(gd->new_fdt, gd->fdt_blob, fdt_size);
-               debug("Relocated fdt from %p to %p, size %lx\n",
-                      gd->fdt_blob, gd->new_fdt, fdt_size);

The GDT works but technically the length is incorrect. Fix this and add a comment.

Signed-off-by Simon Glass <[email protected]>

---

 arch/x86/cpu/call64.S | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

arch/x86/cpu/call64.S +0 -0

index 74dd5a8..08dc473 100644
@@ -82,8 +82,8 @@ lret_target:
 

Some files use global_data but don't declare it. Fix this.

Signed-off-by Simon Glass <[email protected]>

---

 arch/x86/cpu/mp_init.c         | 2 ++
 arch/x86/lib/bootm.c           | 2 ++
 arch/x86/lib/fsp/fsp_common.c  | 2 ++
 arch/x86/lib/lpc-uclass.c      | 2 ++
 arch/x86/lib/pch-uclass.c      | 2 ++
 drivers/gpio/intel_ich6_gpio.c | 2 ++
 6 files changed, 12 insertions(+)

arch/x86/cpu/mp_init.c +2 -0

index e686b28..3294a50 100644
@@ -24,6 +24,8 @@
 #include <dm/uclass-internal.h>
 #include <linux/linkage.h>
 
+DECLARE_GLOBAL_DATA_PTR;
+
 /* Total CPUs include BSP */
 static int num_cpus;
 

arch/x86/lib/bootm.c +2 -0

index 86030cf..445ee6e 100644
@@ -22,6 +22,8 @@
 #include <asm/arch/timestamp.h>
 #endif
 
+DECLARE_GLOBAL_DATA_PTR;
+
 #define COMMAND_LINE_OFFSET 0x9000
 
 /*

arch/x86/lib/fsp/fsp_common.c +2 -0

index 5b25632..c585710 100644
@@ -11,6 +11,8 @@
 #include <asm/processor.h>
 #include <asm/fsp/fsp_support.h>
 
+DECLARE_GLOBAL_DATA_PTR;
+
 int print_cpuinfo(void)
 {
        post_code(POST_CPU_INFO);

arch/x86/lib/lpc-uclass.c +2 -0

index 6aeb4d4..c6e8f73 100644
@@ -9,6 +9,8 @@
 #include <dm.h>
 #include <dm/root.h>
 
+DECLARE_GLOBAL_DATA_PTR;
+
 static int lpc_uclass_post_bind(struct udevice *bus)
 {
        /*

arch/x86/lib/pch-uclass.c +2 -0

index d1082e1..20dfa81 100644
@@ -9,6 +9,8 @@
 #include <dm.h>
 #include <dm/root.h>
 
+DECLARE_GLOBAL_DATA_PTR;
+
 static int pch_uclass_post_bind(struct udevice *bus)
 {
        /*

drivers/gpio/intel_ich6_gpio.c +0 -0

index 8a108f3..cb408a4 100644

Fix a typo, remove an unused field and make sure to use existing #define constants instead of open-coded values.

Signed-off-by Simon Glass <[email protected]>

---

 arch/x86/cpu/interrupts.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

arch/x86/cpu/interrupts.c +3 -3

index 853c82f..3a9c2d4 100644
@@ -19,6 +19,7 @@
 #include <asm/processor-flags.h>
 #include <linux/compiler.h>
 #include <asm/msr.h>
+#include <asm/processor.h>
 #include <asm/u-boot-x86.h>
 #include <asm/i8259.h>
 

@@ -46,7 +47,7 @@ static char *exceptions[] = {
        "Invalid TSS",
        "Segment Not Present",
        "Stack Segment Fault",
-       "Gerneral Protection",
+       "General Protection",
        "Page Fault",
        "Reserved",
        "x87 FPU Floating-Point Error",

@@ -165,7 +166,6 @@ struct idt_entry {
 struct desc_ptr {
        unsigned short size;
        unsigned long address;
-       unsigned short segment;
 } __packed;
 
 struct idt_entry idt[256] __aligned(16);

@@ -202,14 +202,13 @@ int cpu_init_interrupts(void)
        for (i = 0; i < 256; i++) {
                idt[i].access = 0x8e;
                idt[i].res = 0;
-               idt[i].selector = 0x10;
+               idt[i].selector = X86_GDT_ENTRY_32BIT_CS * X86_GDT_ENTRY_SIZE;
                set_vector(i, irq_entry);
                irq_entry += irq_entry_size;

This file does not need its own way of doing debug(). Clean it up to use the new way.

Signed-off-by Simon Glass <[email protected]>

This file does not need its own way of doing debug(). Clean it up to use the new way.

Signed-off-by Simon Glass <[email protected]>

---

 drivers/pci/pci_auto.c | 48 +++++++++++++++++++++++-------------------------
 1 file changed, 23 insertions(+), 25 deletions(-)

drivers/pci/pci_auto.c +22 -24

index a7af8cb..7ff282b 100644
@@ -14,12 +14,6 @@
 #include <errno.h>
 #include <pci.h>
 
-#ifdef DEBUG
-#define DEBUGF(x...) printf(x)
-#else
-#define DEBUGF(x...)
-#endif /* DEBUG */
-
 /* the user can define CONFIG_SYS_PCI_CACHE_LINE_SIZE to avoid problems */
 #ifndef CONFIG_SYS_PCI_CACHE_LINE_SIZE
 #define CONFIG_SYS_PCI_CACHE_LINE_SIZE 8

@@ -50,20 +44,21 @@ int pciauto_region_allocate(struct pci_region *res, pci_size_t size,
        pci_addr_t addr;
 
        if (!res) {
-               DEBUGF("No resource");
+               debug("No resource");
                goto error;
        }
 
        addr = ((res->bus_lower - 1) | (size - 1)) + 1;
 
        if (addr - res->bus_start + size > res->size) {
-               DEBUGF("No room in resource");
+               debug("No room in resource");
                goto error;
        }
 
        res->bus_lower = addr + size;
 
-       DEBUGF("address=0x%llx bus_lower=0x%llx", (u64)addr, (u64)res->bus_lower);
+       debug("address=0x%llx bus_lower=0x%llx", (unsigned long long)addr,
+             (unsigned long long)res->bus_lower);
 
        *bar = addr;
        return 0;

@@ -122,7 +117,8 @@ void pciauto_setup_device(struct pci_controller *hose,
                        bar_res = io;
 #endif
 
-                       DEBUGF("PCI Autoconfig: BAR %d, I/O, size=0x%llx, ", bar_nr, (u64)bar_size);
+                       debug("PCI Autoconfig: BAR %d, I/O, size=0x%llx, ",
+                             bar_nr, (unsigned long long)bar_size);
                } else {
                        if ((bar_response & PCI_BASE_ADDRESS_MEM_TYPE_MASK) ==
                             PCI_BASE_ADDRESS_MEM_TYPE_64) {

@@ -152,7 +148,8 @@ void pciauto_setup_device(struct pci_controller *hose,
                                bar_res = mem;
 #endif
 
-                       DEBUGF("PCI Autoconfig: BAR %d, Mem, size=0x%llx, ", bar_nr, (u64)bar_size);
+                       debug("PCI Autoconfig: BAR %d, Mem, size=0x%llx, ",
+                             bar_nr, (unsigned long long)bar_size);
                }
 
 #ifndef CONFIG_PCI_ENUM_ONLY

@@ -179,7 +176,7 @@ void pciauto_setup_device(struct pci_controller *hose,
                cmdstat |= (bar_response & PCI_BASE_ADDRESS_SPACE) ?
                        PCI_COMMAND_IO : PCI_COMMAND_MEMORY;
 
-               DEBUGF("\n");
+               debug("\n");
 
                bar_nr++;
        }

@@ -193,14 +190,15 @@ void pciauto_setup_device(struct pci_controller *hose,
                pci_hose_read_config_dword(hose, dev, rom_addr, &bar_response);
                if (bar_response) {
                        bar_size = -(bar_response & ~1);
-                       DEBUGF("PCI Autoconfig: ROM, size=%#x, ", bar_size);
+                       debug("PCI Autoconfig: ROM, size=%#x, ",
+                             (unsigned int)bar_size);
                        if (pciauto_region_allocate(mem, bar_size,
                                                    &bar_value) == 0) {
                                pci_hose_write_config_dword(hose, dev, rom_addr,
                                                            bar_value);
                        }
                        cmdstat |= PCI_COMMAND_MEMORY;
-                       DEBUGF("\n");
+                       debug("\n");
                }
        }
 

@@ -411,7 +409,7 @@ void pciauto_config_init(struct pci_controller *hose)
        if (hose->pci_mem) {
                pciauto_region_init(hose->pci_mem);
 
-               DEBUGF("PCI Autoconfig: Bus Memory region: [0x%llx-0x%llx],\n"
+               debug("PCI Autoconfig: Bus Memory region: [0x%llx-0x%llx],\n"
                       "\t\tPhysical Memory [%llx-%llxx]\n",
                    (u64)hose->pci_mem->bus_start,
                    (u64)(hose->pci_mem->bus_start + hose->pci_mem->size - 1),

@@ -422,7 +420,7 @@ void pciauto_config_init(struct pci_controller *hose)
        if (hose->pci_prefetch) {
                pciauto_region_init(hose->pci_prefetch);
 
-               DEBUGF("PCI Autoconfig: Bus Prefetchable Mem: [0x%llx-0x%llx],\n"
+               debug("PCI Autoconfig: Bus Prefetchable Mem: [0x%llx-0x%llx],\n"
                       "\t\tPhysical Memory [%llx-%llx]\n",
                    (u64)hose->pci_prefetch->bus_start,
                    (u64)(hose->pci_prefetch->bus_start +

@@ -435,7 +433,7 @@ void pciauto_config_init(struct pci_controller *hose)
        if (hose->pci_io) {
                pciauto_region_init(hose->pci_io);
 
-               DEBUGF("PCI Autoconfig: Bus I/O region: [0x%llx-0x%llx],\n"
+               debug("PCI Autoconfig: Bus I/O region: [0x%llx-0x%llx],\n"
                       "\t\tPhysical Memory: [%llx-%llx]\n",
                    (u64)hose->pci_io->bus_start,
                    (u64)(hose->pci_io->bus_start + hose->pci_io->size - 1),

@@ -475,8 +473,8 @@ int pciauto_config_device(struct pci_controller *hose, pci_dev_t dev)
 
        switch (class) {
        case PCI_CLASS_BRIDGE_PCI:
-               DEBUGF("PCI Autoconfig: Found P2P bridge, device %d\n",
-                      PCI_DEV(dev));
+               debug("PCI Autoconfig: Found P2P bridge, device %d\n",
+                     PCI_DEV(dev));
 
                pciauto_setup_device(hose, dev, 2, pci_mem,
                                     pci_prefetch, pci_io);

@@ -512,8 +510,8 @@ int pciauto_config_device(struct pci_controller *hose, pci_dev_t dev)
                pciauto_setup_device(hose, dev, 0, pci_mem,
                                     pci_prefetch, pci_io);
 
-               DEBUGF("PCI Autoconfig: Found P2CardBus bridge, device %d\n",
-                       PCI_DEV(dev));
+               debug("PCI Autoconfig: Found P2CardBus bridge, device %d\n",
+                     PCI_DEV(dev));
 
 #ifndef CONFIG_DM_PCI
                hose->current_busno++;

@@ -522,8 +520,8 @@ int pciauto_config_device(struct pci_controller *hose, pci_dev_t dev)
 
 #if defined(CONFIG_PCIAUTO_SKIP_HOST_BRIDGE)
        case PCI_CLASS_BRIDGE_OTHER:
-               DEBUGF("PCI Autoconfig: Skipping bridge device %d\n",
-                      PCI_DEV(dev));
+               debug("PCI Autoconfig: Skipping bridge device %d\n",
+                     PCI_DEV(dev));
                break;
 #endif
 #if defined(CONFIG_MPC834x) && !defined(CONFIG_VME8349)

@@ -534,14 +532,14 @@ int pciauto_config_device(struct pci_controller *hose, pci_dev_t dev)
                 * device claiming resources io/mem/irq.. we only allow for
                 * the PIMMR window to be allocated (BAR0 - 1MB size)
                 */
-               DEBUGF("PCI Autoconfig: Broken bridge found, only minimal config\n");
+               debug("PCI Autoconfig: Broken bridge found, only minimal config\n");
                pciauto_setup_device(hose, dev, 0, hose->pci_mem,
                        hose->pci_prefetch, hose->pci_io);

This option is not used by any board but appears to still be useful, at least for testing. With recent commits it does not build, so fix it.

Signed-off-by Simon Glass <[email protected]>

---

 drivers/pci/pci_auto.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

drivers/pci/pci_auto.c +2 -1

index 7ff282b..51d2ac0 100644
@@ -82,9 +82,9 @@ void pciauto_setup_device(struct pci_controller *hose,
        pci_size_t bar_size;
        u16 cmdstat = 0;
        int bar, bar_nr = 0;
+#ifndef CONFIG_PCI_ENUM_ONLY
        u8 header_type;
        int rom_addr;
-#ifndef CONFIG_PCI_ENUM_ONLY
        pci_addr_t bar_value;
        struct pci_region *bar_res;
        int found_mem64 = 0;

@@ -181,6 +181,7 @@ void pciauto_setup_device(struct pci_controller *hose,
                bar_nr++;
        }
 
+#ifndef CONFIG_PCI_ENUM_ONLY
        /* Configure the expansion ROM address */
        pci_hose_read_config_byte(hose, dev, PCI_HEADER_TYPE, &header_type);
        if (header_type != PCI_HEADER_TYPE_CARDBUS) {

Hi Simon,

Quoted 3 lines · Simon Glass

This option is not used by any board but appears to still be useful, at least for testing. With recent commits it does not build, so fix it.

It looks like CONFIG_PCI_ENUM_ONLY does similar things as CONFIG_PCI_PNP. Can we just use CONFIG_PCI_PNP?

Quoted 36 lines

Signed-off-by Simon Glass <[email protected]>

---

 drivers/pci/pci_auto.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

drivers/pci/pci_auto.c +3 -1

index 7ff282b..51d2ac0 100644
@@ -82,9 +82,9 @@ void pciauto_setup_device(struct pci_controller *hose,
        pci_size_t bar_size;
        u16 cmdstat = 0;
        int bar, bar_nr = 0;
+#ifndef CONFIG_PCI_ENUM_ONLY
        u8 header_type;
        int rom_addr;
-#ifndef CONFIG_PCI_ENUM_ONLY
        pci_addr_t bar_value;
        struct pci_region *bar_res;
        int found_mem64 = 0;

@@ -181,6 +181,7 @@ void pciauto_setup_device(struct pci_controller *hose,
                bar_nr++;
        }
 
+#ifndef CONFIG_PCI_ENUM_ONLY
        /* Configure the expansion ROM address */
        pci_hose_read_config_byte(hose, dev, PCI_HEADER_TYPE, &header_type);
        if (header_type != PCI_HEADER_TYPE_CARDBUS) {

@@ -201,6 +202,7 @@ void pciauto_setup_device(struct pci_controller *hose,
                        debug("\n");
                }
        }
+#endif
 

drivers/pci/pci_auto.c void pciauto_setup_device(struct pci_controller *hose,

Quoted 3 lines

drivers/pci/pci_auto.c +0 -1

        pci_hose_write_config_word(hose, dev, PCI_COMMAND, cmdstat);
        pci_hose_write_config_byte(hose, dev, PCI_CACHE_LINE_SIZE,
--

Regards,
Bin

From: Ben Stoltz <[email protected]>

When U-Boot runs as an EFI application is does not have a definition of CONFIG_SYS_TEXT_BASE. U-Boot is a relocatable application and the relocation is done by EFI. U-Boot can be loaded at any address.

This is similar to how sandbox works. Adjust the early board init to deal with this.

Signed-off-by Ben Stoltz <[email protected]>

Signed-off-by Simon Glass <[email protected]>

---

 common/board_f.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

common/board_f.c +0 -0

index 5e09c5f..ad5500f 100644

common/board_f.c +1 -1

        ulong bss_start, bss_end, text_base;
 
        bss_start = (ulong)&__bss_start;

@@ -267,7 +267,7 @@ static int setup_mon_len(void)
 {
 #if defined(__ARM__) || defined(__MICROBLAZE__)
        gd->mon_len = (ulong)&__bss_end - (ulong)_start;
-#elif defined(CONFIG_SANDBOX)
+#elif defined(CONFIG_SANDBOX) || defined(CONFIG_ARCH_EFI)
        gd->mon_len = (ulong)&_end - (ulong)_init;
 #elif defined(CONFIG_BLACKFIN) || defined(CONFIG_NIOS2)
        gd->mon_len = CONFIG_SYS_MONITOR_LEN;

When running as an EFI application, U-Boot must request memory from EFI, and provide access to the boot services U-Boot needs.

Add library code to perform these tasks. This includes efi_main() which is the entry point from EFI. U-Boot is built as a shared library.

Signed-off-by Simon Glass <[email protected]>

---

 arch/x86/include/asm/fsp/fsp_hob.h |  59 +-----
 include/efi.h                      | 356 +++++++++++++++++++++++++++++++++++++
 include/efi_api.h                  | 252 ++++++++++++++++++++++++++
 include/part_efi.h                 |   9 +-
 lib/Kconfig                        |   2 +
 lib/Makefile                       |   1 +
 lib/efi/Kconfig                    |  33 ++++
 lib/efi/Makefile                   |   7 +
 lib/efi/efi.c                      |  91 ++++++++++
 lib/efi/efi_app.c                  | 125 +++++++++++++
 10 files changed, 871 insertions(+), 64 deletions(-)
 create mode 100644 include/efi.h
 create mode 100644 include/efi_api.h
 create mode 100644 lib/efi/Kconfig
 create mode 100644 lib/efi/Makefile
 create mode 100644 lib/efi/efi.c
 create mode 100644 lib/efi/efi_app.c

arch/x86/include/asm/fsp/fsp_hob.h +2 -57

index 6cca7f5..3fb3546 100644
@@ -8,6 +8,8 @@
 #ifndef __FSP_HOB_H__
 #define __FSP_HOB_H__
 
+#include <efi.h>
+
 /* Type of HOB Header */
 #define HOB_TYPE_MEM_ALLOC     0x0002
 #define HOB_TYPE_RES_DESC      0x0003

@@ -25,63 +27,6 @@ struct hob_header {
        u32     reserved;       /* always zero */
 };
 
-/* Enumeration of memory types introduced in UEFI */
-enum efi_mem_type {
-       EFI_RESERVED_MEMORY_TYPE,
-       /*
-        * The code portions of a loaded application.
-        * (Note that UEFI OS loaders are UEFI applications.)
-        */
-       EFI_LOADER_CODE,
-       /*
-        * The data portions of a loaded application and
-        * the default data allocation type used by an application
-        * to allocate pool memory.
-        */
-       EFI_LOADER_DATA,
-       /* The code portions of a loaded Boot Services Driver */
-       EFI_BOOT_SERVICES_CODE,
-       /*
-        * The data portions of a loaded Boot Serves Driver and
-        * the default data allocation type used by a Boot Services
-        * Driver to allocate pool memory.
-        */
-       EFI_BOOT_SERVICES_DATA,
-       /* The code portions of a loaded Runtime Services Driver */
-       EFI_RUNTIME_SERVICES_CODE,
-       /*
-        * The data portions of a loaded Runtime Services Driver and
-        * the default data allocation type used by a Runtime Services
-        * Driver to allocate pool memory.
-        */
-       EFI_RUNTIME_SERVICES_DATA,
-       /* Free (unallocated) memory */
-       EFI_CONVENTIONAL_MEMORY,
-       /* Memory in which errors have been detected */
-       EFI_UNUSABLE_MEMORY,
-       /* Memory that holds the ACPI tables */
-       EFI_ACPI_RECLAIM_MEMORY,
-       /* Address space reserved for use by the firmware */
-       EFI_ACPI_MEMORY_NVS,
-       /*
-        * Used by system firmware to request that a memory-mapped IO region
-        * be mapped by the OS to a virtual address so it can be accessed by
-        * EFI runtime services.
-        */
-       EFI_MMAP_IO,
-       /*
-        * System memory-mapped IO region that is used to translate
-        * memory cycles to IO cycles by the processor.
-        */
-       EFI_MMAP_IO_PORT,
-       /*
-        * Address space reserved by the firmware for code that is
-        * part of the processor.
-        */
-       EFI_PAL_CODE,
-       EFI_MAX_MEMORY_TYPE
-};
-
 /*
  * Describes all memory ranges used during the HOB producer phase that
  * exist outside the HOB list. This HOB type describes how memory is used,

include/efi.h new file +11 -0

new file mode 100644
index 0000000..66ef6c3
@@ -0,0 +1,356 @@
+/*
+ * Extensible Firmware Interface
+ * Based on 'Extensible Firmware Interface Specification' version 0.9,
+ * April 30, 1999
+ *
+ * Copyright (C) 1999 VA Linux Systems
+ * Copyright (C) 1999 Walt Drummond <[email protected]>
+ * Copyright (C) 1999, 2002-2003 Hewlett-Packard Co.
+ *     David Mosberger-Tang <[email protected]>
+ *     Stephane Eranian <[email protected]>
+ *

include/efi.h new file +9 -0

+#else
+#define EFIAPI
+#endif
+
+struct efi_device_path;
+
+#define EFI_SUCCESS            0
+#define EFI_LOAD_ERROR         (1 | (1UL << (BITS_PER_LONG - 1)))
+#define EFI_INVALID_PARAMETER  (2 | (1UL << (BITS_PER_LONG - 1)))

include/efi.h new file +6 -0

+typedef unsigned long efi_status_t;
+typedef u64 efi_physical_addr_t;
+typedef u64 efi_virtual_addr_t;
+typedef void *efi_handle_t;
+
+#define EFI_GUID(a, b, c, d0, d1, d2, d3, d4, d5, d6, d7) \

include/efi.h new file +71 -0

+struct efi_table_hdr {
+       u64 signature;
+       u32 revision;
+       u32 headersize;
+       u32 crc32;
+       u32 reserved;
+};
+
+/* Enumeration of memory types introduced in UEFI */
+enum efi_mem_type {
+       EFI_RESERVED_MEMORY_TYPE,
+       /*
+        * The code portions of a loaded application.
+        * (Note that UEFI OS loaders are UEFI applications.)
+        */
+       EFI_LOADER_CODE,
+       /*
+        * The data portions of a loaded application and
+        * the default data allocation type used by an application
+        * to allocate pool memory.
+        */
+       EFI_LOADER_DATA,
+       /* The code portions of a loaded Boot Services Driver */
+       EFI_BOOT_SERVICES_CODE,
+       /*
+        * The data portions of a loaded Boot Serves Driver and
+        * the default data allocation type used by a Boot Services
+        * Driver to allocate pool memory.
+        */
+       EFI_BOOT_SERVICES_DATA,
+       /* The code portions of a loaded Runtime Services Driver */
+       EFI_RUNTIME_SERVICES_CODE,
+       /*
+        * The data portions of a loaded Runtime Services Driver and
+        * the default data allocation type used by a Runtime Services
+        * Driver to allocate pool memory.
+        */
+       EFI_RUNTIME_SERVICES_DATA,
+       /* Free (unallocated) memory */
+       EFI_CONVENTIONAL_MEMORY,
+       /* Memory in which errors have been detected */
+       EFI_UNUSABLE_MEMORY,
+       /* Memory that holds the ACPI tables */
+       EFI_ACPI_RECLAIM_MEMORY,
+       /* Address space reserved for use by the firmware */
+       EFI_ACPI_MEMORY_NVS,
+       /*
+        * Used by system firmware to request that a memory-mapped IO region
+        * be mapped by the OS to a virtual address so it can be accessed by
+        * EFI runtime services.
+        */
+       EFI_MMAP_IO,
+       /*
+        * System memory-mapped IO region that is used to translate
+        * memory cycles to IO cycles by the processor.
+        */
+       EFI_MMAP_IO_PORT,
+       /*
+        * Address space reserved by the firmware for code that is
+        * part of the processor.
+        */
+       EFI_PAL_CODE,
+
+       EFI_MAX_MEMORY_TYPE,
+       EFI_TABLE_END,  /* For efi_build_mem_table() */
+};
+
+/* Attribute values */
+enum {
+       EFI_MEMORY_UC_SHIFT     = 0,    /* uncached */
+       EFI_MEMORY_WC_SHIFT     = 1,    /* write-coalescing */

include/efi.h new file +7 -0

+};
+
+#define EFI_PAGE_SHIFT         12
+#define EFI_PAGE_SIZE          (1UL << EFI_PAGE_SHIFT)
+
+struct efi_mem_desc {
+       u32 type;

include/efi.h new file +31 -0

+#define EFI_TIME_ADJUST_DAYLIGHT 0x1
+#define EFI_TIME_IN_DAYLIGHT     0x2
+#define EFI_UNSPECIFIED_TIMEZONE 0x07ff
+
+struct efi_time {
+       u16 year;
+       u8 month;
+       u8 day;
+       u8 hour;
+       u8 minute;
+       u8 second;
+       u8 pad1;
+       u32 nanosecond;
+       s16 timezone;
+       u8 daylight;
+       u8 pad2;
+};
+
+struct efi_time_cap {
+       u32 resolution;
+       u32 accuracy;
+       u8 sets_to_zero;
+};
+
+enum efi_locate_search_type {
+       all_handles,
+       by_register_notify,
+       by_protocol
+};
+
+struct efi_open_protocol_info_entry {

include/efi.h new file +6 -0

+ */
+struct efi_info_hdr {
+       u32 version;
+       u32 hdr_size;
+       u32 total_size;
+       u32 spare[5];

include/efi.h new file +14 -0

+};
+
+static inline struct efi_mem_desc *efi_get_next_mem_desc(
+               struct efi_entry_memmap *map, struct efi_mem_desc *desc)
+{
+       return (struct efi_mem_desc *)((ulong)desc + map->desc_size);
+}
+
+struct efi_priv {
+       efi_handle_t parent_image;
+       struct efi_device_path *device_path;
+       struct efi_system_table *sys_table;
+       struct efi_boot_services *boot;
+       struct efi_runtime_services *run;

include/efi.h new file +4 -0

+
+/**
+ * efi_get_sys_table() - Get access to the main EFI system table
+ *

include/efi.h new file +10 -0

+ */
+unsigned long efi_get_ram_base(void);
+
+/**
+ * efi_init() - Set up ready for use of EFI boot services
+ *
+ * @priv:      Pointer to our private EFI structure to fill in
+ * @banner:    Banner to display when starting
+ * @image:     The image handle passed to efi_main()
+ * @sys_table: The EFI system table pointer passed to efi_main()

include/efi.h new file +15 -0

+ * @return pointer to memory allocated, or NULL on error
+ */
+void *efi_malloc(struct efi_priv *priv, int size, efi_status_t *retp);
+
+/**
+ * efi_free() - Free memory allocated from EFI
+ *
+ * @priv:      Pointer to private EFI structure
+ * @ptr:       Pointer to memory to free
+ */
+void efi_free(struct efi_priv *priv, void *ptr);
+
+/**
+ * efi_puts() - Write out a string to the EFI console
+ *

include/efi.h new file +28 -0

+ */
+void efi_putc(struct efi_priv *priv, const char ch);
+
+/**
+ * efi_info_get() - get an entry from an EFI table
+ *
+ * @type:      Entry type to search for
+ * @datap:     Returns pointer to entry data
+ * @sizep:     Returns pointer to entry size
+ * @return 0 if OK, -ENODATA if there is no table, -ENOENT if there is no entry
+ * of the requested type, -EPROTONOSUPPORT if the table has the wrong version
+ */
+int efi_info_get(enum efi_entry_t type, void **datap, int *sizep);
+
+/**
+ * efi_build_mem_table() - make a sorted copy of the memory table
+ *
+ * @map:       Pointer to EFI memory map table
+ * @size:      Size of table in bytes
+ * @skip_bs:   True to skip boot-time memory and merge it with conventional
+ *             memory. This will significantly reduce the number of table
+ *             entries.
+ * @return pointer to the new table. It should be freed with free() by the
+ *        caller
+ */
+void *efi_build_mem_table(struct efi_entry_memmap *map, int size, bool skip_bs);
+
+#endif /* _LINUX_EFI_H */

include/efi_api.h new file +12 -0

new file mode 100644
index 0000000..d4528f6
@@ -0,0 +1,252 @@
+/*
+ * Extensible Firmware Interface
+ * Based on 'Extensible Firmware Interface Specification' version 0.9,
+ * April 30, 1999
+ *
+ * Copyright (C) 1999 VA Linux Systems
+ * Copyright (C) 1999 Walt Drummond <[email protected]>
+ * Copyright (C) 1999, 2002-2003 Hewlett-Packard Co.
+ *     David Mosberger-Tang <[email protected]>
+ *     Stephane Eranian <[email protected]>
+ *
+ * From include/linux/efi.h in kernel 4.1 with some additions/subtractions

include/efi_api.h new file +18 -0

+struct efi_boot_services {
+       struct efi_table_hdr hdr;
+       void *raise_tpl;
+       void *restore_tpl;
+
+       efi_status_t (EFIAPI *allocate_pages)(int, int, unsigned long,
+                                             efi_physical_addr_t *);
+       efi_status_t (EFIAPI *free_pages)(efi_physical_addr_t, unsigned long);
+       efi_status_t (EFIAPI *get_memory_map)(unsigned long *memory_map_size,
+                       struct efi_mem_desc *desc, unsigned long *key,
+                       unsigned long *desc_size, u32 *desc_version);
+       efi_status_t (EFIAPI *allocate_pool)(int, unsigned long, void **);
+       efi_status_t (EFIAPI *free_pool)(void *);
+
+       void *create_event;
+       void *set_timer;
+       efi_status_t(EFIAPI *wait_for_event)(unsigned long number_of_events,
+                                            void *event, unsigned long *index);

include/efi_api.h new file +27 -0

+       void *register_protocol_notify;
+       efi_status_t (EFIAPI *locate_handle)(
+                       enum efi_locate_search_type search_type,
+                       efi_guid_t *protocol, void *search_key,
+                       unsigned long *buffer_size, efi_handle_t *buffer);
+       efi_status_t (EFIAPI *locate_device_path)(efi_guid_t *protocol,
+                       struct efi_device_path **device_path,
+                       efi_handle_t *device);
+       void *install_configuration_table;
+
+       efi_status_t (EFIAPI *load_image)(bool boot_policiy,
+                       efi_handle_t parent_image,
+                       struct efi_device_path *file_path, void *source_buffer,
+                       unsigned long source_size, efi_handle_t *image);
+       efi_status_t (EFIAPI *start_image)(efi_handle_t handle,
+                                          unsigned long *exitdata_size,
+                                          s16 **exitdata);
+       efi_status_t (EFIAPI *exit)(efi_handle_t handle,
+                                   efi_status_t exit_status,
+                                   unsigned long exitdata_size, s16 *exitdata);
+       void *unload_image;
+       efi_status_t (EFIAPI *exit_boot_services)(efi_handle_t, unsigned long);
+
+       efi_status_t (EFIAPI *get_next_monotonic_count)(u64 *count);
+       efi_status_t (EFIAPI *stall)(unsigned long usecs);
+       void *set_watchdog_timer;
+       efi_status_t(EFIAPI *connect_controller)(efi_handle_t controller_handle,

include/efi_api.h new file +18 -0

+       efi_status_t (EFIAPI *open_protocol)(efi_handle_t handle,
+                       efi_guid_t *protocol, void **interface,
+                       efi_handle_t agent_handle,
+                       efi_handle_t controller_handle, u32 attributes);
+       void *close_protocol;
+       efi_status_t(EFIAPI *open_protocol_information)(efi_handle_t handle,
+                       efi_guid_t *protocol,
+                       struct efi_open_protocol_info_entry **entry_buffer,
+                       unsigned long *entry_count);
+       efi_status_t (EFIAPI *protocols_per_handle)(efi_handle_t handle,
+                       efi_guid_t ***protocol_buffer,
+                       unsigned long *protocols_buffer_count);
+       efi_status_t (EFIAPI *locate_handle_buffer) (
+                       enum efi_locate_search_type search_type,
+                       efi_guid_t *protocol, void *search_key,
+                       unsigned long *no_handles, efi_handle_t **buffer);
+       void *locate_protocol;
+       void *install_multiple_protocol_interfaces;

include/efi_api.h new file +19 -0

+struct efi_runtime_services {
+       struct efi_table_hdr hdr;
+       void *get_time;
+       void *set_time;
+       void *get_wakeup_time;
+       void *set_wakeup_time;
+       void *set_virtual_address_map;
+       void *convert_pointer;
+       efi_status_t (EFIAPI *get_variable)(s16 *variable_name,
+                       efi_guid_t *vendor, u32 *attributes,
+                       unsigned long *data_size, void *data);
+       efi_status_t (EFIAPI *get_next_variable)(
+                       unsigned long *variable_name_size,
+                       s16 *variable_name, efi_guid_t *vendor);
+       efi_status_t (EFIAPI *set_variable)(s16 *variable_name,
+                       efi_guid_t *vendor, u32 attributes,
+                       unsigned long data_size, void *data);
+       void *get_next_high_mono_count;
+       void (EFIAPI *reset_system)(enum efi_reset_type reset_type,

include/efi_api.h new file +20 -0

+       u32 fw_revision;
+       unsigned long con_in_handle;
+       struct efi_simple_input_interface *con_in;
+       unsigned long con_out_handle;
+       struct efi_simple_text_output_protocol *con_out;
+       unsigned long stderr_handle;
+       unsigned long std_err;
+       struct efi_runtime_services *runtime;
+       struct efi_boot_services *boottime;
+       unsigned long nr_tables;
+       unsigned long tables;
+};
+
+struct efi_loaded_image {
+       u32 revision;
+       void *parent_handle;
+       struct efi_system_table *system_table;
+       void *device_handle;
+       void *file_path;
+       void *reserved;

include/efi_api.h new file +55 -0

+       u8 type;
+       u8 sub_type;
+       u16 length;
+};
+
+struct simple_text_output_mode {
+       s32 max_mode;
+       s32 mode;
+       s32 attribute;
+       s32 cursor_column;
+       s32 cursor_row;
+       bool cursor_visible;
+};
+
+struct efi_simple_text_output_protocol {
+       void *reset;
+       efi_status_t (EFIAPI *output_string)(
+                       struct efi_simple_text_output_protocol *this,
+                       const unsigned short *str);
+       void *test_string;
+
+       efi_status_t(EFIAPI *query_mode)(
+                       struct efi_simple_text_output_protocol *this,
+                       unsigned long mode_number, unsigned long *columns,
+                       unsigned long *rows);
+       efi_status_t(EFIAPI *set_mode)(
+                       struct efi_simple_text_output_protocol *this,
+                       unsigned long mode_number);
+       efi_status_t(EFIAPI *set_attribute)(
+                       struct efi_simple_text_output_protocol *this,
+                       unsigned long attribute);
+       efi_status_t(EFIAPI *clear_screen) (
+                       struct efi_simple_text_output_protocol *this);
+       efi_status_t(EFIAPI *set_cursor_position) (
+                       struct efi_simple_text_output_protocol *this,
+                       unsigned long column, unsigned long row);
+       efi_status_t(EFIAPI *enable_cursor)(void *, bool enable);
+       struct simple_text_output_mode *mode;
+};
+
+struct efi_input_key {
+       u16 scan_code;
+       s16 unicode_char;
+};
+
+struct efi_simple_input_interface {
+       efi_status_t(EFIAPI *reset)(struct efi_simple_input_interface *this,
+                       bool ExtendedVerification);
+       efi_status_t(EFIAPI *read_key_stroke)(
+                       struct efi_simple_input_interface *this,
+                       struct efi_input_key *key);
+       void *wait_for_key;
+};
+
+#endif

include/part_efi.h +2 -7

index d68ef3b..3012b91 100644
@@ -18,6 +18,8 @@
 #ifndef _DISK_PART_EFI_H
 #define _DISK_PART_EFI_H
 
+#include <efi.h>
+
 #define MSDOS_MBR_SIGNATURE 0xAA55
 #define EFI_PMBR_OSTYPE_EFI 0xEF
 #define EFI_PMBR_OSTYPE_EFI_GPT 0xEE

@@ -29,13 +31,6 @@
 #define GPT_ENTRY_NUMBERS              128
 #define GPT_ENTRY_SIZE                 128
 
-#define EFI_GUID(a,b,c,d0,d1,d2,d3,d4,d5,d6,d7) \
-       ((efi_guid_t) \
-       {{ (a) & 0xff, ((a) >> 8) & 0xff, ((a) >> 16) & 0xff, ((a) >> 24) & 0xff, \
-               (b) & 0xff, ((b) >> 8) & 0xff, \
-               (c) & 0xff, ((c) >> 8) & 0xff, \
-               (d0), (d1), (d2), (d3), (d4), (d5), (d6), (d7) }})
-
 #define PARTITION_SYSTEM_GUID \
        EFI_GUID( 0xC12A7328, 0xF81F, 0x11d2, \
                0xBA, 0x4B, 0x00, 0xA0, 0xC9, 0x3E, 0xC9, 0x3B)

lib/Kconfig +2 -0

index c98d399..4c8d38e 100644
@@ -96,4 +96,6 @@ config ERRNO_STR
          - if errno is null or positive number - a pointer to "Success" message
          - if errno is negative - a pointer to errno related message
 
+source lib/efi/Kconfig
+
 endmenu

lib/Makefile +1 -0

index 97ed398..4821779 100644
@@ -7,6 +7,7 @@
 
 ifndef CONFIG_SPL_BUILD
 
+obj-$(CONFIG_EFI) += efi/
 obj-$(CONFIG_RSA) += rsa/
 obj-$(CONFIG_LZMA) += lzma/
 obj-$(CONFIG_LZO) += lzo/

lib/efi/Kconfig new file +4 -0

new file mode 100644
index 0000000..2b3dbd4
@@ -0,0 +1,33 @@
+config EFI
+       bool "Support running U-Boot from EFI"
+       depends on X86
+       help

lib/efi/Kconfig new file +2 -0

+
+endchoice

lib/efi/Makefile new file +7 -0

new file mode 100644
index 0000000..137d2f9
@@ -0,0 +1,7 @@
+#
+# (C) Copyright 2015 Google, Inc
+#
+# SPDX-License-Identifier:     GPL-2.0+
+#
+
+obj-$(CONFIG_ARCH_EFI) += efi_app.o efi.o

lib/efi/efi.c new file +18 -0

new file mode 100644
index 0000000..acd276c
@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 2015 Google, Inc
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ *
+ * EFI information obtained here:
+ * http://wiki.phoenix.com/wiki/index.php/EFI_BOOT_SERVICES
+ *
+ * Common EFI functions
+ */
+
+#include <common.h>
+#include <debug_uart.h>
+#include <errno.h>
+#include <linux/err.h>
+#include <linux/types.h>
+#include <efi.h>
+#include <efi_api.h>

lib/efi/efi.c new file +63 -0

+
+void efi_putc(struct efi_priv *priv, const char ch)
+{
+       struct efi_simple_text_output_protocol *con = priv->sys_table->con_out;
+       uint16_t ucode[2];
+
+       ucode[0] = ch;
+       ucode[1] = '\0';
+       con->output_string(con, ucode);
+}
+
+void efi_puts(struct efi_priv *priv, const char *str)
+{
+       while (*str)
+               efi_putc(priv, *str++);
+}
+
+int efi_init(struct efi_priv *priv, const char *banner, efi_handle_t image,
+            struct efi_system_table *sys_table)
+{
+       efi_guid_t loaded_image_guid = LOADED_IMAGE_PROTOCOL_GUID;
+       struct efi_boot_services *boot = sys_table->boottime;
+       struct efi_loaded_image *loaded_image;
+       int ret;
+
+       efi_memset(priv, '\0', sizeof(*priv));
+       priv->sys_table = sys_table;
+       priv->boot = sys_table->boottime;
+       priv->parent_image = image;
+       priv->run = sys_table->runtime;
+
+       efi_puts(priv, "U-Boot EFI ");
+       efi_puts(priv, banner);
+       efi_putc(priv, ' ');
+
+       ret = boot->open_protocol(priv->parent_image, &loaded_image_guid,
+                                 (void **)&loaded_image, &priv->parent_image,
+                                 NULL, EFI_OPEN_PROTOCOL_GET_PROTOCOL);
+       if (ret) {
+               efi_puts(priv, "Failed to get loaded image protocol\n");
+               return ret;
+       }
+       priv->image_data_type = loaded_image->image_data_type;
+
+       return 0;
+}
+
+void *efi_malloc(struct efi_priv *priv, int size, efi_status_t *retp)
+{
+       struct efi_boot_services *boot = priv->boot;
+       void *buf = NULL;
+
+       *retp = boot->allocate_pool(priv->image_data_type, size, &buf);
+
+       return buf;
+}
+
+void efi_free(struct efi_priv *priv, void *ptr)
+{
+       struct efi_boot_services *boot = priv->boot;
+
+       boot->free_pool(ptr);
+}

lib/efi/efi_app.c new file +31 -0

new file mode 100644
index 0000000..b71669c
@@ -0,0 +1,125 @@
+/*
+ * Copyright (c) 2015 Google, Inc
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ *
+ * EFI information obtained here:
+ * http://wiki.phoenix.com/wiki/index.php/EFI_BOOT_SERVICES
+ *
+ * This file implements U-Boot running as an EFI application.
+ */
+
+#include <common.h>
+#include <debug_uart.h>
+#include <errno.h>
+#include <linux/err.h>
+#include <linux/types.h>
+#include <efi.h>
+#include <efi_api.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+static struct efi_priv *global_priv;
+
+struct efi_system_table *efi_get_sys_table(void)
+{
+       return global_priv->sys_table;
+}
+
+unsigned long efi_get_ram_base(void)
+{
+       return global_priv->ram_base;