diff options
| author | Tom Rini <[email protected]> | 2018-12-15 17:47:28 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2018-12-15 17:47:28 -0500 |
| commit | 0dc526d98eb216003ea884739abc17f6eb05c0df (patch) | |
| tree | 918155725e45773124d7b61cb61f6a78e3d8845d /tools | |
| parent | 8fc26fce41592175ae004514e431e68a9dd60671 (diff) | |
| parent | de5bab9c59807b109f89a39855c9eacfe4d08822 (diff) | |
Merge branch '2018-12-15-master-imports'
- Introduce tools-only build for host tools
- Bugfixes to poplar, syscon and the hashtable, a tee return code
- Fix a warning on gcc-8 by reworking part of mtk_image to be not unsafe
wrt strings.
- serial_stm32 reset support
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Makefile | 2 | ||||
| -rw-r--r-- | tools/mtk_image.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tools/Makefile b/tools/Makefile index c26b631560e..2c4d91f1990 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -126,7 +126,7 @@ fit_info-objs := $(dumpimage-mkimage-objs) fit_info.o fit_check_sign-objs := $(dumpimage-mkimage-objs) fit_check_sign.o file2include-objs := file2include.o -ifneq ($(CONFIG_MX23)$(CONFIG_MX28),) +ifneq ($(CONFIG_MX23)$(CONFIG_MX28)$(CONFIG_FIT_SIGNATURE),) # Add CONFIG_MXS into host CFLAGS, so we can check whether or not register # the mxsimage support within tools/mxsimage.c . HOSTCFLAGS_mxsimage.o += -DCONFIG_MXS diff --git a/tools/mtk_image.c b/tools/mtk_image.c index 2706d2de32a..2ca519483d3 100644 --- a/tools/mtk_image.c +++ b/tools/mtk_image.c @@ -322,7 +322,7 @@ static int mtk_brom_parse_imagename(const char *imagename) lk = val; if (!strcmp(key, "lkname")) - strncpy(lk_name, val, sizeof(lk_name)); + snprintf(lk_name, sizeof(lk_name), "%s", val); } if (next) @@ -656,7 +656,7 @@ static void mtk_image_set_gen_header(void *ptr, off_t filesize, bootname = SDMMC_BOOT_NAME; /* Generic device header */ - strncpy(hdr->boot.name, bootname, sizeof(hdr->boot.name)); + snprintf(hdr->boot.name, sizeof(hdr->boot.name), "%s", bootname); hdr->boot.version = cpu_to_le32(1); hdr->boot.size = cpu_to_le32(sizeof(hdr->boot)); |