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 BD350C433EF for ; Thu, 31 Mar 2022 18:11:08 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 542B584245; Thu, 31 Mar 2022 20:11:06 +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="fZ3lD4TK"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B6ACE84249; Thu, 31 Mar 2022 20:11:03 +0200 (CEST) Received: from mail-wm1-x32c.google.com (mail-wm1-x32c.google.com [IPv6:2a00:1450:4864:20::32c]) (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 7E0FA8423F for ; Thu, 31 Mar 2022 20:10: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=ilias.apalodimas@linaro.org Received: by mail-wm1-x32c.google.com with SMTP id k124-20020a1ca182000000b0038c9cf6e2a6so155700wme.0 for ; Thu, 31 Mar 2022 11:10:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=oFF4eN1BUzrPyHUCjT/ID2LLiLWARLeTeIVE2wjXtjE=; b=fZ3lD4TKN16SLaCQoWdN+SsYBWTmX/01ETVyBzM2tfWw43twOlccwwOutxS02dfpbb 7+vsBCtA3Uq7MIPxBh5OMwi9BJ0YLcNaWQJKXIxR4MGxa52FV0ylSv8gYKzU8KeMmCvG 0OaYJNcW3cN9ShT+ghRdxUtVfsBk7P2NpnHlyvrk/bxe2WrvJMqnGNrUEklEnXsykmJN evmkNUeODzzftVTVy8ipEdrIQ/vblnr7nIk/+rhMMbQWsMtanPQM0gTUI6VJtkqOEaG8 VMOsLfDrq9RPvJTzew0ghWQOIXeK2fqZ92dqVotuCnnlJfOOO5rKwenk045VKuGlAFMl ZZ8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=oFF4eN1BUzrPyHUCjT/ID2LLiLWARLeTeIVE2wjXtjE=; b=DEdCXONlf/6W7Mi08oQ8lNj+VJt3Uw8/m3Dv94nk8v8ju3bdNkHs3Di/8w5H09umUs Jo4ANWRW9VNWT9m06YzAPmMUXcM7AVFLLgzhEvZeqtx2DFng1sq/uSLmDsDm/2Bcr7Zx xFUDlwCTbRiEnhXMtHzj6tb5RZSPehc8ZTurSyQXNBwD94FR99/54EYS2QbGnzkk7I/E o317eXpQFGZtmb8StD2DYaM5r8NLvoI87Zu8mi9S1qWEZWn2Wjl8JWPmcVYPzjs8F6rF OMs36UZwopMmRNLncEwkta+cVtV3HdlrSqwYmKU8qTdNSTXNT3e4tdlQYJ5BLFgZL6Z/ PPXA== X-Gm-Message-State: AOAM530BJ/kYK7Wes3CMh4RDJ1arH1Y+/rElRmlb3q4+T0JqdsSSbt72 pN+kp2frMl/Pm7xU5dr/+oNQ8Q== X-Google-Smtp-Source: ABdhPJxbzXFe6AINsuzKZuZo4SNPLDzDUinf0MtLdQwDGdgA+GcftQtR8sidjQGYFoe3QHwRMj5cWg== X-Received: by 2002:a7b:c5d5:0:b0:37b:fda9:a5e2 with SMTP id n21-20020a7bc5d5000000b0037bfda9a5e2mr5578506wmk.62.1648750257068; Thu, 31 Mar 2022 11:10:57 -0700 (PDT) Received: from hades (athedsl-4461682.home.otenet.gr. [94.71.4.98]) by smtp.gmail.com with ESMTPSA id v14-20020a7bcb4e000000b0034492fa24c6sm2232wmj.34.2022.03.31.11.10.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 31 Mar 2022 11:10:56 -0700 (PDT) Date: Thu, 31 Mar 2022 21:10:54 +0300 From: Ilias Apalodimas To: Sughosh Ganu Cc: u-boot@lists.denx.de, Heinrich Schuchardt , AKASHI Takahiro , Ying-Chun Liu , Tuomas Tynkkynen , Heiko Thiery , Frieder Schrempf , Michael Walle , Masami Hiramatsu , Jassi Brar , Michal Simek , Michal Simek Subject: Re: [PATCH v4 7/8] mkeficapsule: Remove raw and FIT GUID types Message-ID: References: <20220331132750.1532722-1-sughosh.ganu@linaro.org> <20220331132750.1532722-8-sughosh.ganu@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220331132750.1532722-8-sughosh.ganu@linaro.org> 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 Thu, Mar 31, 2022 at 06:57:49PM +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 > --raw and --fit command line options as well. > > Signed-off-by: Sughosh Ganu > --- > > Changes since V3: 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 > Acked-by: Ilias Apalodimas