x86: acpi: Split out context creation from base tables

[thirdparty/u-boot.git] / arch / x86 / lib / acpi_table.c

diff --git a/arch/x86/lib/acpi_table.c b/arch/x86/lib/acpi_table.c
index 3f847711e2be8d58e0e94449b7739ed13b1e8eb7..f57323b5c3fa7b5b4b4ea995c0c9bc7b30be5e86 100644 (file)
--- a/arch/x86/lib/acpi_table.c
+++ b/arch/x86/lib/acpi_table.c
@@ -522,17 +522,17 @@ ulong write_acpi_tables(ulong start_addr)
        int ret;
        int i;
 
-       ctx = calloc(1, sizeof(*ctx));
+       ctx = malloc(sizeof(*ctx));
        if (!ctx)
                return log_msg_ret("mem", -ENOMEM);
-       gd->acpi_ctx = ctx;
 
        start = map_sysmem(start_addr, 0);
 
        debug("ACPI: Writing ACPI tables at %lx\n", start_addr);
 
        acpi_reset_items();
-       acpi_setup_base_tables(ctx, start);
+       acpi_setup_ctx(ctx, start);
+       acpi_setup_base_tables(ctx);
 
        debug("ACPI:    * FACS\n");
        facs = ctx->current;