diff options
| author | Tom Rini <[email protected]> | 2022-11-22 22:14:06 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2022-11-22 22:14:06 -0500 |
| commit | 19fb8d7945fcd83828986ac48db74560b26611f9 (patch) | |
| tree | d65ad8a81d6e62d2786e40186769b48d07280303 /include | |
| parent | 521277ec15eb794229403ec24b8c00a4ff02b0b6 (diff) | |
| parent | b4574c0e750bee39cc2448952f127040a37a8e0b (diff) | |
Merge tag 'dm-pull-22nov22' of https://source.denx.de/u-boot/custodians/u-boot-dm
buildman /binman improvements for handling missing blobs
fix for long-standing image.h warning
minor fixes
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/sandbox.h | 13 | ||||
| -rw-r--r-- | include/image.h | 8 |
2 files changed, 7 insertions, 14 deletions
diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index 5168e2fa353..0dcb2ebc316 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -10,19 +10,6 @@ #define CONFIG_MALLOC_F_ADDR 0x0010000 -/* GUIDs for capsule updatable firmware images */ -#define SANDBOX_UBOOT_IMAGE_GUID \ - EFI_GUID(0x09d7cf52, 0x0720, 0x4710, 0x91, 0xd1, \ - 0x08, 0x46, 0x9b, 0x7f, 0xe9, 0xc8) - -#define SANDBOX_UBOOT_ENV_IMAGE_GUID \ - EFI_GUID(0x5a7021f5, 0xfef2, 0x48b4, 0xaa, 0xba, \ - 0x83, 0x2e, 0x77, 0x74, 0x18, 0xc0) - -#define SANDBOX_FIT_IMAGE_GUID \ - EFI_GUID(0x3673b45d, 0x6a7c, 0x46f3, 0x9e, 0x60, \ - 0xad, 0xab, 0xb0, 0x3f, 0x79, 0x37) - /* Size of our emulated memory */ #define SB_CONCAT(x, y) x ## y #define SB_TO_UL(s) SB_CONCAT(s, UL) diff --git a/include/image.h b/include/image.h index 65d0d4f4387..6f21dafba8c 100644 --- a/include/image.h +++ b/include/image.h @@ -853,7 +853,13 @@ image_set_hdr_b(comp) /* image_set_comp */ static inline void image_set_name(struct legacy_img_hdr *hdr, const char *name) { - strncpy(image_get_name(hdr), name, IH_NMLEN); + /* + * This is equivalent to: strncpy(image_get_name(hdr), name, IH_NMLEN); + * + * Use the tortured code below to avoid a warning with gcc 12. We do not + * want to include a nul terminator if the name is of length IH_NMLEN + */ + memcpy(image_get_name(hdr), name, strnlen(name, IH_NMLEN)); } int image_check_hcrc(const struct legacy_img_hdr *hdr); |