summaryrefslogtreecommitdiff
path: root/lib/charset.c
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2020-11-29 11:12:49 -0500
committerTom Rini <trini@konsulko.com>2020-11-29 11:12:49 -0500
commitfc4c2f7f85165c5e0f72ce79849b4deb54a48ab3 (patch)
tree279ff534cc40970c4a523bdae36780558207135f /lib/charset.c
parentf6cf78dc6a83dcbc6e68655088e041a12ae253d5 (diff)
parent6974a4a37348ba272e53dd33effcc0db9e144c59 (diff)
Merge tag 'efi-2021-01-rc3-3' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi
Pull request for UEFI sub-system for efi-2021-01-rc3 (3) The following errors are corrected: * Linux crash when accessing UEFI variables at runtime. * UEFI variable using standalone MM on 32 bit systems not working due to missing packing of communication structure * NULL dereference when FAT16 root directory is full * FAT files with a short file name starting with 0xE5 (0x05 in directory entry) where treated as deleted. The UEFI SetTime() service is enabled on ARM QEMU.
Diffstat (limited to 'lib/charset.c')
-rw-r--r--lib/charset.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/charset.c b/lib/charset.c
index 5686d6fb59c..2177014ee1c 100644
--- a/lib/charset.c
+++ b/lib/charset.c
@@ -8,6 +8,7 @@
#include <common.h>
#include <charset.h>
#include <capitalization.h>
+#include <efi_loader.h>
#include <malloc.h>
static struct capitalization_table capitalization_table[] =
@@ -372,7 +373,7 @@ size_t u16_strlen(const void *in)
return ret;
}
-size_t u16_strnlen(const u16 *in, size_t count)
+size_t __efi_runtime u16_strnlen(const u16 *in, size_t count)
{
size_t i;
for (i = 0; count-- && in[i]; i++);