diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2021-01-06 19:36:44 +0100 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-02-08 22:46:27 +0100 |
| commit | e6ccb40ba5bedbc4a27ddea4a858f17c3496a43f (patch) | |
| tree | 9f0ee1581d0310d45693a76e6e725c803c178ae4 /tools/mkimage/patches/210-link-libcrypto-static.patch | |
| parent | 3e7c7d444642c52148e5ed8c24450faba0396c97 (diff) | |
| download | upstream-e6ccb40ba5bedbc4a27ddea4a858f17c3496a43f.tar.gz upstream-e6ccb40ba5bedbc4a27ddea4a858f17c3496a43f.tar.bz2 upstream-e6ccb40ba5bedbc4a27ddea4a858f17c3496a43f.zip | |
tools: mkimage: Update U-Boot to version 2021.01
* The fit image is now created with 0666 permission in upstream U-Boot
remove our patch switch creates it with 0744
* The generated/autoconf.h file is created now as an empty file, it is
not needed to remove this include any more.
* Upstream lib/rsa/rsa-sign.c now includes stdlib.h instead of malloc.h
* ALIGN_MASK was moved to imagetool.h, own patch should not be needed
any more.
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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/mkimage/patches/210-link-libcrypto-static.patch b/tools/mkimage/patches/210-link-libcrypto-static.patch index c609912be9..87a425bd94 100644 --- a/tools/mkimage/patches/210-link-libcrypto-static.patch +++ b/tools/mkimage/patches/210-link-libcrypto-static.patch @@ -3,10 +3,10 @@ needed dependencies are added too. --- a/tools/Makefile +++ b/tools/Makefile -@@ -162,7 +162,7 @@ ifneq ($(CONFIG_MX23)$(CONFIG_MX28)$(CON +@@ -158,7 +158,7 @@ ifneq ($(CONFIG_MX23)$(CONFIG_MX28)$(CON HOSTCFLAGS_kwbimage.o += \ $(shell pkg-config --cflags libssl libcrypto 2> /dev/null || echo "") - HOSTLOADLIBES_mkimage += \ + HOSTLDLIBS_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") |