diff options
| author | Tom Rini <trini@konsulko.com> | 2024-01-12 08:34:50 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-01-12 08:34:50 -0500 |
| commit | 547d3dd28a46a18d59e00a153c8becca8d4e8cf9 (patch) | |
| tree | 79a09ba118b2b4d3001bfd478206734d2727f4f7 /tools/mkimage.c | |
| parent | 2ee7a8ec6f1711abe9619fd8765edc16742be9de (diff) | |
| parent | 2027e99e61aab6fd8b06e2d752e0e538cff26eb6 (diff) | |
Merge branch '2024-01-12-assorted-fixes'
- Allow defconfigs to #include files (so we can construct a defconfig
from fragments), update phy-mtk-tphy binding, assorted test fixes,
allow building host tools without cryptographic libraries again,
android_ab bugfix, and make some SPL debugging cases easier.
Diffstat (limited to 'tools/mkimage.c')
| -rw-r--r-- | tools/mkimage.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/mkimage.c b/tools/mkimage.c index 6dfe3e1d42..ac62ebbde9 100644 --- a/tools/mkimage.c +++ b/tools/mkimage.c @@ -115,7 +115,7 @@ static void usage(const char *msg) " -B => align size in hex for FIT structure and header\n" " -b => append the device tree binary to the FIT\n" " -t => update the timestamp in the FIT\n"); -#ifdef CONFIG_FIT_SIGNATURE +#if CONFIG_IS_ENABLED(FIT_SIGNATURE) fprintf(stderr, "Signing / verified boot options: [-k keydir] [-K dtb] [ -c <comment>] [-p addr] [-r] [-N engine]\n" " -k => set directory containing private keys\n" @@ -130,8 +130,9 @@ static void usage(const char *msg) " -o => algorithm to use for signing\n"); #else fprintf(stderr, - "Signing / verified boot not supported (CONFIG_FIT_SIGNATURE undefined)\n"); + "Signing / verified boot not supported (CONFIG_TOOLS_FIT_SIGNATURE undefined)\n"); #endif + fprintf(stderr, " %s -V ==> print version information and exit\n", params.cmdname); fprintf(stderr, "Use '-T list' to see a list of available image types\n"); |