From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 53858C433F5 for ; Wed, 13 Apr 2022 06:31:04 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 44382805FB; Wed, 13 Apr 2022 08:31:01 +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="e1PhlM8w"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id AFC4B805FC; Wed, 13 Apr 2022 08:30:59 +0200 (CEST) Received: from mail-qv1-xf29.google.com (mail-qv1-xf29.google.com [IPv6:2607:f8b0:4864:20::f29]) (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 1963680544 for ; Wed, 13 Apr 2022 08:30: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=sughosh.ganu@linaro.org Received: by mail-qv1-xf29.google.com with SMTP id a5so926482qvx.1 for ; Tue, 12 Apr 2022 23:30:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to; bh=Is934XcswJy1gOOU2HkY5pWy5b9c6/gV9Zbqs2hrp44=; b=e1PhlM8wyr3vAPiMaiKSKBQkidPnln8tVKrNzyjRkwpfUOHCOp+90thlPy+KrCTAVq D8Rn+IRE5/Y5vDW5rZLxUanCmNDuGBfzSWLUEqzsmuBAcOn3wmtgEZW3Rj0fosFFnc9h wW1xmtNtkG+PiE/5nxnz3/0pzjKsXNbz6iu0Msvjm9MlupGUhB2vcWaIYiiMA8v82GCi JMH76CYWSFokJqIw0kiklSvmuG9tj102XILn1TsIPYiIru/ttms0W2HBZ+L8Pl/VOFbY 3to1W3RwRsJXij+fmSa9jHgvLBpT3ZmmUMlN3NbPBLP6UZyzALmGeNgicaKDLX8mtS1l lL8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to; bh=Is934XcswJy1gOOU2HkY5pWy5b9c6/gV9Zbqs2hrp44=; b=7UdHJ3TrIGdTfGMLdB3v6bZSI66P/lRCRCAH13D+id57mzDe3Xtp9vRaU17qY3piyN D2ki2/FyDsJh0ojB5lu7urO+RTCkIlumzoED+VvVtKd+Ou1ZveM6c3OzY4Gw27/5dgFk nEyhrcyig+H+GCy+760Hpp9TJVCZiyivBwLDC8Cb0fEHCb0jq1E7+0DGl4vgnLKi0V4L jx7c/Q9mZBrsk5Z5kQZEBPCanVWWNfAoIXAgveYaCrLM7eil16aSfw6cMNi1Lc/RVkx7 8SizIiyuhdBEIs3uAPjpw5u+Ckw1+KGIErI8RaD3jUhj5D4MnsJq1MR9TL3cF0w35mSE s+cA== X-Gm-Message-State: AOAM532zUfC6xQ3MaXjwFvM8YjZyw9IUM6GxzYrRs6ITQ+VgluQQfKGx LO4rg7+66YOi5LUfqnDJ/oaoMACIbh8qs+LI+HglCg== X-Google-Smtp-Source: ABdhPJziMBkcuDb8M3epgkYV4VIsbX6twJe/BL+BczD8n/N4n0XDzUwYkK9ixetYiKq6nuPjIi/XrmdSXQoRzhAZYa0= X-Received: by 2002:a05:6214:411e:b0:443:d734:df45 with SMTP id kc30-20020a056214411e00b00443d734df45mr34330307qvb.46.1649831455694; Tue, 12 Apr 2022 23:30:55 -0700 (PDT) MIME-Version: 1.0 References: <20220412130447.300574-1-sughosh.ganu@linaro.org> <20220412130447.300574-8-sughosh.ganu@linaro.org> <20220413060515.GA87648@laputa> <20220413062313.GC87648@laputa> In-Reply-To: <20220413062313.GC87648@laputa> From: Sughosh Ganu Date: Wed, 13 Apr 2022 12:00:44 +0530 Message-ID: Subject: Re: [PATCH v6 7/8] mkeficapsule: Remove raw and FIT GUID types To: AKASHI Takahiro , Sughosh Ganu , u-boot@lists.denx.de, Heinrich Schuchardt , Ilias Apalodimas , Ying-Chun Liu , Tuomas Tynkkynen , Heiko Thiery , Frieder Schrempf , Michael Walle , Masami Hiramatsu , Jassi Brar , Michal Simek , Michal Simek Content-Type: text/plain; charset="UTF-8" X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.5 at phobos.denx.de X-Virus-Status: Clean On Wed, 13 Apr 2022 at 11:53, AKASHI Takahiro wrote: > > On Wed, Apr 13, 2022 at 11:44:18AM +0530, Sughosh Ganu wrote: > > On Wed, 13 Apr 2022 at 11:35, AKASHI Takahiro > > wrote: > > > > > > On Tue, Apr 12, 2022 at 06:34:46PM +0530, Sughosh Ganu wrote: > > > > While building a capsule, the GUID value of that specific image is to > > > > be passed through the --guid command option to the mkeficapsule > > > > tool. This renders the EFI_FIRMWARE_IMAGE_TYPE_UBOOT_FIT_GUID and > > > > EFI_FIRMWARE_IMAGE_TYPE_UBOOT_RAW_GUID values superfluous. Remove the > > > > > > superfluous? I don't think it is the reason for removing guids for FIT/RAW. > > > > The reason for using that word is that these GUID values would not be > > used any longer. Do you prefer some other phrasing of the sentence? > > They are not used not because we have "--guid" option, which I added later > than "--fit" or "--raw" in order to handle extra cases, but because you changed > the semantics of FIT/RAW drivers. That is what I have mentioned above. With the passing of the GUID value through the --guid option, the raw and FIT GUIDs are no longer needed. -sughosh > > -Takahiro Akashi > > > > > > > > --raw and --fit command line options as well. > > > > > > Please update doc/mkeficapsule.1 as well. > > > > Will do. > > > > -sughosh > > > > > > > > -Takahiro Akashi > > > > > > > Signed-off-by: Sughosh Ganu > > > > Acked-by: Ilias Apalodimas > > > > --- > > > > > > > > Changes since V5: None > > > > > > > > tools/eficapsule.h | 8 -------- > > > > tools/mkeficapsule.c | 26 +------------------------- > > > > 2 files changed, 1 insertion(+), 33 deletions(-) > > > > > > > > diff --git a/tools/eficapsule.h b/tools/eficapsule.h > > > > index 69c9c58c2f..d63b831443 100644 > > > > --- a/tools/eficapsule.h > > > > +++ b/tools/eficapsule.h > > > > @@ -37,14 +37,6 @@ typedef struct { > > > > EFI_GUID(0x6dcbd5ed, 0xe82d, 0x4c44, 0xbd, 0xa1, \ > > > > 0x71, 0x94, 0x19, 0x9a, 0xd9, 0x2a) > > > > > > > > -#define EFI_FIRMWARE_IMAGE_TYPE_UBOOT_FIT_GUID \ > > > > - EFI_GUID(0xae13ff2d, 0x9ad4, 0x4e25, 0x9a, 0xc8, \ > > > > - 0x6d, 0x80, 0xb3, 0xb2, 0x21, 0x47) > > > > - > > > > -#define EFI_FIRMWARE_IMAGE_TYPE_UBOOT_RAW_GUID \ > > > > - EFI_GUID(0xe2bb9c06, 0x70e9, 0x4b14, 0x97, 0xa3, \ > > > > - 0x5a, 0x79, 0x13, 0x17, 0x6e, 0x3f) > > > > - > > > > #define EFI_CERT_TYPE_PKCS7_GUID \ > > > > EFI_GUID(0x4aafd29d, 0x68df, 0x49ee, 0x8a, 0xa9, \ > > > > 0x34, 0x7d, 0x37, 0x56, 0x65, 0xa7) > > > > diff --git a/tools/mkeficapsule.c b/tools/mkeficapsule.c > > > > index c118335b93..5f74d23b9e 100644 > > > > --- a/tools/mkeficapsule.c > > > > +++ b/tools/mkeficapsule.c > > > > @@ -27,17 +27,11 @@ > > > > static const char *tool_name = "mkeficapsule"; > > > > > > > > efi_guid_t efi_guid_fm_capsule = EFI_FIRMWARE_MANAGEMENT_CAPSULE_ID_GUID; > > > > -efi_guid_t efi_guid_image_type_uboot_fit = > > > > - EFI_FIRMWARE_IMAGE_TYPE_UBOOT_FIT_GUID; > > > > -efi_guid_t efi_guid_image_type_uboot_raw = > > > > - EFI_FIRMWARE_IMAGE_TYPE_UBOOT_RAW_GUID; > > > > efi_guid_t efi_guid_cert_type_pkcs7 = EFI_CERT_TYPE_PKCS7_GUID; > > > > > > > > -static const char *opts_short = "frg:i:I:v:p:c:m:dh"; > > > > +static const char *opts_short = "g:i:I:v:p:c:m:dh"; > > > > > > > > static struct option options[] = { > > > > - {"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'}, > > > > @@ -54,8 +48,6 @@ static void print_usage(void) > > > > fprintf(stderr, "Usage: %s [options] \n" > > > > "Options:\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" > > > > @@ -606,22 +598,6 @@ int main(int argc, char **argv) > > > > break; > > > > > > > > switch (c) { > > > > - case 'f': > > > > - if (guid) { > > > > - fprintf(stderr, > > > > - "Image type already specified\n"); > > > > - exit(EXIT_FAILURE); > > > > - } > > > > - guid = &efi_guid_image_type_uboot_fit; > > > > - break; > > > > - case 'r': > > > > - if (guid) { > > > > - fprintf(stderr, > > > > - "Image type already specified\n"); > > > > - exit(EXIT_FAILURE); > > > > - } > > > > - guid = &efi_guid_image_type_uboot_raw; > > > > - break; > > > > case 'g': > > > > if (guid) { > > > > fprintf(stderr, > > > > -- > > > > 2.25.1 > > > >