|
@@ -165,7 +165,7 @@ int acpi_add_table(struct acpi_ctx *ctx, void *table)
|
|
|
* And now the same thing for the XSDT. We use the same index as for
|
|
|
* now we want the XSDT and RSDT to always be in sync in U-Boot
|
|
|
*/
|
|
|
- xsdt = map_sysmem(ctx->rsdp->xsdt_address, sizeof(*xsdt));
|
|
|
+ xsdt = ctx->xsdt;
|
|
|
|
|
|
/* Add table to the XSDT */
|
|
|
xsdt->entry[i] = map_to_sysmem(table);
|
|
@@ -236,8 +236,6 @@ static void acpi_write_xsdt(struct acpi_xsdt *xsdt)
|
|
|
|
|
|
void acpi_setup_base_tables(struct acpi_ctx *ctx, void *start)
|
|
|
{
|
|
|
- struct acpi_xsdt *xsdt;
|
|
|
-
|
|
|
ctx->current = start;
|
|
|
|
|
|
/* Align ACPI tables to 16 byte */
|
|
@@ -248,15 +246,15 @@ void acpi_setup_base_tables(struct acpi_ctx *ctx, void *start)
|
|
|
acpi_inc_align(ctx, sizeof(struct acpi_rsdp));
|
|
|
ctx->rsdt = ctx->current;
|
|
|
acpi_inc_align(ctx, sizeof(struct acpi_rsdt));
|
|
|
- xsdt = ctx->current;
|
|
|
+ ctx->xsdt = ctx->current;
|
|
|
acpi_inc_align(ctx, sizeof(struct acpi_xsdt));
|
|
|
|
|
|
/* clear all table memory */
|
|
|
memset((void *)start, '\0', ctx->current - start);
|
|
|
|
|
|
- acpi_write_rsdp(ctx->rsdp, ctx->rsdt, xsdt);
|
|
|
+ acpi_write_rsdp(ctx->rsdp, ctx->rsdt, ctx->xsdt);
|
|
|
acpi_write_rsdt(ctx->rsdt);
|
|
|
- acpi_write_xsdt(xsdt);
|
|
|
+ acpi_write_xsdt(ctx->xsdt);
|
|
|
/*
|
|
|
* Per ACPI spec, the FACS table address must be aligned to a 64 byte
|
|
|
* boundary (Windows checks this, but Linux does not).
|