From patchwork Tue Jul 27 09:10:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 486674 Delivered-To: patch@linaro.org Received: by 2002:a05:6638:1185:0:0:0:0 with SMTP id f5csp38701jas; Tue, 27 Jul 2021 02:14:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx+fd+dge5CyvDYUlW01JaEdO6J1zHAr9vmIZAywH02J2trcHABdIBmYvAS2fQYgcvGTrix X-Received: by 2002:a17:907:2108:: with SMTP id qn8mr12209784ejb.549.1627377270695; Tue, 27 Jul 2021 02:14:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627377270; cv=none; d=google.com; s=arc-20160816; b=j9JDO4JOWXVi5ITJNJtBdm0H2hOp7bshhiK/iL0kEjLTEJW0rkD3Gl6eV5R8cJM9ju vcPxHwalBowc1RX4pWFbaTpCQVwJ+uqyWon3RxGmw1p8K8o4lYRfPKTaXd2q22xj9KJK l/s6/avDMGLCuBtV3NEh2/Rz95Tj0OrsQbD0i8f9QpkA1xtSobDY7LEYWQYklG2iPcWj pbnphbXKoVefR6i/NAXF2daoGBVAgCbajHEG6v+hLDaue7oDrA1tuNgcUjIIsgm23k7s JItFy2DM3QtLpIEA9I8bQEKwMbaRt13gdGf4dnX7sC7NQ79nQurDzYb9NCkYrvl2vss/ mu2w== 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=Iws4seB+60+QBneH9q4dhQId6g32wYBbdJJ9x1Ckes4=; b=0XSfjkHnT/vazrJGHYtawmj6dIMQ/mFmQc/KavwIwqGRvmgliuW+0oAZwjtPNmBQT+ 5TsJWSgVxKpiuc7LbeuYbafGFJlRsUzQHD5QZGrcMYSkk81ivIOuFHKAT7gauKOe8ksa 4IxLwI1w5hTps6kc5knKzn2xLRe5E8T97PEb9H0v/ISdJdbMPlzSJZSMP8zrsKjYhogY G+aSKEjuLoMoirL1D/aeug4m+8j3QhGxZg6SLro1Bx2JIJ+P4WXKIjrnWsD/j2wyqJQg 6kKk6frgnwztogM5N7pC3lLawM1LKnwUGLs6fTVxWdlqIU3dYXVzFFLmFLG2cil4rMvs aPfA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=mqA5mv84; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 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. [85.214.62.61]) by mx.google.com with ESMTPS id u15si2612693edt.211.2021.07.27.02.14.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Jul 2021 02:14:30 -0700 (PDT) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) client-ip=85.214.62.61; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=mqA5mv84; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 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 6946A83462; Tue, 27 Jul 2021 11:14:24 +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="mqA5mv84"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B261883464; Tue, 27 Jul 2021 11:13:11 +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.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,SPF_HELO_NONE 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 149128345D for ; Tue, 27 Jul 2021 11:12:57 +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 mz5-20020a17090b3785b0290176ecf64922so3200478pjb.3 for ; Tue, 27 Jul 2021 02:12:56 -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=Iws4seB+60+QBneH9q4dhQId6g32wYBbdJJ9x1Ckes4=; b=mqA5mv840ejfYCY2+MYWhdDUaNhG7tAhgQE7568gyruEFDc0KOfBK0Fs/LXzBS6Vzd p/JeEs+/MpOpkLpa4jx6hjbTlTc2CfLNhsRMvxTCZ0T/tNDeqMwpPFWbMOQoDSvZ9rDo Wz85eNincizOa7R21lQPcWfivm1xTfhWQf/P632jo+ISSrl8FWR8Npg8Td8vvBR/oDrz AdBTDCbEv7HkTrHNY7x3d4X9H0yBPROQnY3OLn7QnR4ElR28lKzO+/zteoVE4hHscppo CVs5SzPM54VtdlBWOwTfVZkPzp2iOqESXVeJa8YzGiFGAWBv36iA5ZTWeeJ5vxUHztk5 rLBA== 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=Iws4seB+60+QBneH9q4dhQId6g32wYBbdJJ9x1Ckes4=; b=pv8Kf9+enXzYIymSynAJElaZObbo5hWB+F4L0LfqD146i8INf0b1j7NwHEMdVQ1/4P y6N+7vVShTv91Y/FsrapKJmia3pEf58OsNfpJxRNk3RsK6JFD3lWEZctjgk+97zo6t4X nUCVgvz2HiwcCdnOq7TJKjMUMm+9QC7Tb3PnNlRBfCnmsRxLNKuTnlVsxN0VjOd8m7zI ztXZPVQOrWt5z0FpMG7sxba8+aQOSj/GFdTxrSZlRdfzUQD+pVSC3/0nECyVGk3FYDj6 0chn2jAIu0uu3smVHuatzKeytm5ZJSW68CAsWUQ9ZKt7WiC2qAV7wJmPlaIZHcYnTvx4 BBtw== X-Gm-Message-State: AOAM530NYgWLQx0UoIvF7Cakzj023MwO7pCia6c1aGhYN789yIlQ9/Ky /ywlTC31gVg5nLKKLo3dKLhrbA== X-Received: by 2002:a63:411:: with SMTP id 17mr22191831pge.125.1627377175467; Tue, 27 Jul 2021 02:12:55 -0700 (PDT) Received: from localhost.localdomain (pdb6272ed.tkyea130.ap.so-net.ne.jp. [219.98.114.237]) by smtp.gmail.com with ESMTPSA id q13sm2008218pjq.10.2021.07.27.02.12.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Jul 2021 02:12:55 -0700 (PDT) From: AKASHI Takahiro To: xypron.glpk@gmx.de, agraf@csgraf.de, trini@konsulko.com, sjg@chromium.org Cc: ilias.apalodimas@linaro.org, sughosh.ganu@linaro.org, masami.hiramatsu@linaro.org, u-boot@lists.denx.de, AKASHI Takahiro Subject: [PATCH v2 8/9] tools: mkeficapsule: allow for specifying GUID explicitly Date: Tue, 27 Jul 2021 18:10:53 +0900 Message-Id: <20210727091054.512050-9-takahiro.akashi@linaro.org> X-Mailer: git-send-email 2.31.0 In-Reply-To: <20210727091054.512050-1-takahiro.akashi@linaro.org> References: <20210727091054.512050-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/mkeficapsule.1 | 19 ++++++++++++------ tools/mkeficapsule.c | 46 +++++++++++++++++++++++++++----------------- 2 files changed, 41 insertions(+), 24 deletions(-) -- 2.31.0 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 798706c7b5f7..8ac1811c68bd 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 @@ -427,14 +429,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; @@ -449,21 +450,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; @@ -499,14 +509,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(); exit(EXIT_FAILURE); } - 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"); exit(EXIT_FAILURE);