From patchwork Tue Aug 31 02:46:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 504641 Delivered-To: patch@linaro.org Received: by 2002:a02:8629:0:0:0:0:0 with SMTP id e38csp2369974jai; Mon, 30 Aug 2021 19:48:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxF5SFyta56AL7WZ8Kx5J076I6HhiXQJ0sM5MyyxeQCMDYkEAGoEOK/I1DB4sMxoGlRTnOG X-Received: by 2002:aa7:c54c:: with SMTP id s12mr26402320edr.96.1630378112067; Mon, 30 Aug 2021 19:48:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1630378112; cv=none; d=google.com; s=arc-20160816; b=Hk0tZTYru2NIJtm9NfE8ac/b1GNQxMXXzC3DJUOrID8sjhKmYVl4yNkwuNddsOGT3T Yy2hYQSvDR0XGifLBvveYhI1nJ54vUMTBjNrIBYU0iUA8s1AqxUwEAi+KSYU9cljCj/D 6r72Yr5Ttb9mvNckkpa+njvH5ATeXCo8zu5LTRgWutNTtQ3Zu+5O0vGTGOQ1dDYQi+lv nx+0Pn7YjUV3BuElGVcdadeUH8fjtWK1MmaqzX8KcOA+fDo81PI90OWvXsa4oFsR6thW ekec7hI7HT+EDmtlqRehFApZLvwzsvoiOn6rQLXzBghLkZKOf5ueL6/sjWIqhYSivTMC V2Fg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=fSykzfRbGy8MXSfwsGkgUWqXo3A9nlIQfo0wr2f8npc=; b=smfO6R/jn0FikXE+LGrcrAqgQUhh7njDxVHZ4lq37Z8mr5kY4XtrDUScfWxLliMGPn HUTqxuaawS+4/qyj+BpoTDaQhnt2cx8XuR2cUNqzg3avOkaF/R1/zPk/t/SsX+8tGTGt EuegI3/rqB2BAJGDKzpgKpx7sv2veCEJdgb5P8rZEiNg2JMiH3v7SWv214JIeumKWMFQ UJRHIsXEG3ZwaWUm3LCDKmxqlOH5bYVc70ZKcQDzDQ4Geeyz8uprJjaM+fRT7deNE1Rw 7Brdqw+MH0GRfnG2EFqgZ9ekZ7Sbcbm48Yq4x4Duv+c3nmapLaKx03dPSfVPF8BfnIE/ ZV2w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=mQOp+ABY; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from phobos.denx.de (phobos.denx.de. [2a01:238:438b:c500:173d:9f52:ddab:ee01]) by mx.google.com with ESMTPS id r23si738683edy.23.2021.08.30.19.48.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Aug 2021 19:48:32 -0700 (PDT) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=mQOp+ABY; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id ADF028340D; Tue, 31 Aug 2021 04:48:25 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="mQOp+ABY"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 519E483403; Tue, 31 Aug 2021 04:47:52 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pj1-x102c.google.com (mail-pj1-x102c.google.com [IPv6:2607:f8b0:4864:20::102c]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 90E0D8340A for ; Tue, 31 Aug 2021 04:47:42 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=takahiro.akashi@linaro.org Received: by mail-pj1-x102c.google.com with SMTP id j4-20020a17090a734400b0018f6dd1ec97so1332264pjs.3 for ; Mon, 30 Aug 2021 19:47:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=fSykzfRbGy8MXSfwsGkgUWqXo3A9nlIQfo0wr2f8npc=; b=mQOp+ABYGY7eYjXhq4HTPEGRifOtqU3dgAK5ttT2TnJpwdmG4DnkNa7dzJRB4TzvhR w4ZGalHK6SVev1sTWiE+IJ3PYgwwDwJUt4dEryAdkFfKA9iREjU/Iz2FLC1M3EV4E60I VqvXgZ1BKdDORiyTnGbKj7h/LuKJXKktc0LlqpmUVM/nbnUHPEliCwGDiIkVW9Vg24hd h0LdAmxRnVThNo/3F8jWkMggwu9cOz3RNLuw1AQlfCh+ExHcsmygkD/Tj9GTxmAT48kt UWRcfObTTrRK0vqjzegIukf/6myApIfPoIM/wQsQAoEPF6Vw8yorMxAFR4AuhVbpxH1M ltKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=fSykzfRbGy8MXSfwsGkgUWqXo3A9nlIQfo0wr2f8npc=; b=cA4/izkj+SE8jF8RIMIkIajXZ+IBLoQsJX7ECS3Sq+q9ap2zT2OSCKrPQwCijGvp87 vY+hDS6+f7LhAPq/ob+SMNA1IT+dbUuQJZVA8ylBErShPQ/UOTcAMA135zRQ21LUiKVY HM8xMJMmooxvL+tGuPaZlyXFrwiCSk+CBIGPhQhz6iUEmLlMgjki2X29u9x9ncctpDmh uXv6s83OELS4FxW4EaVOdmL4h6AqYT80CfQscct/9fhLFqTyFOmwDSEpCkhi7hWCAjoE N/+5C53iNr23ikC/ktjmhQnpaNAoZIDV1I3/+zOXEBCpIX5GAjXfbyHWSq4Hzpb7/xU9 KZCQ== X-Gm-Message-State: AOAM533wEEesXo2QvJCXRDMYxDbmm0QVk4ERZkbOdrER0R/51s91v5Bp YytAMPgFWjcfOw3idot738wbbQ== X-Received: by 2002:a17:90b:1d02:: with SMTP id on2mr2452218pjb.21.1630378060813; Mon, 30 Aug 2021 19:47:40 -0700 (PDT) Received: from localhost.localdomain (p784a44f4.tkyea130.ap.so-net.ne.jp. [120.74.68.244]) by smtp.gmail.com with ESMTPSA id g2sm219649pfr.35.2021.08.30.19.47.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Aug 2021 19:47:40 -0700 (PDT) From: AKASHI Takahiro To: xypron.glpk@gmx.de, agraf@csgraf.de Cc: ilias.apalodimas@linaro.org, sughosh.ganu@linaro.org, masami.hiramatsu@linaro.org, u-boot@lists.denx.de, AKASHI Takahiro Subject: [PATCH v3 4/5] tools: mkeficapsule: allow for specifying GUID explicitly Date: Tue, 31 Aug 2021 11:46:58 +0900 Message-Id: <20210831024659.53464-5-takahiro.akashi@linaro.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210831024659.53464-1-takahiro.akashi@linaro.org> References: <20210831024659.53464-1-takahiro.akashi@linaro.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean The existing options, "--fit" and "--raw," are only used to put a proper GUID in a capsule header, where GUID identifies a particular FMP (Firmware Management Protocol) driver which then would handle the firmware binary in a capsule. In fact, mkeficapsule does the exact same job in creating a capsule file whatever the firmware binary type is. To prepare for the future extension, the command syntax will be a bit modified to allow users to specify arbitrary GUID for their own FMP driver. OLD: [--fit | --raw ] NEW: [--fit | --raw | --guid ] Signed-off-by: AKASHI Takahiro --- doc/develop/uefi/uefi.rst | 4 ++-- doc/mkeficapsule.1 | 19 +++++++++++----- tools/mkeficapsule.c | 46 ++++++++++++++++++++++++--------------- 3 files changed, 43 insertions(+), 26 deletions(-) -- 2.33.0 Acked-by: Heinrich Schuchardt diff --git a/doc/develop/uefi/uefi.rst b/doc/develop/uefi/uefi.rst index 5ccb455da984..c23fc2125fb2 100644 --- a/doc/develop/uefi/uefi.rst +++ b/doc/develop/uefi/uefi.rst @@ -359,8 +359,8 @@ To generate and sign the capsule file:: --private-key CRT.key \ --certificate CRT.crt \ --index 1 --instance 0 \ - [--fit | --raw ] \ - + [--fit | --raw | --guid Place the capsule generated in the above step on the EFI System Partition under the EFI/UpdateCapsule directory diff --git a/doc/mkeficapsule.1 b/doc/mkeficapsule.1 index 7c2341160ea4..ab2aa3719744 100644 --- a/doc/mkeficapsule.1 +++ b/doc/mkeficapsule.1 @@ -5,7 +5,7 @@ mkeficapsule \- Generate EFI capsule file for U-Boot .SH SYNOPSIS .B mkeficapsule -.RB [\fIoptions\fP] " \fIcapsule-file\fP" +.RB [\fIoptions\fP] " \fIimage-blob\fP \fIcapsule-file\fP" .SH "DESCRIPTION" The @@ -21,7 +21,7 @@ Optionally, a capsule file can be signed with a given private key. In this case, the update will be authenticated by verifying the signature before applying. -\fBmkeficapsule\fP supports two different format of image files: +\fBmkeficapsule\fP takes any type of image files, including: .TP .I raw image format is a single binary blob of any type of firmware. @@ -33,15 +33,22 @@ is the same as used in the new \fIuImage\fP format and allows for multiple binary blobs in a single capsule file. This type of image file can be generated by \fBmkimage\fP. +If you want to use other types than above two, you should explicitly +specify a guid for the FMP driver. + .SH "OPTIONS" .TP -.BI "-f, --fit \fIfit-image-file\fP" -Specify a FIT image file +.BI "-f, --fit +Indicate that the blob is a FIT image file + +.TP +.BI "-r, --raw +Indicate that the blob is a raw image file .TP -.BI "-r, --raw \fIraw-image-file\fP" -Specify a raw image file +.BI "-g, --guid \fIguid-string\fP" +Specify guid for image blob type .TP .BI "-i, --index \fIindex\fP" diff --git a/tools/mkeficapsule.c b/tools/mkeficapsule.c index 090fb02de68d..c730cf468d2b 100644 --- a/tools/mkeficapsule.c +++ b/tools/mkeficapsule.c @@ -14,7 +14,7 @@ #include #include - +#include #include #ifdef CONFIG_TOOLS_LIBCRYPTO #include @@ -51,14 +51,15 @@ efi_guid_t efi_guid_image_type_uboot_raw = efi_guid_t efi_guid_cert_type_pkcs7 = EFI_CERT_TYPE_PKCS7_GUID; #ifdef CONFIG_TOOLS_LIBCRYPTO -static const char *opts_short = "f:r:i:I:v:p:c:m:dh"; +static const char *opts_short = "frg:i:I:v:p:c:m:dh"; #else -static const char *opts_short = "f:r:i:I:v:h"; +static const char *opts_short = "frg:i:I:v:h"; #endif static struct option options[] = { - {"fit", required_argument, NULL, 'f'}, - {"raw", required_argument, NULL, 'r'}, + {"fit", no_argument, NULL, 'f'}, + {"raw", no_argument, NULL, 'r'}, + {"guid", required_argument, NULL, 'g'}, {"index", required_argument, NULL, 'i'}, {"instance", required_argument, NULL, 'I'}, #ifdef CONFIG_TOOLS_LIBCRYPTO @@ -73,11 +74,12 @@ static struct option options[] = { static void print_usage(void) { - printf("Usage: %s [options] \n" + printf("Usage: %s [options] \n" "Options:\n" - "\t-f, --fit new FIT image file\n" - "\t-r, --raw new raw image file\n" + "\t-f, --fit FIT image type\n" + "\t-r, --raw raw image type\n" + "\t-g, --guid guid for image blob type\n" "\t-i, --index update image index\n" "\t-I, --instance update hardware instance\n" #ifdef CONFIG_TOOLS_LIBCRYPTO @@ -524,14 +526,13 @@ err_1: */ int main(int argc, char **argv) { - char *file; efi_guid_t *guid; + unsigned char uuid_buf[16]; unsigned long index, instance; uint64_t mcount; char *privkey_file, *cert_file; int c, idx; - file = NULL; guid = NULL; index = 0; instance = 0; @@ -546,21 +547,30 @@ int main(int argc, char **argv) switch (c) { case 'f': - if (file) { - printf("Image already specified\n"); + if (guid) { + printf("Image type already specified\n"); return -1; } - file = optarg; guid = &efi_guid_image_type_uboot_fit; break; case 'r': - if (file) { - printf("Image already specified\n"); + if (guid) { + printf("Image type already specified\n"); return -1; } - file = optarg; guid = &efi_guid_image_type_uboot_raw; break; + case 'g': + if (guid) { + printf("Image type already specified\n"); + return -1; + } + if (uuid_parse(optarg, uuid_buf)) { + printf("Wrong guid format\n"); + return -1; + } + guid = (efi_guid_t *)uuid_buf; + break; case 'i': index = strtoul(optarg, NULL, 0); break; @@ -596,14 +606,14 @@ int main(int argc, char **argv) } /* check necessary parameters */ - if ((argc != optind + 1) || !file || + if ((argc != optind + 2) || !guid || ((privkey_file && !cert_file) || (!privkey_file && cert_file))) { print_usage(); return -1; } - if (create_fwbin(argv[optind], file, guid, index, instance, + if (create_fwbin(argv[argc - 1], argv[argc - 2], guid, index, instance, mcount, privkey_file, cert_file) < 0) { printf("Creating firmware capsule failed\n"); return -1;