diff options
| author | Tom Rini <trini@konsulko.com> | 2023-05-11 08:40:33 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-05-11 08:40:33 -0400 |
| commit | e94fbdd2729fdcd570035d43f67adda8e0dfc115 (patch) | |
| tree | fc4d5d6f989618994e0af5bb61f9918e4c8a7478 /include | |
| parent | 0a9a4384c1483a88776bca38e28f09be51161034 (diff) | |
| parent | b982f89c583c6c03f4d1f94d29991ccf691a0f7c (diff) | |
| download | u-boot-e94fbdd2729fdcd570035d43f67adda8e0dfc115.tar.gz | |
Merge https://source.denx.de/u-boot/custodians/u-boot-x86
- Various fixes for Google chromebooks
- Various minor enhancements for coreboot
Diffstat (limited to 'include')
| -rw-r--r-- | include/acpi/acpi_table.h | 8 | ||||
| -rw-r--r-- | include/asm-generic/global_data.h | 4 | ||||
| -rw-r--r-- | include/event.h | 2 |
3 files changed, 11 insertions, 3 deletions
diff --git a/include/acpi/acpi_table.h b/include/acpi/acpi_table.h index 4030d25c66..7ed0443c82 100644 --- a/include/acpi/acpi_table.h +++ b/include/acpi/acpi_table.h @@ -923,6 +923,14 @@ int acpi_fill_csrt(struct acpi_ctx *ctx); */ ulong write_acpi_tables(ulong start); +/** + * acpi_find_table() - Look up an ACPI table + * + * @sig: Signature of table (4 characters, upper case) + * Return: pointer to table header, or NULL if not found + */ +struct acpi_table_header *acpi_find_table(const char *sig); + #endif /* !__ACPI__*/ #include <asm/acpi_table.h> diff --git a/include/asm-generic/global_data.h b/include/asm-generic/global_data.h index 65bf8df1e5..a1e1b9d640 100644 --- a/include/asm-generic/global_data.h +++ b/include/asm-generic/global_data.h @@ -457,7 +457,7 @@ struct global_data { */ fdt_addr_t translation_offset; #endif -#ifdef CONFIG_GENERATE_ACPI_TABLE +#ifdef CONFIG_ACPI /** * @acpi_ctx: ACPI context pointer */ @@ -536,7 +536,7 @@ static_assert(sizeof(struct global_data) == GD_SIZE); #define gd_dm_priv_base() NULL #endif -#ifdef CONFIG_GENERATE_ACPI_TABLE +#ifdef CONFIG_ACPI #define gd_acpi_ctx() gd->acpi_ctx #define gd_acpi_start() gd->acpi_start #define gd_set_acpi_start(addr) gd->acpi_start = addr diff --git a/include/event.h b/include/event.h index e4580b6835..fe41080fa6 100644 --- a/include/event.h +++ b/include/event.h @@ -22,7 +22,7 @@ enum event_t { EVT_TEST, /* Events related to driver model */ - EVT_DM_POST_INIT, + EVT_DM_POST_INIT_F, EVT_DM_PRE_PROBE, EVT_DM_POST_PROBE, EVT_DM_PRE_REMOVE, |