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 33385C433F5 for ; Wed, 13 Apr 2022 06:05:30 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id CD86183B2D; Wed, 13 Apr 2022 08:05:27 +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="JWUdCSwn"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 54B7983AE2; Wed, 13 Apr 2022 08:05:25 +0200 (CEST) Received: from mail-pl1-x632.google.com (mail-pl1-x632.google.com [IPv6:2607:f8b0:4864:20::632]) (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 5F97E83B2D for ; Wed, 13 Apr 2022 08:05:22 +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-pl1-x632.google.com with SMTP id 12so1058922pll.12 for ; Tue, 12 Apr 2022 23:05:22 -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:mail-followup-to:references :mime-version:content-disposition:in-reply-to; bh=aMheOA1M/VKl+r2439FBWZ2rB9neaUnFbETwmGHNnME=; b=JWUdCSwnUrvsgNBrHl/1NnBkSZ1/gh+cK2Q3vJSB1/GYA5zKE0IhRTPw5IpWJ5tB1z EfY/jXYb6oU1XcYNw3hINb+uYKNcMGx08FiRjOWNMxm8yTj/61hW+H/By3FbGpxEWcsO RLMTLXk64oxpzNeiUmHDDhKcgclsCjKbbpfWKsKHXyObHc7l5VxpKmms5aZeNJyt76zM 2k+8ifkl6iY2MfYk8qCNodkc3pGxPEmPFLco+El98azgLh+x0zSdtYtdD5Ql1xPI20PG 1ac+XPRjiHkF2Xnbt5WSk8ZeR2lN6QnIX7tnwNKDRWy6Sm8cSmWcQlP7GZLGsUY6ADHC 6YrA== 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 :mail-followup-to:references:mime-version:content-disposition :in-reply-to; bh=aMheOA1M/VKl+r2439FBWZ2rB9neaUnFbETwmGHNnME=; b=ktXxEB5xAuYVcFho8osNRvDWPmXds4Kpg0dw0fX/AyYuyC3KWEI5nQn/+ZjOABtKoE 2t2cIZ6pQBEB3HLvF8BwCAiZ/XBDjy8+qKZ0jR5fpQ3sY/0KW2e96WbFKYURm5kn42Cl XLGvRxMhOZJ5Ylz9/OvBZGDc24c80fwfmOAV6ZtaY2lZrfyb0hhtHnSb9s/6O4/T8FYs bQsUwqsSup4pX6akh33ptxoMmIl3HgN8ogvpc/z8onLarjlFC5DrqU1Zy1od7cxaFb4u w3sOjbLCs5nOVXvbS6QG9iRnFi8zoeWeRayFtwKVGosouZrxYLONKPAkUl6Z/0y5poeY vXdQ== X-Gm-Message-State: AOAM530eStFEgD7h8dq1VJUnzISKxsHGi3rT54A343IPslgkWMc2T4B0 jedPqOm6Zyyk/Np9/df4G0AeLw== X-Google-Smtp-Source: ABdhPJx27ME/ihJjV5b7faYnAW+CufMi4cd1Mdx7Ii6nw9SdLG8athWZA3G7ELLqOHg3iVqMhtcGBg== X-Received: by 2002:a17:902:6acb:b0:158:8923:86df with SMTP id i11-20020a1709026acb00b00158892386dfmr6590552plt.144.1649829920635; Tue, 12 Apr 2022 23:05:20 -0700 (PDT) Received: from laputa ([2400:4050:c3e1:100:18ba:fbb1:88b:4642]) by smtp.gmail.com with ESMTPSA id j15-20020a17090a31cf00b001cb7c80616esm1462197pjf.57.2022.04.12.23.05.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Apr 2022 23:05:20 -0700 (PDT) Date: Wed, 13 Apr 2022 15:05:15 +0900 From: AKASHI Takahiro To: Sughosh Ganu Cc: 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 Subject: Re: [PATCH v6 7/8] mkeficapsule: Remove raw and FIT GUID types Message-ID: <20220413060515.GA87648@laputa> Mail-Followup-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 References: <20220412130447.300574-1-sughosh.ganu@linaro.org> <20220412130447.300574-8-sughosh.ganu@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220412130447.300574-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 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. > --raw and --fit command line options as well. Please update doc/mkeficapsule.1 as well. -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 >