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 D3371C433F5 for ; Thu, 24 Mar 2022 14:25:48 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B2176840B1; Thu, 24 Mar 2022 15:25:45 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=xilinx.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=xilinx.onmicrosoft.com header.i=@xilinx.onmicrosoft.com header.b="hwZW8gxS"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9958083515; Thu, 24 Mar 2022 15:25:43 +0100 (CET) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2061e.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe59::61e]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 94E1383515 for ; Thu, 24 Mar 2022 15:25:40 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=xilinx.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=michals@xilinx.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=H5nv89o8YMSiYMB9h0vv9s+BuDsIHpj7q32FklskOdFYdJySas6Z7te9mhcHbtBRpvgwJVNan+Qqi8W4eOiCe9brrPSl9TkRgF0mLSVDKCSWokdVZlm9L5+6C6f/erMcwm86j+sNVcGuSIJVp+tc3f9UNkeJRDsqI4b0TdCaw+w4MZFpmTQPs0Xvt6ZJDUpIONj8FFX8dyTj/L07E8W4lrBuaoSoXivNsqfJjG0SssQkdo1nbnBRnj3JGT9/Xqe5IItwYWJprpeHkPqT81SrFEtRkA+I67KH38STm5+NDDNw1PgYGbEtcnU3tjmK8inJwBhaxMHDlTNU09SMxE7x1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=fPLt8G12TJBsm3vRTAHZw59KRd0F8AJ+4Xs4zxjscmM=; b=mJSL28g7myOP6XyaeJAzCTYfpPwrQ7AgWhyuPxwAAjISS7zia7oXCXS2W11T1cO/kBI4oJsqMhq5lj9WJWgLRnC+Yj9fjW0QaBsveWb13lU7sS75pmOYuSA0GCPfDnSHiFZKOndGOZAuY2854lE3+rnSmjqdOk3QAbfiAGqSXfA5QGAA7T8I4fzMBSUqEq3paRwW1pPmQ1QmCaYjgJCk4Qg4upqdn7xyAtvLSYlvi7iDAScRka3RPWUF5qp8Y95rV/YU1hwOGMYQ+ZFolERYpbCVrmNHvyvdtu2lHZo+1Jshh5h+fsszYwfc4ZZruqUWWy96yJXhFG9NZjkB9ohUmA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 149.199.62.198) smtp.rcpttodomain=linaro.org smtp.mailfrom=xilinx.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=xilinx.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xilinx.onmicrosoft.com; s=selector2-xilinx-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=fPLt8G12TJBsm3vRTAHZw59KRd0F8AJ+4Xs4zxjscmM=; b=hwZW8gxSRKQM+gV228Qp59VI2gB8RHu6zNUR1xzwiJjRXFSEBcNWZQ3YnmfMFV2hmPcddJoYb62tagHwPLpRCjawBsXG+utLrbus6jL95NB2i/g32AHTJzANkw2KPZixV9rJ0DjRr0MYdavwLfRJ2GEo0rTV0ju+ZKoaj6ryYUw= Received: from SA0PR13CA0018.namprd13.prod.outlook.com (2603:10b6:806:130::23) by DM8PR02MB8198.namprd02.prod.outlook.com (2603:10b6:8:4::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5102.17; Thu, 24 Mar 2022 14:25:37 +0000 Received: from SN1NAM02FT0029.eop-nam02.prod.protection.outlook.com (2603:10b6:806:130:cafe::bb) by SA0PR13CA0018.outlook.office365.com (2603:10b6:806:130::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5102.8 via Frontend Transport; Thu, 24 Mar 2022 14:25:37 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 149.199.62.198) smtp.mailfrom=xilinx.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=xilinx.com; Received-SPF: Pass (protection.outlook.com: domain of xilinx.com designates 149.199.62.198 as permitted sender) receiver=protection.outlook.com; client-ip=149.199.62.198; helo=xsj-pvapexch02.xlnx.xilinx.com; Received: from xsj-pvapexch02.xlnx.xilinx.com (149.199.62.198) by SN1NAM02FT0029.mail.protection.outlook.com (10.97.4.175) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5102.17 via Frontend Transport; Thu, 24 Mar 2022 14:25:37 +0000 Received: from xsj-pvapexch02.xlnx.xilinx.com (172.19.86.41) by xsj-pvapexch02.xlnx.xilinx.com (172.19.86.41) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.14; Thu, 24 Mar 2022 07:25:20 -0700 Received: from smtp.xilinx.com (172.19.127.96) by xsj-pvapexch02.xlnx.xilinx.com (172.19.86.41) with Microsoft SMTP Server id 15.1.2176.14 via Frontend Transport; Thu, 24 Mar 2022 07:25:20 -0700 Envelope-to: sughosh.ganu@linaro.org, u-boot@lists.denx.de, xypron.glpk@gmx.de, ilias.apalodimas@linaro.org, takahiro.akashi@linaro.org, paul.liu@linaro.org, tuomas.tynkkynen@iki.fi, heiko.thiery@gmail.com, frieder.schrempf@kontron.de, michael@walle.cc, masami.hiramatsu@linaro.org, jaswinder.singh@linaro.org, monstr@monstr.eu Received: from [10.254.241.50] (port=43246) by smtp.xilinx.com with esmtp (Exim 4.90) (envelope-from ) id 1nXNY7-0006Hv-M0; Thu, 24 Mar 2022 06:30:48 -0700 Message-ID: Date: Thu, 24 Mar 2022 14:30:44 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.7.0 Subject: Re: [RFC PATCH 6/6] mkeficapsule: Remove raw and FIT GUID types Content-Language: en-US To: Sughosh Ganu , CC: Heinrich Schuchardt , Ilias Apalodimas , AKASHI Takahiro , Ying-Chun Liu , Tuomas Tynkkynen , Heiko Thiery , Frieder Schrempf , Michael Walle , Masami Hiramatsu , Jassi Brar , Michal Simek , Michal Simek References: <20220324123901.429472-1-sughosh.ganu@linaro.org> <20220324123901.429472-7-sughosh.ganu@linaro.org> From: Michal Simek In-Reply-To: <20220324123901.429472-7-sughosh.ganu@linaro.org> Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 7bit X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4fc035d5-3163-4857-2204-08da0da22a8e X-MS-TrafficTypeDiagnostic: DM8PR02MB8198:EE_ X-Microsoft-Antispam-PRVS: X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: tBF3gRqc9fjILooyEG6SXbxNdxqL/kNw7jnxE2onI8TiB/mouboqXYMcDrWCngsFDWUt7m9J1pY6ybHgM3MZiYnuJ+Q1PrO8PMQwXWZgs9YaRzorusj7y1YOP/t7EvLN8m9XYdW8blRx8+qxNxcI9CuxOKVCFRL/qNjThr8j3HQ/tm25rnJfec1sSXCp0ltqIWQTdnJ9v6RLTHlX1XxSZGTJAnDmNt3Q8Wjw5e0In5GoBirvgoZqwu6Cs3RGlo3Nfo/Q8waoMUxKND/4jCpYYgfUcgKQMWYXs6i4sbCm5clV3nDQ2fZh7qz3D6A3T2aOwhtM7jxs4EG//CJ13Urls5Znbfj02jQAHiAAYveucpe+wRWWG5DmuD6JqnuDLo2Md+/w8iRH0KSB1+LHPJL0lCvGYKfCpIE37JoeYT7qE0bQ7oOvuVCbU3/UV2Itt0IKGzzsFAx3ExT+SnmsZySN9tvjKmR0VDI5L/k4694Xbw84sJIdASO8YzgSyuTbZ9tZSUHT/h0JEqw7LdtDrY4IHnLp9UGf5o8Sz3DDK152DyK52hTuCa/qR8X1M0vPpzzTWcy2hs7GrGajzBg3yl6EvdO0OgvYnIBTvKZCqdQ9mzHI3nkmb2OA+DOkkEgcHYN8UVN+ZSvucyopHDce18Y+xE0h+Mdjr4KXpSiDz7O+n0oVTJRn4UBx7X98YHcCf7du3UxsfDM3daK1DMbNn1es11gIdoM0KJ7gnTe4TIFSE3o= X-Forefront-Antispam-Report: CIP:149.199.62.198; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:xsj-pvapexch02.xlnx.xilinx.com; PTR:unknown-62-198.xilinx.com; CAT:NONE; SFS:(13230001)(4636009)(36840700001)(40470700004)(46966006)(54906003)(47076005)(82310400004)(9786002)(26005)(107886003)(7416002)(316002)(53546011)(110136005)(36756003)(31696002)(186003)(44832011)(70206006)(7636003)(8936002)(2906002)(8676002)(83380400001)(6666004)(426003)(356005)(70586007)(336012)(40460700003)(5660300002)(508600001)(36860700001)(31686004)(2616005)(4326008)(50156003)(43740500002); DIR:OUT; SFP:1101; X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Mar 2022 14:25:37.3979 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4fc035d5-3163-4857-2204-08da0da22a8e X-MS-Exchange-CrossTenant-Id: 657af505-d5df-48d0-8300-c31994686c5c X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=657af505-d5df-48d0-8300-c31994686c5c; Ip=[149.199.62.198]; Helo=[xsj-pvapexch02.xlnx.xilinx.com] X-MS-Exchange-CrossTenant-AuthSource: SN1NAM02FT0029.eop-nam02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM8PR02MB8198 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 3/24/22 13:39, 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 > --- > 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, Can you please find a way how to export guid based on what you build? I think the best would be when capsules are enable to generated them directly as the part of build process with proper guids. Thanks, Michal