From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 16 Oct 2023 09:46:27 +0200 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1qsIJ1-00AKGA-Eo for lore@lore.pengutronix.de; Mon, 16 Oct 2023 09:46:27 +0200 Received: from bombadil.infradead.org ([2607:7c80:54:3::133]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qsIIx-0005kx-FP for lore@pengutronix.de; Mon, 16 Oct 2023 09:46:26 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:In-Reply-To:Content-Type: MIME-Version:References:Message-ID:Subject:Cc:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=M7tUzOYU/6P/36UD8QDY4Eor9UB5YkbCKu0juOZPDvM=; b=0C1PO2nnKmlmSOG0z4v0M7pLUw QFTC3N61+3sBymVCF8VvRZO8OYbqn/g7bjGKmrKinKasR8mvTPY0FcyPGDQoiXuzfcSnqMNxAVTHC DKO3QcRFK4C029B5Qyiz6XoSt84AoBv1hPQ/T6+q7yB/rQvtciBhLtKPsASRAVAZvGsjebwAUdG3n lnBNmFMhm9XOCWvJ7LASKR92r4EApsHKCPr14uAmZaxuEh4nok5rM427evbEN9afV0xHhZLSTMGgF EtmMKkCgpcWqK2fI4vx/hUyi2u6t/CazU4+F9MuGHc28qPoBbtENtf5ywv2hJqk3zWFQaWjCMqhdu j0eMA6Dg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qsIHc-008hM9-0v; Mon, 16 Oct 2023 07:45:00 +0000 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qsIHY-008hLi-0j for barebox@lists.infradead.org; Mon, 16 Oct 2023 07:44:57 +0000 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qsIHU-0005XB-Fj; Mon, 16 Oct 2023 09:44:52 +0200 Received: from [2a0a:edc0:2:b01:1d::c0] (helo=ptx.whiteo.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1qsIHS-0021z0-Be; Mon, 16 Oct 2023 09:44:50 +0200 Received: from mfe by ptx.whiteo.stw.pengutronix.de with local (Exim 4.92) (envelope-from ) id 1qsIHS-00Ehfq-9M; Mon, 16 Oct 2023 09:44:50 +0200 Date: Mon, 16 Oct 2023 09:44:50 +0200 From: Marco Felsch To: Sascha Hauer Cc: barebox@lists.infradead.org Message-ID: <20231016074450.cu7kxp4y4pfc5djl@pengutronix.de> References: <20231010143314.2031253-1-m.felsch@pengutronix.de> <20231010143314.2031253-22-m.felsch@pengutronix.de> <20231013072859.GM3359458@pengutronix.de> <20231016055025.7kpbyiviqykrwy4k@pengutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20231016055025.7kpbyiviqykrwy4k@pengutronix.de> User-Agent: NeoMutt/20180716 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231016_004456_288098_48FDA5A4 X-CRM114-Status: GOOD ( 27.78 ) X-BeenThere: barebox@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "barebox" X-SA-Exim-Connect-IP: 2607:7c80:54:3::133 X-SA-Exim-Mail-From: barebox-bounces+lore=pengutronix.de@lists.infradead.org X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.whiteo.stw.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-4.9 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: Re: [PATCH 21/26] scripts: imx: add helper to write CSF Blocks command X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.whiteo.stw.pengutronix.de) Hi Sascha, On 23-10-16, Marco Felsch wrote: > On 23-10-13, Sascha Hauer wrote: > > On Tue, Oct 10, 2023 at 04:33:09PM +0200, Marco Felsch wrote: > > > The upcoming commit fixes the HAB support for FlexSPI enabled barebox > > > images. This commit prepares the source to keep the diff smaller. > > > > > > For the upcoming fix we need a 2nd CSF command sequence which is > > > basically the same as the first except for the "Blocks = ...." command. > > > Therefore we need to handle the blocks command separately which is done > > > by this commit. At the moment there is no functional change. > > > > > > Signed-off-by: Marco Felsch > > > --- > > > scripts/imx/imx.c | 22 ++++++++++++++++++++-- > > > 1 file changed, 20 insertions(+), 2 deletions(-) > > > > > > diff --git a/scripts/imx/imx.c b/scripts/imx/imx.c > > > index 933019eba449..acc8424e547d 100644 > > > --- a/scripts/imx/imx.c > > > +++ b/scripts/imx/imx.c > > > @@ -296,6 +296,24 @@ static int hab_add_str(struct config_data *data, const char *str) > > > return 0; > > > } > > > > > > +static int hab_add_barebox_blocks(struct config_data *data, > > > + const char *csf_str, > > > + const char *flexspi_csf_str) > > > +{ > > > + int len = strlen(csf_str); > > > + > > > + if (data->csf_space < len) > > > + return -ENOMEM; > > > + > > > + strcat(data->csf, csf_str); > > > + if (flexspi_csf_str) > > > + strcat(data->flexspi_csf, flexspi_csf_str); > > > > Do we need a space check here as well? > > To be 100% accurate yes since the strings can have different lengths > albeit the difference would be <5 chars. I will rework that, thanks for > the review. While integrating your review feedback I noticed that my comment was wrong. Both strings using the same size limited format string: "Blocks = 0x%08x 0x%08x 0x%08x \"%s\"" with "%s" always point to data->outfile. So both stings do not differ and checking csf_str in enough. Regards, Marco > > Regards, > Marco > > > > > Sascha > > > > > + > > > + data->csf_space -= len; > > > + > > > + return 0; > > > +} > > > + > > > static int do_hab(struct config_data *data, int argc, char *argv[]) > > > { > > > int i, ret; > > > @@ -343,7 +361,7 @@ imx8m_get_offset_size(struct config_data *data, > > > > > > static int do_hab_blocks(struct config_data *data, int argc, char *argv[]) > > > { > > > - char *str; > > > + char *str, *flexspi_str = NULL; > > > int ret; > > > int i; > > > uint32_t signed_size = data->load_size; > > > @@ -378,7 +396,7 @@ static int do_hab_blocks(struct config_data *data, int argc, char *argv[]) > > > if (ret < 0) > > > return -ENOMEM; > > > > > > - ret = hab_add_str(data, str); > > > + ret = hab_add_barebox_blocks(data, str, flexspi_str); > > > free(str); > > > if (ret) > > > return ret; > > > -- > > > 2.39.2 > > > > > > > > > > > > > -- > > Pengutronix e.K. | | > > Steuerwalder Str. 21 | http://www.pengutronix.de/ | > > 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | > > Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | > > > >