diff options
| author | Tom Rini <trini@konsulko.com> | 2020-08-15 09:01:01 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-08-15 09:01:01 -0400 |
| commit | 789bfb52668ee609b2043de645e2f94bbd24fd1f (patch) | |
| tree | 168ecaa3ef75f85141d3586b2447c6a8f3a7af32 /include | |
| parent | c0192950dfcd82035a928de32c24335f3d2c0f7a (diff) | |
| parent | a4bda5ebab8246004caaca2e17bc865d265bf57a (diff) | |
Merge tag 'efi-2020-10-rc3-2' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi
Pull request for UEFI sub-system for efi-2020-10-rc3 (2)
This series includes bug fixes for:
* UEFI secure boot - images with multiple signatures
* UEFI secure boot - support for intermediate certificates
* corrections for UEFI unit tests
* missing loadaddr on MAIX board
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/sipeed-maix.h | 9 | ||||
| -rw-r--r-- | include/efi_loader.h | 17 |
2 files changed, 19 insertions, 7 deletions
diff --git a/include/configs/sipeed-maix.h b/include/configs/sipeed-maix.h index a46473fc78..36ff522e4b 100644 --- a/include/configs/sipeed-maix.h +++ b/include/configs/sipeed-maix.h @@ -21,4 +21,13 @@ /* For early init */ #define K210_SYSCTL_BASE 0x50440000 +#ifndef CONFIG_EXTRA_ENV_SETTINGS +#define CONFIG_EXTRA_ENV_SETTINGS \ + "loadaddr=0x80060000\0" \ + "fdt_addr_r=0x80028000\0" \ + "scriptaddr=0x80020000\0" \ + "kernel_addr_r=0x80060000\0" \ + "fdtfile=kendryte/" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" +#endif + #endif /* CONFIGS_SIPEED_MAIX_H */ diff --git a/include/efi_loader.h b/include/efi_loader.h index 7f0ab1be56..50a17a33ca 100644 --- a/include/efi_loader.h +++ b/include/efi_loader.h @@ -773,13 +773,16 @@ struct pkcs7_message; bool efi_signature_lookup_digest(struct efi_image_regions *regs, struct efi_signature_store *db); -bool efi_signature_verify_one(struct efi_image_regions *regs, - struct pkcs7_message *msg, - struct efi_signature_store *db); -bool efi_signature_verify_with_sigdb(struct efi_image_regions *regs, - struct pkcs7_message *msg, - struct efi_signature_store *db, - struct efi_signature_store *dbx); +bool efi_signature_verify(struct efi_image_regions *regs, + struct pkcs7_message *msg, + struct efi_signature_store *db, + struct efi_signature_store *dbx); +static inline bool efi_signature_verify_one(struct efi_image_regions *regs, + struct pkcs7_message *msg, + struct efi_signature_store *db) +{ + return efi_signature_verify(regs, msg, db, NULL); +} bool efi_signature_check_signers(struct pkcs7_message *msg, struct efi_signature_store *dbx); |