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 84AD9C433FE for ; Wed, 13 Apr 2022 06:14:37 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2950E80541; Wed, 13 Apr 2022 08:14:35 +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="fmbs3dXU"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9CB30802EF; Wed, 13 Apr 2022 08:14:33 +0200 (CEST) Received: from mail-qk1-x733.google.com (mail-qk1-x733.google.com [IPv6:2607:f8b0:4864:20::733]) (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 5561280544 for ; Wed, 13 Apr 2022 08:14:30 +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-qk1-x733.google.com with SMTP id 141so683913qkf.3 for ; Tue, 12 Apr 2022 23:14:30 -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=ohL8SPW99jJbzeO/JxauUsb8IQnTsmTM2zeDTUZqVrs=; b=fmbs3dXUHEEzbLdqR0Hny99MRwHOVeJ+Gzo5eSdlkxpVchaP+lmQYhNYCgueYPWTIc LEj2rGQLksq87m7NN0w7ishGSrDOBNrfrFjq1U78EOaBKRAvHiO2Ld8Y8YuiDUdox/FU 6NbuAat2/psCM+9GKVe1kUY9rILytXRZ0w5vpjCAVQez/9+wIMTkseezEi/L61oHcgF5 D9BQXyIJIVZFf0f6c5sgfDmgNTbQ3mk5hP8cm7pdinP07uDRjo1mW0irI2RhcZzc+O7h g7B7SBc756HCObmut6vVQ3eOIQlqme2u2UxE0mXlvM8cNllyAMDO8uf0/efLENXSRX5x KVuw== 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=ohL8SPW99jJbzeO/JxauUsb8IQnTsmTM2zeDTUZqVrs=; b=yg0cS/cB5B/2bv3X399bAuV/QBySgwPOfTp/83pUbzR6q3HSgx0/gidN8cH4Z4TvoM llQBKs9uzb/CMlhesdMytnvPfmut9jHAOJsXijzhq9ACW777WexH5Vs0zSp3vT9sSON7 FLf/6+GKQH1MdU43hB3GfDqjX7st0OK17K/KRuKeU9I4SYbRNcfCvq6gKynwnm+Ezxov SNLbZgcDrhEADl3flUCxSQGZ7FP9ck5IGBF7vEdULgXbLFx7DA25ucvJzZ23YqU0XBen KEURMVBssv3PeuQNXydaGvMx9ZHtGZdzSgDLBnnbqdhRRSZrjWAM7MiYyJ3Z3p9NzgFg jO9g== X-Gm-Message-State: AOAM5332FTXCx2YWa6QvX+E7zBVTOub2+3h8XSjQvElJtgRopLdmzIp0 72yo7cd3RXR4LgQEabeVhp6mX0zAprFmxR0K4EkJ8Q== X-Google-Smtp-Source: ABdhPJyrlkdiU2nikRlz24kPboD591GgSaUKqZfxdKrRcHr8Zn/FsLv0NJaxNiy2rGU8qIhKJS4B7Xuvd1ynfTfSHs8= X-Received: by 2002:a37:a584:0:b0:69a:9b37:6406 with SMTP id o126-20020a37a584000000b0069a9b376406mr5586387qke.505.1649830469029; Tue, 12 Apr 2022 23:14:29 -0700 (PDT) MIME-Version: 1.0 References: <20220412130447.300574-1-sughosh.ganu@linaro.org> <20220412130447.300574-8-sughosh.ganu@linaro.org> <20220413060515.GA87648@laputa> In-Reply-To: <20220413060515.GA87648@laputa> From: Sughosh Ganu Date: Wed, 13 Apr 2022 11:44:18 +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: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? > > > --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 > >