sf: bar: Clean BA24 Bank Address Register bit after read/write/erase operation

[people/ms/u-boot.git] / cmd / bootefi.c

diff --git a/cmd/bootefi.c b/cmd/bootefi.c
index b6dedec463b0f5b0412861682cca8a1e2bad2cb8..3196d86040729487186c241e9b7c36d597bbb6f2 100644 (file)
--- a/cmd/bootefi.c
+++ b/cmd/bootefi.c
@@ -20,6 +20,8 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
+static uint8_t efi_obj_list_initalized;
+
 /*
  * When booting using the "bootefi" command, we don't know which
  * physical device the file came from. So we create a pseudo-device
@@ -104,6 +106,38 @@ static struct efi_object bootefi_device_obj = {
        },
 };
 
+/* Initialize and populate EFI object list */
+static void efi_init_obj_list(void)
+{
+       efi_obj_list_initalized = 1;
+
+       list_add_tail(&loaded_image_info_obj.link, &efi_obj_list);
+       list_add_tail(&bootefi_device_obj.link, &efi_obj_list);
+       efi_console_register();
+#ifdef CONFIG_PARTITIONS
+       efi_disk_register();
+#endif
+#if defined(CONFIG_LCD) || defined(CONFIG_DM_VIDEO)
+       efi_gop_register();
+#endif
+#ifdef CONFIG_NET
+       void *nethandle = loaded_image_info.device_handle;
+       efi_net_register(&nethandle);
+
+       if (!memcmp(bootefi_device_path[0].str, "N\0e\0t", 6))
+               loaded_image_info.device_handle = nethandle;
+       else
+               loaded_image_info.device_handle = bootefi_device_path;
+#endif
+#ifdef CONFIG_GENERATE_SMBIOS_TABLE
+       efi_smbios_register();
+#endif
+
+       /* Initialize EFI runtime services */
+       efi_reset_system_init();
+       efi_get_time_init();
+}
+
 static void *copy_fdt(void *fdt)
 {
        u64 fdt_size = fdt_totalsize(fdt);
@@ -124,7 +158,7 @@ static void *copy_fdt(void *fdt)
        }
 
        /* Give us at least 4kb breathing room */
-       fdt_size = ALIGN(fdt_size + 4096, 4096);
+       fdt_size = ALIGN(fdt_size + 4096, EFI_PAGE_SIZE);
        fdt_pages = fdt_size >> EFI_PAGE_SHIFT;
 
        /* Safe fdt location is at 128MB */
@@ -132,7 +166,7 @@ static void *copy_fdt(void *fdt)
        if (efi_allocate_pages(1, EFI_BOOT_SERVICES_DATA, fdt_pages,
                               &new_fdt_addr) != EFI_SUCCESS) {
                /* If we can't put it there, put it somewhere */
-               new_fdt_addr = (ulong)memalign(4096, fdt_size);
+               new_fdt_addr = (ulong)memalign(EFI_PAGE_SIZE, fdt_size);
                if (efi_allocate_pages(1, EFI_BOOT_SERVICES_DATA, fdt_pages,
                                       &new_fdt_addr) != EFI_SUCCESS) {
                        printf("ERROR: Failed to reserve space for FDT\n");
@@ -181,6 +215,7 @@ static unsigned long do_bootefi_exec(void *efi, void *fdt)
        ulong (*entry)(void *image_handle, struct efi_system_table *st)
                asmlinkage;
        ulong fdt_pages, fdt_size, fdt_start, fdt_end;
+       const efi_guid_t fdt_guid = EFI_FDT_GUID;
        bootm_headers_t img = { 0 };
 
        /*
@@ -199,9 +234,7 @@ static unsigned long do_bootefi_exec(void *efi, void *fdt)
                }
 
                /* Link to it in the efi tables */
-               systab.tables[0].guid = EFI_FDT_GUID;
-               systab.tables[0].table = fdt;
-               systab.nr_tables = 1;
+               efi_install_configuration_table(&fdt_guid, fdt);
 
                /* And reserve the space in the memory map */
                fdt_start = ((ulong)fdt) & ~EFI_PAGE_MASK;
@@ -214,7 +247,7 @@ static unsigned long do_bootefi_exec(void *efi, void *fdt)
                                   EFI_BOOT_SERVICES_DATA, true);
        } else {
                printf("WARNING: Invalid device tree, expect boot to fail\n");
-               systab.nr_tables = 0;
+               efi_install_configuration_table(&fdt_guid, NULL);
        }
 
        /* Load the EFI payload */
@@ -223,32 +256,8 @@ static unsigned long do_bootefi_exec(void *efi, void *fdt)
                return -ENOENT;
 
        /* Initialize and populate EFI object list */
-       INIT_LIST_HEAD(&efi_obj_list);
-       list_add_tail(&loaded_image_info_obj.link, &efi_obj_list);
-       list_add_tail(&bootefi_device_obj.link, &efi_obj_list);
-       efi_console_register();
-#ifdef CONFIG_PARTITIONS
-       efi_disk_register();
-#endif
-#if defined(CONFIG_LCD) || defined(CONFIG_DM_VIDEO)
-       efi_gop_register();
-#endif
-#ifdef CONFIG_NET
-       void *nethandle = loaded_image_info.device_handle;
-       efi_net_register(&nethandle);
-
-       if (!memcmp(bootefi_device_path[0].str, "N\0e\0t", 6))
-               loaded_image_info.device_handle = nethandle;
-       else
-               loaded_image_info.device_handle = bootefi_device_path;
-#endif
-#ifdef CONFIG_GENERATE_SMBIOS_TABLE
-       efi_smbios_register();
-#endif
-
-       /* Initialize EFI runtime services */
-       efi_reset_system_init();
-       efi_get_time_init();
+       if (!efi_obj_list_initalized)
+               efi_init_obj_list();
 
        /* Call our payload! */
        debug("%s:%d Jumping to 0x%lx\n", __func__, __LINE__, (long)entry);