Merge git://git.denx.de/u-boot-x86
diff --git a/arch/x86/cpu/efi/payload.c b/arch/x86/cpu/efi/payload.c
index 4649bfe..c323c7b 100644
--- a/arch/x86/cpu/efi/payload.c
+++ b/arch/x86/cpu/efi/payload.c
@@ -8,6 +8,8 @@
#include <efi.h>
#include <errno.h>
#include <usb.h>
+#include <asm/bootparam.h>
+#include <asm/e820.h>
#include <asm/post.h>
DECLARE_GLOBAL_DATA_PTR;
@@ -168,3 +170,120 @@
return 0;
}
+
+unsigned int install_e820_map(unsigned int max_entries,
+ struct e820_entry *entries)
+{
+ struct efi_mem_desc *desc, *end;
+ struct efi_entry_memmap *map;
+ int size, ret;
+ efi_physical_addr_t last_end_addr = 0;
+ struct e820_entry *last_entry = NULL;
+ __u32 e820_type;
+ unsigned int num_entries = 0;
+
+ ret = efi_info_get(EFIET_MEMORY_MAP, (void **)&map, &size);
+ if (ret) {
+ printf("Cannot find EFI memory map tables, ret=%d\n", ret);
+
+ return -ENODEV;
+ }
+
+ end = (struct efi_mem_desc *)((ulong)map + size);
+ for (desc = map->desc; desc < end;
+ desc = efi_get_next_mem_desc(map, desc)) {
+ if (desc->num_pages == 0)
+ continue;
+
+ switch (desc->type) {
+ case EFI_LOADER_CODE:
+ case EFI_LOADER_DATA:
+ case EFI_BOOT_SERVICES_CODE:
+ case EFI_BOOT_SERVICES_DATA:
+ case EFI_CONVENTIONAL_MEMORY:
+ e820_type = E820_RAM;
+ break;
+
+ case EFI_RESERVED_MEMORY_TYPE:
+ case EFI_RUNTIME_SERVICES_CODE:
+ case EFI_RUNTIME_SERVICES_DATA:
+ case EFI_MMAP_IO:
+ case EFI_MMAP_IO_PORT:
+ case EFI_PAL_CODE:
+ e820_type = E820_RESERVED;
+ break;
+
+ case EFI_ACPI_RECLAIM_MEMORY:
+ e820_type = E820_ACPI;
+ break;
+
+ case EFI_ACPI_MEMORY_NVS:
+ e820_type = E820_NVS;
+ break;
+
+ case EFI_UNUSABLE_MEMORY:
+ e820_type = E820_UNUSABLE;
+ break;
+
+ default:
+ printf("Invalid EFI memory descriptor type (0x%x)!\n",
+ desc->type);
+ continue;
+ }
+
+ if (last_entry != NULL && last_entry->type == e820_type &&
+ desc->physical_start == last_end_addr) {
+ last_entry->size += (desc->num_pages << EFI_PAGE_SHIFT);
+ last_end_addr += (desc->num_pages << EFI_PAGE_SHIFT);
+ } else {
+ if (num_entries >= E820MAX)
+ break;
+
+ entries[num_entries].addr = desc->physical_start;
+ entries[num_entries].size = desc->num_pages;
+ entries[num_entries].size <<= EFI_PAGE_SHIFT;
+ entries[num_entries].type = e820_type;
+ last_entry = &entries[num_entries];
+ last_end_addr = last_entry->addr + last_entry->size;
+ num_entries++;
+ }
+ }
+
+ return num_entries;
+}
+
+void setup_efi_info(struct efi_info *efi_info)
+{
+ struct efi_entry_systable *table;
+ struct efi_entry_memmap *map;
+ char *signature;
+ int size, ret;
+
+ memset(efi_info, 0, sizeof(struct efi_info));
+
+ ret = efi_info_get(EFIET_SYS_TABLE, (void **)&table, &size);
+ if (ret) {
+ printf("Cannot find EFI system table, ret=%d\n", ret);
+ return;
+ }
+ efi_info->efi_systab = (u32)(table->sys_table);
+
+ ret = efi_info_get(EFIET_MEMORY_MAP, (void **)&map, &size);
+ if (ret) {
+ printf("Cannot find EFI memory map tables, ret=%d\n", ret);
+ return;
+ }
+ efi_info->efi_memdesc_size = map->desc_size;
+ efi_info->efi_memdesc_version = map->version;
+ efi_info->efi_memmap = (u32)(map->desc);
+ efi_info->efi_memmap_size = size - sizeof(struct efi_entry_memmap);
+
+#ifdef CONFIG_EFI_STUB_64BIT
+ efi_info->efi_systab_hi = table->sys_table >> 32;
+ efi_info->efi_memmap_hi = (u64)(u32)(map->desc) >> 32;
+ signature = EFI64_LOADER_SIGNATURE;
+#else
+ signature = EFI32_LOADER_SIGNATURE;
+#endif
+ memcpy(&efi_info->efi_loader_signature, signature, 4);
+}
diff --git a/arch/x86/include/asm/bootparam.h b/arch/x86/include/asm/bootparam.h
index 0386cbe..dfbd4b4 100644
--- a/arch/x86/include/asm/bootparam.h
+++ b/arch/x86/include/asm/bootparam.h
@@ -69,7 +69,6 @@
__u64 pref_address;
__u32 init_size;
__u32 handover_offset;
- __u64 acpi_rsdp_addr;
} __attribute__((packed));
struct sys_desc_table {
diff --git a/arch/x86/include/asm/zimage.h b/arch/x86/include/asm/zimage.h
index 03bed54..80e128c 100644
--- a/arch/x86/include/asm/zimage.h
+++ b/arch/x86/include/asm/zimage.h
@@ -35,5 +35,6 @@
int setup_zimage(struct boot_params *setup_base, char *cmd_line, int auto_boot,
unsigned long initrd_addr, unsigned long initrd_size);
void setup_video(struct screen_info *screen_info);
+void setup_efi_info(struct efi_info *efi_info);
#endif
diff --git a/arch/x86/lib/zimage.c b/arch/x86/lib/zimage.c
index 04ed972..230b38e 100644
--- a/arch/x86/lib/zimage.c
+++ b/arch/x86/lib/zimage.c
@@ -287,14 +287,13 @@
hdr->hardware_subarch = X86_SUBARCH_INTEL_MID;
#endif
-#ifdef CONFIG_GENERATE_ACPI_TABLE
- if (bootproto >= 0x020e)
- hdr->acpi_rsdp_addr = acpi_get_rsdp_addr();
-#endif
-
setup_device_tree(hdr, (const void *)env_get_hex("fdtaddr", 0));
setup_video(&setup_base->screen_info);
+#ifdef CONFIG_EFI_STUB
+ setup_efi_info(&setup_base->efi_info);
+#endif
+
return 0;
}
diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h
index cc621cb..f0b027e 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 7e7c1ca..e1854ec 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 @@
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 @@
} 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)
{
diff --git a/lib/efi/efi_stub.c b/lib/efi/efi_stub.c
index 1b495ec..12e3d63 100644
--- a/lib/efi/efi_stub.c
+++ b/lib/efi/efi_stub.c
@@ -277,6 +277,7 @@
struct efi_entry_memmap map;
struct efi_gop *gop;
struct efi_entry_gopmode mode;
+ struct efi_entry_systable table;
efi_guid_t efi_gop_guid = EFI_GOP_GUID;
efi_uintn_t key, desc_size, size;
efi_status_t ret;
@@ -335,6 +336,9 @@
return ret;
}
+ table.sys_table = (ulong)sys_table;
+ add_entry_addr(priv, EFIET_SYS_TABLE, &table, sizeof(table), NULL, 0);
+
ret = boot->exit_boot_services(image, key);
if (ret) {
/*