aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2021-07-24 16:41:25 -0400
committerTom Rini <trini@konsulko.com>2021-07-24 16:41:25 -0400
commitec22c365e3d21c8a5c20413d537042527b33a6cf (patch)
tree06a613b648aafcc6b35e195cab65f366b6f38e7f /arch
parent7d4ce5ea53bdf4be8a951154c65ceef4b389fea7 (diff)
parentd75f48a83dc4998a49a4c35e80a9eab91566df30 (diff)
downloadu-boot-ec22c365e3d21c8a5c20413d537042527b33a6cf.zip
u-boot-ec22c365e3d21c8a5c20413d537042527b33a6cf.tar.gz
u-boot-ec22c365e3d21c8a5c20413d537042527b33a6cf.tar.bz2
Merge tag 'efi-2021-10-rc1-3' of https://source.denx.de/u-boot/custodians/u-boot-efiWIP/24Jul2021
Pull request for efi-2021-10-rc1-3 Documentation: provide Makefile documentation SMBIOS: generate BIOS release date based on UEFI version improve error handling in SMBIOS table generation UEFI: correct handling of signed capsule if authentication if off
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/lib/tables.c13
1 files changed, 11 insertions, 2 deletions
diff --git a/arch/x86/lib/tables.c b/arch/x86/lib/tables.c
index 1779bb3..ea834a5 100644
--- a/arch/x86/lib/tables.c
+++ b/arch/x86/lib/tables.c
@@ -3,6 +3,8 @@
* Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com>
*/
+#define LOG_CATEGORY LOGC_BOARD
+
#include <common.h>
#include <bloblist.h>
#include <log.h>
@@ -96,13 +98,20 @@ int write_tables(void)
return log_msg_ret("bloblist", -ENOBUFS);
}
rom_table_end = table->write(rom_table_start);
- rom_table_end = ALIGN(rom_table_end, ROM_TABLE_ALIGN);
+ if (!rom_table_end) {
+ log_err("Can't create configuration table %d\n", i);
+ return -EINTR;
+ }
if (IS_ENABLED(CONFIG_SEABIOS)) {
table_size = rom_table_end - rom_table_start;
high_table = (u32)(ulong)high_table_malloc(table_size);
if (high_table) {
- table->write(high_table);
+ if (!table->write(high_table)) {
+ log_err("Can't create configuration table %d\n",
+ i);
+ return -EINTR;
+ }
cfg_tables[i].start = high_table;
cfg_tables[i].size = table_size;