diff options
| author | Bastien Roucariès <rouca@debian.org> | 2024-05-06 19:17:23 +0000 |
|---|---|---|
| committer | Bastien Roucariès <rouca@debian.org> | 2024-05-06 19:17:23 +0000 |
| commit | 0d1d760b90dfe26145b7c4e4cd0de55117bcdbbb (patch) | |
| tree | a66ff512cd9be70de19d8983a2a04b9a1d03da6b /lib | |
| parent | ee3097c3f96727fdb41e36d93b6c957d281da97e (diff) | |
| parent | a075e58606b9affb6dfb176c71caab816737a981 (diff) | |
| download | efi-boot-shim-0d1d760b90dfe26145b7c4e4cd0de55117bcdbbb.tar.gz efi-boot-shim-0d1d760b90dfe26145b7c4e4cd0de55117bcdbbb.zip | |
Merge tag 'upstream/15.8' into buster/updates
Upstream version 15.8
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/console.c | 6 | ||||
| -rw-r--r-- | lib/guid.c | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/lib/console.c b/lib/console.c index 6bbb8a7c..a751f79d 100644 --- a/lib/console.c +++ b/lib/console.c @@ -743,11 +743,13 @@ setup_verbosity(VOID) setup_console(-1); } +#ifndef SHIM_UNIT_TEST VOID -msleep(unsigned long msecs) +usleep(unsigned long usecs) { - BS->Stall(msecs); + BS->Stall(usecs); } +#endif /* This is used in various things to determine if we should print to the * console */ @@ -36,3 +36,4 @@ EFI_GUID SECURITY2_PROTOCOL_GUID = { 0x94ab2f58, 0x1438, 0x4ef1, {0x91, 0x52, 0x EFI_GUID EFI_MEMORY_ATTRIBUTE_PROTOCOL_GUID = { 0xf4560cf6, 0x40ec, 0x4b4a, {0xa1, 0x92, 0xbf, 0x1d, 0x57, 0xd0, 0xb1, 0x89} }; EFI_GUID SHIM_LOCK_GUID = {0x605dab50, 0xe046, 0x4300, {0xab, 0xb6, 0x3d, 0xd8, 0x10, 0xdd, 0x8b, 0x23 } }; EFI_GUID MOK_VARIABLE_STORE = {0xc451ed2b, 0x9694, 0x45d3, {0xba, 0xba, 0xed, 0x9f, 0x89, 0x88, 0xa3, 0x89} }; +EFI_GUID SECUREBOOT_EFI_NAMESPACE_GUID = {0x77fa9abd, 0x0359, 0x4d32, {0xbd, 0x60, 0x28, 0xf4, 0xe7, 0x8f, 0x78, 0x4b} }; |