diff options
author | Huangbin Zhan <zhanhb88@gmail.com> | 2021-11-26 08:38:31 +0800 |
---|---|---|
committer | Christian Lamparter <chunkeey@gmail.com> | 2021-12-27 13:51:41 +0100 |
commit | b6385a36680b6924239cbc6766a253cab45db8d9 (patch) | |
tree | 2f7d0b90461ed2478538bd89a6357ff6e8ad0b8c /tools/mkimage/patches/030-allow-to-use-different-magic.patch | |
parent | a0ad1f36f0afe5c29dde6a66bd5d89fa4842874f (diff) | |
download | upstream-b6385a36680b6924239cbc6766a253cab45db8d9.tar.gz upstream-b6385a36680b6924239cbc6766a253cab45db8d9.tar.bz2 upstream-b6385a36680b6924239cbc6766a253cab45db8d9.zip |
tools/mkimage: update to 2021.10
Changelog:
- upstream now needs OpenSSL in order to be able to sign FITs. See:
commit cb9faa6f98ae ("tools: Use a single target-independent config to enable OpenSSL")
- removes upstream patches.
Link: https://github.com/u-boot/u-boot/commit/cb9faa6f98ae56d70d59505dad290dd3d381cb7b
Tested-by: Sergey V. Lobanov <sergey@lobanov.in>
Signed-off-by: Huangbin Zhan <zhanhb88@gmail.com>
Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
Diffstat (limited to 'tools/mkimage/patches/030-allow-to-use-different-magic.patch')
-rw-r--r-- | tools/mkimage/patches/030-allow-to-use-different-magic.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tools/mkimage/patches/030-allow-to-use-different-magic.patch b/tools/mkimage/patches/030-allow-to-use-different-magic.patch index 3a1677d54d..936113595a 100644 --- a/tools/mkimage/patches/030-allow-to-use-different-magic.patch +++ b/tools/mkimage/patches/030-allow-to-use-different-magic.patch @@ -2,7 +2,7 @@ This patch makes it possible to set a custom image magic. --- a/tools/mkimage.c +++ b/tools/mkimage.c -@@ -21,6 +21,7 @@ static struct image_tool_params params = +@@ -24,6 +24,7 @@ static struct image_tool_params params = .arch = IH_ARCH_PPC, .type = IH_TYPE_KERNEL, .comp = IH_COMP_GZIP, @@ -10,7 +10,7 @@ This patch makes it possible to set a custom image magic. .dtc = MKIMAGE_DEFAULT_DTC_OPTIONS, .imagename = "", .imagename2 = "", -@@ -82,11 +83,12 @@ static void usage(const char *msg) +@@ -85,11 +86,12 @@ static void usage(const char *msg) " -l ==> list image header information\n", params.cmdname); fprintf(stderr, @@ -24,16 +24,16 @@ This patch makes it possible to set a custom image magic. " -a ==> set load address to 'addr' (hex)\n" " -e ==> set entry point to 'ep' (hex)\n" " -n ==> set image name to 'name'\n" -@@ -150,7 +152,7 @@ static void process_args(int argc, char +@@ -155,7 +157,7 @@ static void process_args(int argc, char int opt; while ((opt = getopt(argc, argv, -- "a:A:b:B:c:C:d:D:e:Ef:Fk:i:K:ln:N:p:O:rR:qstT:vVx")) != -1) { -+ "a:A:b:B:c:C:d:D:e:Ef:Fk:i:K:lM:n:N:p:O:rR:qstT:vVx")) != -1) { +- "a:A:b:B:c:C:d:D:e:Ef:FG:k:i:K:ln:N:p:O:rR:qstT:vVx")) != -1) { ++ "a:A:b:B:c:C:d:D:e:Ef:FG:k:i:K:lM:n:N:p:O:rR:qstT:vVx")) != -1) { switch (opt) { case 'a': params.addr = strtoull(optarg, &ptr, 16); -@@ -237,6 +239,14 @@ static void process_args(int argc, char +@@ -245,6 +247,14 @@ static void process_args(int argc, char case 'l': params.lflag = 1; break; |