diff options
| author | Tom Rini <trini@konsulko.com> | 2018-08-30 10:06:11 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-08-30 10:06:11 -0400 |
| commit | 284d201b4d9c17bc92044f825ce44550d66841cd (patch) | |
| tree | faf0b2bf48357077da5c5cd3cde2b66d7ea508da /include | |
| parent | 11ed312896c5f5814064c5d45dcb2f53dc121437 (diff) | |
| parent | e69cc6bc42c37598e2fdda421360be6cbc0470fd (diff) | |
| download | u-boot-284d201b4d9c17bc92044f825ce44550d66841cd.tar.gz u-boot-284d201b4d9c17bc92044f825ce44550d66841cd.tar.xz u-boot-284d201b4d9c17bc92044f825ce44550d66841cd.zip | |
Merge git://git.denx.de/u-boot-x86
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/x86-common.h | 2 | ||||
| -rw-r--r-- | include/efi.h | 13 |
2 files changed, 14 insertions, 1 deletions
diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index cc621cb942..f0b027e69c 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -107,7 +107,7 @@ #define CONFIG_BOOTFILE "bzImage" #define CONFIG_LOADADDR 0x1000000 #define CONFIG_RAMDISK_ADDR 0x4000000 -#ifdef CONFIG_GENERATE_ACPI_TABLE +#if defined(CONFIG_GENERATE_ACPI_TABLE) || defined(CONFIG_EFI_STUB) #define CONFIG_OTHBOOTARGS "othbootargs=\0" #else #define CONFIG_OTHBOOTARGS "othbootargs=acpi=off\0" diff --git a/include/efi.h b/include/efi.h index 7e7c1cafc2..e1854ecd23 100644 --- a/include/efi.h +++ b/include/efi.h @@ -41,6 +41,9 @@ #define efi_va_end va_end #endif /* __x86_64__ */ +#define EFI32_LOADER_SIGNATURE "EL32" +#define EFI64_LOADER_SIGNATURE "EL64" + struct efi_device_path; typedef struct { @@ -248,6 +251,7 @@ enum efi_entry_t { EFIET_END, /* Signals this is the last (empty) entry */ EFIET_MEMORY_MAP, EFIET_GOP_MODE, + EFIET_SYS_TABLE, /* Number of entries */ EFIET_MEMORY_COUNT, @@ -338,6 +342,15 @@ struct efi_entry_gopmode { } info[]; }; +/** + * struct efi_entry_systable - system table passed to U-Boot + * + * @sys_table: EFI system table address + */ +struct efi_entry_systable { + efi_physical_addr_t sys_table; +}; + static inline struct efi_mem_desc *efi_get_next_mem_desc( struct efi_entry_memmap *map, struct efi_mem_desc *desc) { |