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 X-Spam-Level: X-Spam-Status: No, score=-12.5 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 96CC5C432BE for ; Wed, 28 Jul 2021 23:21:34 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 293A76052B for ; Wed, 28 Jul 2021 23:21:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 293A76052B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmx.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id DAD7882D73; Thu, 29 Jul 2021 01:21:30 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=gmx.de 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; secure) header.d=gmx.net header.i=@gmx.net header.b="KGVD148q"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4A85482D82; Thu, 29 Jul 2021 01:21:29 +0200 (CEST) Received: from mout.gmx.net (mout.gmx.net [212.227.17.22]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 62F0B82CDA for ; Thu, 29 Jul 2021 01:21:26 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=xypron.glpk@gmx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1627514485; bh=Ws29Umryff/HiynCUWjPRexaqN7i6bbEx65GIqTjCZ0=; h=X-UI-Sender-Class:Subject:To:Cc:References:From:Date:In-Reply-To; b=KGVD148qZ22jUaW6Egl61xVmftQUNNHzOpDrzy+bjaq94y9nWIEif6vbZFeqNWpsd LPKJWYL70bN6P1K9qfe4Jdl+eB8YaHUigWgwICGmkC1wQMLn5HcyOIQhDwG9SSNSo1 T7ElkbDTMLDRi2FCtuH1Ye+nRaO031QM8JlI8tdg= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from [192.168.123.35] ([88.152.144.157]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1N2V0B-1nBokM113v-013zC4; Thu, 29 Jul 2021 01:21:25 +0200 Subject: Re: [PATCH v2 3/9] disk: Tidy up #ifdefs in part_efi To: Simon Glass , U-Boot Mailing List Cc: Ilias Apalodimas , =?UTF-8?Q?Pali_Roh=c3=a1r?= , Mark Kettenis References: <20210702183620.1542680-1-sjg@chromium.org> <20210702123614.v2.3.I7bd629335158b7fc7203d59ae04f1895b65f9382@changeid> From: Heinrich Schuchardt Message-ID: <6cfb2079-ee30-cc16-a85a-c68cdac3a59e@gmx.de> Date: Thu, 29 Jul 2021 01:21:24 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 MIME-Version: 1.0 In-Reply-To: <20210702123614.v2.3.I7bd629335158b7fc7203d59ae04f1895b65f9382@changeid> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:OJAE55EiWTufuJMd0IfAGENldAIUoxOQjDFI9jRvNY0bZsTTUpg 9+jnVV6aBHYfjHde6vE+qAbieyCycvrOeqHCCvlkJFDUwB3I0p6QSnyPC9GIra/DcpUVnJT OF8Hl85G/p/WfR5BnSqw7uHeUoi6b6cRX+yhFeqRCZWqtlPz29qu/0iPKhb3uFlTYPvSx5u kh5a5MooeQcpBRqyhikNw== X-UI-Out-Filterresults: notjunk:1;V03:K0:bK7nBXcwVQQ=:qyAJEGCeEALoKiCpadkfsw M7f4fdZ5nKlOKxZdZ37NKc4nITrsm65/M68nxLJhYhrgwp6uWHE1eKXSqQwtX0iZr1cDzBYG9 9r1+Jrb9LxcQGe0T8GjaSwoeABnbJRaSnqVmotC6TpMp2OaaLaY2Qr4N8X1eN+WMjLMm3Uvcm AyWHLoltKgAso7CuFBjUL9KwAXVlu1Qq2YvXBWNSyOkntgsBJhAgmjyrXMci1Zr44MAbaQsVP 8o5OOwCCbrII+OVQzLOBjLXtNQ4OkAhFNqJrwVW7AvWIfydELeodIPlbWBVkgj2jMCTc6zUgR 3q5qe+91SNDlk5aYBAY6Q8MzXsYwePOrILgWSYenAfo6AKp6Dgo6Hg5DryjMHQzknNOjdr9lZ 4wl5nmhlocWwrPBEX48RunT37AUnbzyKb36ahVN9SSfTSY2SB57PCqFI2SPM4UOAhhXOi8Qju +RUyMwUCt74w9L+V9+77bPw6NWFfhE2VPFhQPIqADuyMv15JBIKNCW+X2eUXmK4heS6MZzTAK 4mTKlGKAkf1uxTCHKD1W51+Oeji/7y/AtCQXeKKuH8GwCe2aqRH13AjaQKZSeWYeJUEqLNIMV f6YypMvY12vVPcAbrtm7agf1VTmGUX7gX/L1O6Piyhsy7lgFuBDqYZbXlcB9Xxc7rMVQbg+mO rQL6XOUnLm0LkOLvu2HH/wSkWK6cdOQa1zJRmT3Yezv1FcbqvPtb9WuSa/U7I2bVKob07/ILl +YziJY/M28s9MZGPz3meAEo+spC/Wrg6UAbyJ97YU+9w7sWxKb3W2TiabU3EYUAnC/ivATIK2 w1NBJdoVNY0iHH6xMWy7tRpEgipJ6hVzoS71Pw8teMF0L5r1Du5FwioNCzp/aJ4sLvDSJD+y5 PzkUqo1cxilImDst1Qx23T+3qAM+AKYwyroMQ8lKryfr+1VG54m8Ohycm2iEy+WqD9WMjsjdV DCm/C0Dz3i7Uo8f8PKaTmPGztmsRMK+3VuzVK3MhJM1X2gaKbSMN1fWhLhMC26gn+tYP6Kkn5 S5pj3mSUJQoWWnUjh/hY3ieprOl7BfNYYagEdmNHd0qxvCFLWAgYrwpoKFp9hfwAGWDILEexn JO/gt6O45k9N50LnOlvEdwRTidVYBISeOOJ X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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.2 at phobos.denx.de X-Virus-Status: Clean On 7/2/21 8:36 PM, Simon Glass wrote: > This file does not correctly handle the various cases, sometimes > producing warnings about partition_basic_data_guid being defined but not > used. Fix it. > > There was some discussion about adjusting Kconfig or making > HAVE_BLOCK_DEVICE a prerequisite for PARTITIONS, but apparently this is > not feasible. Such changes can be undertaken separate from the goal of > this series. > > Signed-off-by: Simon Glass > --- > > Changes in v2: > - Update commit message > > disk/part_efi.c | 11 ++++++----- > 1 file changed, 6 insertions(+), 5 deletions(-) > > diff --git a/disk/part_efi.c b/disk/part_efi.c > index 0fb7ff0b6bb..fdca91a6974 100644 > --- a/disk/part_efi.c > +++ b/disk/part_efi.c > @@ -29,12 +29,13 @@ > > DECLARE_GLOBAL_DATA_PTR; > > -/* > - * GUID for basic data partions. > - */ > +#ifdef CONFIG_HAVE_BLOCK_DEVICE > + > +/* GUID for basic data partitons */ > +#if CONFIG_IS_ENABLED(EFI_PARTITION) We are using -fdata-sections. Doesn't the linker eliminate unused statics? Best regards Heinrich > static const efi_guid_t partition_basic_data_guid =3D PARTITION_BASIC_= DATA_GUID; > +#endif > > -#ifdef CONFIG_HAVE_BLOCK_DEVICE > /** > * efi_crc32() - EFI version of crc32 function > * @buf: buffer to calculate crc32 of > @@ -1126,4 +1127,4 @@ U_BOOT_PART_TYPE(a_efi) =3D { > .print =3D part_print_ptr(part_print_efi), > .test =3D part_test_efi, > }; > -#endif > +#endif /* CONFIG_HAVE_BLOCK_DEVICE */ >