diff options
| author | Tom Rini <trini@konsulko.com> | 2025-06-23 14:49:16 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2025-06-23 16:15:23 -0600 |
| commit | 184e7d0bb211b8885f6715fdd6149ce96a4d1037 (patch) | |
| tree | 271f9ebbfa6f0d2776054bbf07c396ebe1f663e8 /tools | |
| parent | dbf7fd557a73ded3141db3c2cf5c572989378825 (diff) | |
| parent | fb4a488eb91b089912ffbc9a74d0527f0f2c79ac (diff) | |
Merge tag 'v2025.07-rc5' into next
Prepare v2025.07-rc5
With this merge, tighten up the LTO_FLAGS removal we added to not
trigger on ARMv7 (which is Thumb-2 and should be fine).
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Makefile | 3 | ||||
| -rw-r--r-- | tools/image-host.c | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/tools/Makefile b/tools/Makefile index 97ce1dbb17e..02297e8c93a 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -63,7 +63,8 @@ HOSTCFLAGS_img2srec.o := -pedantic hostprogs-y += mkenvimage mkenvimage-objs := mkenvimage.o os_support.o generated/lib/crc32.o -hostprogs-y += dumpimage mkimage fit_info fit_check_sign +hostprogs-y += dumpimage mkimage fit_info +hostprogs-$(CONFIG_FIT_SIGNATURE) += fit_check_sign hostprogs-$(CONFIG_TOOLS_LIBCRYPTO) += fdt_add_pubkey hostprogs-$(CONFIG_TOOLS_LIBCRYPTO) += preload_check_sign diff --git a/tools/image-host.c b/tools/image-host.c index a9b86902763..21dd7f2d922 100644 --- a/tools/image-host.c +++ b/tools/image-host.c @@ -19,7 +19,7 @@ #include <openssl/evp.h> #endif -#if CONFIG_IS_ENABLED(IMAGE_PRE_LOAD) +#if CONFIG_IS_ENABLED(IMAGE_PRE_LOAD) && CONFIG_IS_ENABLED(LIBCRYPTO) #include <openssl/rsa.h> #include <openssl/err.h> #endif @@ -1416,7 +1416,7 @@ int fit_check_sign(const void *fit, const void *key, } #endif -#if CONFIG_IS_ENABLED(IMAGE_PRE_LOAD) +#if CONFIG_IS_ENABLED(IMAGE_PRE_LOAD) && CONFIG_IS_ENABLED(LIBCRYPTO) /** * rsa_verify_openssl() - Verify a signature against some data with openssl API * |