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=-17.3 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS, 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 2DED6C47087 for ; Fri, 28 May 2021 12:53:54 +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 8171B6124B for ; Fri, 28 May 2021 12:53:53 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8171B6124B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=foss.st.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2541382EED; Fri, 28 May 2021 14:53:52 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=foss.st.com 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=foss.st.com header.i=@foss.st.com header.b="GyJldnEc"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 274EC82EEC; Fri, 28 May 2021 14:53:51 +0200 (CEST) Received: from mx07-00178001.pphosted.com (mx07-00178001.pphosted.com [185.132.182.106]) (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 5D6B982EF1 for ; Fri, 28 May 2021 14:53:48 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=foss.st.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=patrice.chotard@foss.st.com Received: from pps.filterd (m0046668.ppops.net [127.0.0.1]) by mx07-00178001.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 14SCqLmA013207; Fri, 28 May 2021 14:53:46 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foss.st.com; h=subject : to : cc : references : from : message-id : date : mime-version : in-reply-to : content-type : content-transfer-encoding; s=selector1; bh=OwBLzFzecmm8GSg5zXQ0raQmi35c2kyhuVPHDg9zHuM=; b=GyJldnEclkVWsAbExhNr7CNtn6LxnQEr8VI83H8UFN50I+6A9Cdtyq5ZBZEgsum19O+w 3a67WG5/szezXfba52essldBwQ1zfvye1PXW2gpxESHg2g3vVXQNKKouh9GE+RDSKV/s 30NDUh7k0i0FL/G6lfhfGr4CEsCJJy3qmp07uoDKfw894/KUJ5SXcHa2OG7mgom7ZzrJ v/zU+3IuKGKPKrawzy/FokXgBgGh7ro8KeSpHdLBvVdx0k52F9kzqV3uLd0ZMf80L9s5 kn/SIc+emWxdO2o7PvoQihejbNRYWfVb5/LSy/yD9F+Nht/eO7oteOeKwav4VvQecos4 Ng== Received: from beta.dmz-eu.st.com (beta.dmz-eu.st.com [164.129.1.35]) by mx07-00178001.pphosted.com with ESMTP id 38tsq0jhqr-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 28 May 2021 14:53:46 +0200 Received: from euls16034.sgp.st.com (euls16034.sgp.st.com [10.75.44.20]) by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id D084C10002A; Fri, 28 May 2021 14:53:45 +0200 (CEST) Received: from Webmail-eu.st.com (sfhdag2node3.st.com [10.75.127.6]) by euls16034.sgp.st.com (STMicroelectronics) with ESMTP id C4BFD2291B2; Fri, 28 May 2021 14:53:45 +0200 (CEST) Received: from lmecxl0573.lme.st.com (10.75.127.47) by SFHDAG2NODE3.st.com (10.75.127.6) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Fri, 28 May 2021 14:53:45 +0200 Subject: Re: [PATCH 04/10] stm32mp: stm32prog: solve compilation with CONFIG_FIT_SIGNATURE To: Patrick Delaunay , CC: Bin Meng , Patrick Delaunay , Simon Glass , U-Boot STM32 References: <20210518131213.20343-1-patrick.delaunay@foss.st.com> <20210518151206.4.I44c0cbd50fa01f82729d1d6d435d0f663b9e7dcb@changeid> From: Patrice CHOTARD Message-ID: <20c75ee4-fffd-80f5-eab2-93d732a497c5@foss.st.com> Date: Fri, 28 May 2021 14:53:44 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <20210518151206.4.I44c0cbd50fa01f82729d1d6d435d0f663b9e7dcb@changeid> Content-Type: text/plain; charset="utf-8" Content-Language: en-US Content-Transfer-Encoding: 8bit X-Originating-IP: [10.75.127.47] X-ClientProxiedBy: SFHDAG2NODE2.st.com (10.75.127.5) To SFHDAG2NODE3.st.com (10.75.127.6) X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.391, 18.0.761 definitions=2021-05-28_04:2021-05-27, 2021-05-28 signatures=0 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.102.4 at phobos.denx.de X-Virus-Status: Clean Hi Patrick On 5/18/21 3:12 PM, Patrick Delaunay wrote: > When CONFIG_FIT_SIGNATURE is activated, CONFIG_LEGACY_IMAGE_FORMAT > is deactivated and the define IMAGE_FORMAT_LEGACY don't exist with > include/image.h: > #if defined(CONFIG_LEGACY_IMAGE_FORMAT) > #define IMAGE_FORMAT_LEGACY 0x01 /* legacy image_header based format */ > #endif > > This patch adds the needed check on compilation flag > CONFIG_LEGACY_IMAGE_FORMAT to avoid the compilation error > for command stm32prog: > > cmd_stm32prog.c:81:8: error: ‘IMAGE_FORMAT_LEGACY’ undeclared > (first use in this function); did you mean ‘IMAGE_FORMAT_FIT’? > 81 | if (IMAGE_FORMAT_LEGACY == > | ^~~~~~~~~~~~~~~~~~~ > | IMAGE_FORMAT_FIT > > Signed-off-by: Patrick Delaunay > --- > > arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c b/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c > index e584bb52bd..f3790f900f 100644 > --- a/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c > +++ b/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c > @@ -77,10 +77,12 @@ static int do_stm32prog(struct cmd_tbl *cmdtp, int flag, int argc, > if (header.type == HEADER_STM32IMAGE) { > size = header.image_length + BL_HEADER_SIZE; > > +#if defined(CONFIG_LEGACY_IMAGE_FORMAT) > /* uImage detected in STM32IMAGE, execute the script */ > if (IMAGE_FORMAT_LEGACY == > genimg_get_format((void *)(addr + BL_HEADER_SIZE))) > return image_source_script(addr + BL_HEADER_SIZE, "script@1"); > +#endif > } > } > > Reviewed-by: Patrice Chotard Thanks Patrice