diff options
| author | Tom Rini <trini@konsulko.com> | 2024-04-20 08:19:20 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-04-20 08:19:20 -0600 |
| commit | b064bb66a10c850e231c7a124b90c8a26f99bd88 (patch) | |
| tree | 05e88b4e7c30aba16e152762a23f1aa802ed604a /arch/x86/lib | |
| parent | af04f37a78c7e61597fb9ed6db2c8f8d7f8b0f92 (diff) | |
| parent | 52c62acc349a0ec1ba26ae497913ad34ee3de733 (diff) | |
Merge tag 'efi-2024-07-rc1-3' of https://source.denx.de/u-boot/custodians/u-boot-efi
Pull request efi-2024-07-rc1-3
Documentation:
* sort env sub-commands alphabetically
* update list of aliases for the env command
UEFI:
* allow enabling SetVariable at runtime
for future OS supported writing to ubootefi.var
* use event callback for initrd deregistration
Others:
* correct alignment of x86 firmware tables
Diffstat (limited to 'arch/x86/lib')
| -rw-r--r-- | arch/x86/lib/tables.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/lib/tables.c b/arch/x86/lib/tables.c index 12eae17c396..1095dc92c5a 100644 --- a/arch/x86/lib/tables.c +++ b/arch/x86/lib/tables.c @@ -98,6 +98,8 @@ int write_tables(void) int size = table->size ? : CONFIG_ROM_TABLE_SIZE; u32 rom_table_end; + rom_addr = ALIGN(rom_addr, 16); + if (!strcmp("smbios", table->name)) gd->arch.smbios_start = rom_addr; |