diff options
| author | Tom Rini <trini@konsulko.com> | 2020-05-01 16:43:15 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-05-01 16:43:15 -0400 |
| commit | c693f212c5b0433b3a49a89d87cbff28bf78eb87 (patch) | |
| tree | fba202b549b53e536feb5d7b60e6313074d93a55 /tools | |
| parent | b641dd3ec8dc3f6b18d2fa945ac3ab597063d191 (diff) | |
| parent | 14b7004532a41cbb2dc82cc1a5687e8e88e1ba0d (diff) | |
Merge branch '2020-05-01-master-imports'
- Assorted bug fixes
- Framework for enabling D-CACHE in SPL on ARM
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/fit_image.c | 4 | ||||
| -rw-r--r-- | tools/mkimage.h | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/tools/fit_image.c b/tools/fit_image.c index 4aeabbcfe9..88ff093d05 100644 --- a/tools/fit_image.c +++ b/tools/fit_image.c @@ -17,6 +17,7 @@ #include "fit_common.h" #include "mkimage.h" #include <image.h> +#include <string.h> #include <stdarg.h> #include <version.h> #include <u-boot/crc.h> @@ -744,6 +745,9 @@ static int fit_handle_file(struct image_tool_params *params) snprintf(cmd, sizeof(cmd), "cp \"%s\" \"%s\"", params->imagefile, tmpfile); } + if (strlen(cmd) >= MKIMAGE_MAX_DTC_CMDLINE_LEN - 1) { + fprintf(stderr, "WARNING: command-line for FIT creation might be truncated and will probably fail.\n"); + } if (*cmd && system(cmd) == -1) { fprintf (stderr, "%s: system(%s) failed: %s\n", diff --git a/tools/mkimage.h b/tools/mkimage.h index 0254af59fb..5b096a545b 100644 --- a/tools/mkimage.h +++ b/tools/mkimage.h @@ -42,6 +42,6 @@ static inline ulong map_to_sysmem(void *ptr) #define MKIMAGE_TMPFILE_SUFFIX ".tmp" #define MKIMAGE_MAX_TMPFILE_LEN 256 #define MKIMAGE_DEFAULT_DTC_OPTIONS "-I dts -O dtb -p 500" -#define MKIMAGE_MAX_DTC_CMDLINE_LEN 512 +#define MKIMAGE_MAX_DTC_CMDLINE_LEN 2 * MKIMAGE_MAX_TMPFILE_LEN + 35 #endif /* _MKIIMAGE_H_ */ |