diff options
| author | Tom Rini <[email protected]> | 2019-01-15 20:33:07 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2019-01-15 20:33:07 -0500 |
| commit | e807f6b5f9a164dc1fc35e1c733fa343acf335c0 (patch) | |
| tree | 73d8d68a2d4497ec6000f44d4ae8d4db80b40be2 /tools | |
| parent | d3689267f92c5956e09cc7d1baa4700141662bff (diff) | |
| parent | 03dcf17dba3dbd6f1cfe9ecaa0665ea8c11e0ef2 (diff) | |
Merge branch '2019-01-14-master-imports'
- MediaTek improvements (eth support)
- DM conversion for HI6220
- ISEE, Toby Churchill, other platform updates
- Various format code printf fixes
- Build race fixes
- Command repeat functionality enhanced, command autocomplete support
enhanced.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/dtoc/dtb_platdata.py | 2 | ||||
| -rw-r--r-- | tools/imx8image.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/dtoc/dtb_platdata.py b/tools/dtoc/dtb_platdata.py index 6cb12594466..ca580b45d4a 100644 --- a/tools/dtoc/dtb_platdata.py +++ b/tools/dtoc/dtb_platdata.py @@ -461,7 +461,7 @@ class DtbPlatdata(object): """ struct_name, _ = get_compat_name(node) var_name = conv_name_to_c(node.name) - self.buf('static struct %s%s %s%s = {\n' % + self.buf('static const struct %s%s %s%s = {\n' % (STRUCT_PREFIX, struct_name, VAL_PREFIX, var_name)) for pname, prop in node.props.items(): if pname in PROP_IGNORE_LIST or pname[0] == '#': diff --git a/tools/imx8image.c b/tools/imx8image.c index 0d856b9d94f..435f308b99e 100644 --- a/tools/imx8image.c +++ b/tools/imx8image.c @@ -674,7 +674,7 @@ static int get_container_image_start_pos(image_t *image_stack, uint32_t align) fclose(fd); if (header.tag != IVT_HEADER_TAG_B0) { - fprintf(stderr, "header tag missmatched \n"); + fprintf(stderr, "header tag mismatched \n"); exit(EXIT_FAILURE); } else { file_off += |