diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2019-05-11 16:57:15 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2019-09-04 22:35:22 +0200 |
| commit | 169152c8d118408ba62788a1e6b9eae368dc8b79 (patch) | |
| tree | 9e4187f7891564f63be7dcbccf0b47ddf6fc63ed /tools/mkimage/patches/210-link-libcrypto-static.patch | |
| parent | 662394fb30fdbcc89ec387918714aebee6868a9f (diff) | |
| download | upstream-169152c8d118408ba62788a1e6b9eae368dc8b79.tar.gz upstream-169152c8d118408ba62788a1e6b9eae368dc8b79.tar.bz2 upstream-169152c8d118408ba62788a1e6b9eae368dc8b79.zip | |
tools/mkimage: Update U-Boot to version 2019.07
This updates the U-Boot which provides the host tools like mkimage to
version 2019.07.
The patches were cleaned up and it was checked if this still compiles
on Linux and FreeBSD.
CONFIG_FIT_SIGNATURE_MAX_SIZE is set to the default value.
The patch for libressl was merged upstream.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'tools/mkimage/patches/210-link-libcrypto-static.patch')
| -rw-r--r-- | tools/mkimage/patches/210-link-libcrypto-static.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/mkimage/patches/210-link-libcrypto-static.patch b/tools/mkimage/patches/210-link-libcrypto-static.patch index 66412ce43b..368dea86c9 100644 --- a/tools/mkimage/patches/210-link-libcrypto-static.patch +++ b/tools/mkimage/patches/210-link-libcrypto-static.patch @@ -3,9 +3,9 @@ needed dependencies are added too. --- a/tools/Makefile +++ b/tools/Makefile -@@ -145,7 +145,7 @@ endif - # MXSImage needs LibSSL - ifneq ($(CONFIG_MX23)$(CONFIG_MX28)$(CONFIG_ARMADA_38X)$(CONFIG_ARMADA_39X)$(CONFIG_FIT_SIGNATURE),) +@@ -151,7 +151,7 @@ ifneq ($(CONFIG_MX23)$(CONFIG_MX28)$(CON + HOSTCFLAGS_kwbimage.o += \ + $(shell pkg-config --cflags libssl libcrypto 2> /dev/null || echo "") HOSTLOADLIBES_mkimage += \ - $(shell pkg-config --libs libssl libcrypto 2> /dev/null || echo "-lssl -lcrypto") + $(shell pkg-config --libs --static libssl libcrypto 2> /dev/null || echo "-lssl -lcrypto") |