diff options
| author | Tom Rini <trini@konsulko.com> | 2019-01-15 22:05:34 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-01-15 22:05:34 -0500 |
| commit | aac0c29d4b8418c5c78b552070ffeda022b16949 (patch) | |
| tree | 1f539113f2121d84b6f62421a066505d753a2fdc /lib | |
| parent | f4cfd73943032729c9ad6ddd054bcf2ff8205b6d (diff) | |
| parent | f51f6715a5013f37620c38f0430e21d4736e235a (diff) | |
Merge tag 'dm-pull-15jan19' of git://git.denx.de/u-boot-dm
Fix recent changes to serial API for driver model
Buildman clang support and a few fixes
Small fixes to 'dm tree' and regmap test
Improve sandbox build compatibility
A few other minor fixes
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/efi_loader/efi_file.c | 4 | ||||
| -rw-r--r-- | lib/fdtdec.c | 10 |
2 files changed, 2 insertions, 12 deletions
diff --git a/lib/efi_loader/efi_file.c b/lib/efi_loader/efi_file.c index 128cb0a627..8a4f3a9f40 100644 --- a/lib/efi_loader/efi_file.c +++ b/lib/efi_loader/efi_file.c @@ -221,8 +221,8 @@ static efi_status_t EFIAPI efi_file_open(struct efi_file_handle *file, struct file_handle *fh = to_fh(file); efi_status_t ret; - EFI_ENTRY("%p, %p, \"%ls\", %llx, %llu", file, new_handle, file_name, - open_mode, attributes); + EFI_ENTRY("%p, %p, \"%ls\", %llx, %llu", file, new_handle, + (wchar_t *)file_name, open_mode, attributes); /* Check parameters */ if (!file || !new_handle || !file_name) { diff --git a/lib/fdtdec.c b/lib/fdtdec.c index 6f8ec0dbed..18663ce6bd 100644 --- a/lib/fdtdec.c +++ b/lib/fdtdec.c @@ -95,16 +95,6 @@ fdt_addr_t fdtdec_get_addr_size_fixed(const void *blob, int node, debug("%s: %s: ", __func__, prop_name); - if (na > (sizeof(fdt_addr_t) / sizeof(fdt32_t))) { - debug("(na too large for fdt_addr_t type)\n"); - return FDT_ADDR_T_NONE; - } - - if (ns > (sizeof(fdt_size_t) / sizeof(fdt32_t))) { - debug("(ns too large for fdt_size_t type)\n"); - return FDT_ADDR_T_NONE; - } - prop = fdt_getprop(blob, node, prop_name, &len); if (!prop) { debug("(not found)\n"); |