From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id gH63OpSSXGcVAAAAe85BDQ:P1 (envelope-from ) for ; Fri, 13 Dec 2024 20:01:25 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id gH63OpSSXGcVAAAAe85BDQ (envelope-from ) for ; Fri, 13 Dec 2024 21:01:25 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=RNECu0hW; dkim=fail ("headers rsa verify failed") header.d=rimm.ee header.s=herman header.b=ZrdIX66x; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1734120084; a=rsa-sha256; cv=none; b=Zc5cZEnUxd7s3uFVWZeTMt5Sxd21c37vO66RvyVRrOEdbjIk8HigzV9G0RnEbVgJw9LOJW A24aifA9f7udMFy/Gw3lwPOFB8Z2m0gh9OygTVLY6G07z5BtjPy/Y/APD9La8kBLt9TTyn mkTPIhppBloBdD06YvHXxxLf3FBXsJjlGAzgyBTIlWkHeuveDwq6i4smvw+/64RqG3CW9E IoaWnWW3UQ7J+7vd5fuyH69q1lz+SIg2E9KGf9w2CtnzqZUYw0RXnvg/sp0eJ8J0kCJwKf oaHp/C+ZOUwBUS+2To39mT3j9MCm8cKMejoIU10jKEwlEWLy+Uym+NoeNkQ/aQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=RNECu0hW; dkim=fail ("headers rsa verify failed") header.d=rimm.ee header.s=herman header.b=ZrdIX66x; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1734120084; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=KneUwIZE7YMXQPkOtu/yQsg2LmCKeQfhgSCzNrvASdw=; b=XWB2KyQtm9HhqCpDpSH2OELmG5eB9plvu+/VGeqKcmVy9noUv4AYlw21AzFmKJRg5lAjSE TCM3ByYSuWjHxxRcoobvnfZj5Oyw7g00NjymrVMgwKfcoR4M9G1WkuCKr4UMuEDy/g3pvy NJ+TY3XoI5F8dlAplCFLQX3E9cn0+zE36NvkNzXgu6C6GyNxz0rG8yiNzxPLxpqE3Rt5wN zwaoxlGEGhGAdyPZrG8Fs7YTui0nkoWtfLFJ72//3WSQFZwqoFmul6ZtL6IhRZqTodFui6 T/+Ycb6RA6J4uUZb6IOQizHfqaKD1GQdC8/HsG9zRRczDODCruGZpHJIZd+7Sg== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 4ABB65F5A8 for ; Fri, 13 Dec 2024 21:01:24 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tMBqa-0004Lq-Oy; Fri, 13 Dec 2024 15:01:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tMBqU-0004JY-6X for guix-patches@gnu.org; Fri, 13 Dec 2024 15:01:07 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tMBqT-0002r0-UK for guix-patches@gnu.org; Fri, 13 Dec 2024 15:01:05 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=KneUwIZE7YMXQPkOtu/yQsg2LmCKeQfhgSCzNrvASdw=; b=RNECu0hWg4z9a6pGLsRF3wusq2e3QF/EqhVMsokcqe4iORHmxuJnCn+VN4WthShM1pD5Z+5klLYC9PokXMMkriJ7DGjioc1nMPXCOXpwhrA0MSW/ORNO8+qMbOpJYhBRh1uwWnvTlauKnxYwPut9vukwMoiBuAgv945GxUW32UnGcTHM7xa2VDUsudIbuz8aKy93sngR1v4QLkiNdPLRkcvOfWQb0SNjg0m6HTbeneYHO/FWLlZvXabJR6XA+u/8Rf5uRK+4hz7ods/eq86iz9bK3D8/pyhqnmWoZvs5LFsxo7tDm1IIV+gS7QANST+UxpIaEb7L72mvTr0T72hINg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tMBqS-0000rA-2E; Fri, 13 Dec 2024 15:01:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#70131] [PATCH v3 2/6] gnu: u-boot: Update to 2024.10. Resent-From: Herman Rimm Original-Sender: "Debbugs-submit" Resent-CC: efraim@flashner.co.il, vagrant@debian.org, guix-patches@gnu.org Resent-Date: Fri, 13 Dec 2024 20:01:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70131 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70131@debbugs.gnu.org Cc: Efraim Flashner , Vagrant Cascadian X-Debbugs-Original-Xcc: Efraim Flashner , Vagrant Cascadian Received: via spool by 70131-submit@debbugs.gnu.org id=B70131.17341200453208 (code B ref 70131); Fri, 13 Dec 2024 20:01:04 +0000 Received: (at 70131) by debbugs.gnu.org; 13 Dec 2024 20:00:45 +0000 Received: from localhost ([127.0.0.1]:44192 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tMBq4-0000pY-Ay for submit@debbugs.gnu.org; Fri, 13 Dec 2024 15:00:45 -0500 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:54769 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tMBpx-0000oQ-FJ for 70131@debbugs.gnu.org; Fri, 13 Dec 2024 15:00:36 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1734120021; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KneUwIZE7YMXQPkOtu/yQsg2LmCKeQfhgSCzNrvASdw=; b=ZrdIX66x+oUfUCHq+8NIL4yd3DwB13AZGjBYkqyHh1E+OeGfJZbjrTi5qbdm8xd+HUvbwI JlcEmRK0KHLaxMRYdJb/9J54DcMyhViLFF2XN+QovjQPQyKQTKq3EqewNzxVCp7JinMnEt 8JuzSpCRJ4TTB3fQCezwBmIAFkRAUL94bZu29Q8AEUOVlVRYYbxTyytl5GGHCkaUWCLg1x sV4O7ROthhouQk1iXEbymOiZph2cSNs5fNKLGGBWknFSUw19OtmVsd4wXNDbK1EExNr5zl +TmRGffvPILdXyyn00QUQ2h/L1d+p/5WXEXvo46aRfx14fdYc1cZM+rdGaLphA== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 4fe6f93b (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <70131@debbugs.gnu.org>; Fri, 13 Dec 2024 20:00:21 +0000 (UTC) Date: Fri, 13 Dec 2024 20:58:30 +0100 Message-ID: X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Herman Rimm X-ACL-Warn: , Herman Rimm via Guix-patches From: Herman Rimm via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Queue-Id: 4ABB65F5A8 X-Migadu-Scanner: mx13.migadu.com X-Migadu-Spam-Score: -3.17 X-Spam-Score: -3.17 X-TUID: GBmhfjWslN6+ * gnu/packages/bootloaders.scm (u-boot): Update to 2024.10. [source]: Remove build-without-libcrypto patch. Use git-fetch. (%u-boot-build-without-libcrypto-patch): Remove variable. (u-boot-tools)[arguments]: Enable test_spl. Disable sandbox tests and kwbimage. (python-u-boot-pylib)[arguments]: Add phase to fix build file. (make-u-boot-package)[arguments]: Disable kwbimage. (u-boot-sandbox): Only keep CONFIG_FIT_CIPHER disabled. [inputs]: Add efitools. (u-boot-rockpro64-rk3399): Replace CONFIG_DM_SCSI with CONFIG_SCSI. * gnu/packages/patches/u-boot-build-without-libcrypto.patch: Delete. * gnu/local.mk (dist_patch_DATA): Remove patch. Change-Id: I07cb0df0431ed45af0beb05105ae948136dd9eb3 --- gnu/local.mk | 1 - gnu/packages/bootloaders.scm | 66 +++++----- .../u-boot-build-without-libcrypto.patch | 123 ------------------ 3 files changed, 32 insertions(+), 158 deletions(-) delete mode 100644 gnu/packages/patches/u-boot-build-without-libcrypto.patch diff --git a/gnu/local.mk b/gnu/local.mk index 14b8c6932e..ace19eb8a4 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2274,7 +2274,6 @@ dist_patch_DATA = \ %D%/packages/patches/tuxpaint-stamps-path.patch \ %D%/packages/patches/twinkle-bcg729.patch \ %D%/packages/patches/u-boot-allow-disabling-openssl.patch \ - %D%/packages/patches/u-boot-build-without-libcrypto.patch \ %D%/packages/patches/u-boot-nintendo-nes-serial.patch \ %D%/packages/patches/u-boot-rockchip-inno-usb.patch \ %D%/packages/patches/ucx-tcp-iface-ioctl.patch \ diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index db2cfd1131..584a285c61 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -54,6 +54,7 @@ (define-module (gnu packages bootloaders) #:use-module (gnu packages gcc) #:use-module (gnu packages gettext) #:use-module (gnu packages guile) + #:use-module (gnu packages efi) #:use-module (gnu packages linux) #:use-module (gnu packages llvm) #:use-module (gnu packages man) @@ -754,26 +755,22 @@ (define %u-boot-allow-disabling-openssl-patch ;; https://lists.denx.de/pipermail/u-boot/2021-October/462728.html (search-patch "u-boot-allow-disabling-openssl.patch")) -(define %u-boot-build-without-libcrypto-patch - ;; Upstream commit to fix Amlogic builds in u-boot 2024.01. - (search-patch "u-boot-build-without-libcrypto.patch")) - (define u-boot (package (name "u-boot") - (version "2024.01") + (version "2024.10") (source (origin (patches (list %u-boot-rockchip-inno-usb-patch - %u-boot-build-without-libcrypto-patch %u-boot-allow-disabling-openssl-patch)) - (method url-fetch) - (uri (string-append - "https://ftp.denx.de/pub/u-boot/" - "u-boot-" version ".tar.bz2")) + (method git-fetch) + (uri (git-reference + (url "https://source.denx.de/u-boot/u-boot.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1czmpszalc6b8cj9j7q6cxcy19lnijv3916w3dag6yr3xpqi35mr")))) + "0yrhb0izihv47p781dc4cp0znc5g225ayl7anz23c6jdrmfbpz2h")))) (build-system gnu-build-system) (native-inputs (list bison @@ -870,9 +867,11 @@ (define-public u-boot-tools (("\\./tools/patman/patman") (which "true")) ;; FIXME: test fails, needs further investiation (("run_test \"binman\"") "# run_test \"binman\"") - ;; FIXME: test_spl fails, needs further investiation - (("test_ofplatdata or test_handoff or test_spl") - "test_ofplatdata or test_handoff") + ;; FIXME: tests fail without kwbimage, i.e. openssl. + (("run_test \"sandbox_noinst\"") + "# run_test \"sandbox_noinst\"") + (("run_test \"sandbox_vpl\"") + "# run_test \"sandbox_vpl\"") ;; FIXME: code coverage not working (("run_test \"binman code coverage\"") "# run_test \"binman code coverage\"") @@ -895,14 +894,16 @@ (define-public u-boot-tools (("CONFIG_FIT_SIGNATURE=y") "CONFIG_FIT_SIGNATURE=n CONFIG_UT_LIB_ASN1=n -CONFIG_TOOLS_LIBCRYPTO=n") +CONFIG_TOOLS_LIBCRYPTO=n +CONFIG_TOOLS_KWBIMAGE=n") ;; Catch instances of implied CONFIG_FIG_SIGNATURE ;; with VPL targets (("CONFIG_SANDBOX_VPL=y") "CONFIG_SANDBOX_VPL=y CONFIG_FIT_SIGNATURE=n CONFIG_VPL_FIT_SIGNATURE=n -CONFIG_TOOLS_LIBCRYPTO=n") +CONFIG_TOOLS_LIBCRYPTO=n +CONFIG_TOOLS_KWBIMAGE=n") ;; This test requires a sound system, which is un-used ;; in u-boot-tools. (("CONFIG_SOUND=y") "CONFIG_SOUND=n"))) @@ -968,6 +969,13 @@ (define-public python-u-boot-pylib (add-after 'unpack 'chdir (lambda _ (chdir "tools/u_boot_pylib"))) + (add-after 'chdir 'list-package + (lambda _ + (let ((port (open-file "pyproject.toml" "a"))) + (display "[tool.setuptools.packages.find]\n" port) + (display "where = [\"..\"]\n" port) + (display "include = [\"u_boot_pylib*\"]" port) + (close-port port)))) (replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? @@ -1114,7 +1122,8 @@ (define*-public (make-u-boot-package board triplet (lambda _ (substitute* ".config" (("CONFIG_TOOLS_LIBCRYPTO=.*$") - "CONFIG_TOOLS_LIBCRYPTO=n")))) + "CONFIG_TOOLS_LIBCRYPTO=n +CONFIG_TOOLS_KWBIMAGE=n")))) (replace 'install (lambda _ (let ((libexec (string-append #$output "/libexec")) @@ -1322,21 +1331,10 @@ (define-public u-boot-qemu-riscv64-smode (define-public u-boot-sandbox (let ((base (make-u-boot-package "sandbox" #f ;build for the native system - ;; Disable CONFIG_TOOLS_LIBCRYPTO, CONFIG_FIT_SIGNATURE and - ;; CONFIG_FIT_CIPHER and their selectors as these features - ;; require OpenSSL, which is incompatible with the GPLv2-only - ;; parts of U-boot. The options below replicate the changes - ;; that disabling the above features in 'make menuconfig' then - ;; refreshing the defconfig with 'make savedefconfig' would do. - #:configs (list "# CONFIG_FIT_RSASSA_PSS is not set" - "# CONFIG_FIT_CIPHER is not set" - "# CONFIG_LEGACY_IMAGE_FORMAT is not set" - "# CONFIG_IMAGE_PRE_LOAD is not set" - "# CONFIG_IMAGE_PRE_LOAD_SIG is not set" - "# CONFIG_CMD_BOOTM_PRE_LOAD is not set" - "CONFIG_RSA=y" - "# CONFIG_EFI_SECURE_BOOT is not set" - "# CONFIG_TOOLS_LIBCRYPTO is not set") + ;; These disabled features require OpenSSL, which is + ;; incompatible with the GPLv2-only parts of U-boot. + #:configs (map (cut string-append "# CONFIG_" <> " is not set") + '("FIT_CIPHER")) #:append-description "The sandbox configuration of U-Boot provides a @command{u-boot} command that runs as a normal user space application. It can @@ -1356,8 +1354,9 @@ (define-public u-boot-sandbox (mkdir (string-append #$output "/bin")) (symlink (search-input-file outputs "libexec/u-boot") (string-append #$output "/bin/u-boot")))))))) + ;; cert-to-efi-sig-list from efitools creates the EFI capsule ESL. (inputs (modify-inputs (package-inputs base) - (append sdl2)))))) + (append efitools sdl2)))))) (define-public u-boot-sifive-unleashed (let ((base (make-u-boot-package "sifive_unleashed" "riscv64-linux-gnu"))) @@ -1457,7 +1456,6 @@ (define-public u-boot-rockpro64-rk3399 "CONFIG_SATA_SIL=y" "CONFIG_SCSI=y" "CONFIG_SCSI_AHCI=y" - "CONFIG_DM_SCSI=y" ;; Disable SPL FIT signatures, ;; due to GPLv2 and Openssl ;; license incompatibilities diff --git a/gnu/packages/patches/u-boot-build-without-libcrypto.patch b/gnu/packages/patches/u-boot-build-without-libcrypto.patch deleted file mode 100644 index d56588941c..0000000000 --- a/gnu/packages/patches/u-boot-build-without-libcrypto.patch +++ /dev/null @@ -1,123 +0,0 @@ -From 03e598263e3878b6f5d58f5525577903edadc644 Mon Sep 17 00:00:00 2001 -From: Paul-Erwan Rio -Date: Thu, 21 Dec 2023 08:26:11 +0100 -Subject: [PATCH] tools: fix build without LIBCRYPTO support - -Commit cb9faa6f98ae ("tools: Use a single target-independent config to -enable OpenSSL") introduced a target-independent configuration to build -crypto features in host tools. - -But since commit 2c21256b27d7 ("hash: Use Kconfig to enable hashing in -host tools and SPL") the build without OpenSSL is broken, due to FIT -signature/encryption features. Add missing conditional compilation -tokens to fix this. - -Signed-off-by: Paul-Erwan Rio -Tested-by: Alexander Dahl -Cc: Simon Glass -Reviewed-by: Tom Rini -Reviewed-by: Simon Glass ---- - include/image.h | 2 +- - tools/Kconfig | 1 + - tools/fit_image.c | 2 +- - tools/image-host.c | 4 ++++ - tools/mkimage.c | 5 +++-- - 5 files changed, 10 insertions(+), 4 deletions(-) - -diff --git a/include/image.h b/include/image.h -index 432ec927b1..21de70f0c9 100644 ---- a/include/image.h -+++ b/include/image.h -@@ -1465,7 +1465,7 @@ int calculate_hash(const void *data, int data_len, const char *algo, - * device - */ - #if defined(USE_HOSTCC) --# if defined(CONFIG_FIT_SIGNATURE) -+# if CONFIG_IS_ENABLED(FIT_SIGNATURE) - # define IMAGE_ENABLE_SIGN 1 - # define FIT_IMAGE_ENABLE_VERIFY 1 - # include -diff --git a/tools/Kconfig b/tools/Kconfig -index f8632cd59d..f01ed783e6 100644 ---- a/tools/Kconfig -+++ b/tools/Kconfig -@@ -51,6 +51,7 @@ config TOOLS_FIT_RSASSA_PSS - Support the rsassa-pss signature scheme in the tools builds - - config TOOLS_FIT_SIGNATURE -+ depends on TOOLS_LIBCRYPTO - def_bool y - help - Enable signature verification of FIT uImages in the tools builds -diff --git a/tools/fit_image.c b/tools/fit_image.c -index 71e031c855..beef1fa86e 100644 ---- a/tools/fit_image.c -+++ b/tools/fit_image.c -@@ -61,7 +61,7 @@ static int fit_add_file_data(struct image_tool_params *params, size_t size_inc, - ret = fit_set_timestamp(ptr, 0, time); - } - -- if (!ret) -+ if (CONFIG_IS_ENABLED(FIT_SIGNATURE) && !ret) - ret = fit_pre_load_data(params->keydir, dest_blob, ptr); - - if (!ret) { -diff --git a/tools/image-host.c b/tools/image-host.c -index ca4950312f..90bc9f905f 100644 ---- a/tools/image-host.c -+++ b/tools/image-host.c -@@ -14,8 +14,10 @@ - #include - #include - -+#if CONFIG_IS_ENABLED(FIT_SIGNATURE) - #include - #include -+#endif - - /** - * fit_set_hash_value - set hash value in requested has node -@@ -1131,6 +1133,7 @@ static int fit_config_add_verification_data(const char *keydir, - return 0; - } - -+#if CONFIG_IS_ENABLED(FIT_SIGNATURE) - /* - * 0) open file (open) - * 1) read certificate (PEM_read_X509) -@@ -1239,6 +1242,7 @@ int fit_pre_load_data(const char *keydir, void *keydest, void *fit) - out: - return ret; - } -+#endif - - int fit_cipher_data(const char *keydir, void *keydest, void *fit, - const char *comment, int require_keys, -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 ] [-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"); --- -2.41.0 - -- 2.45.2