mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <sha@pengutronix.de>
To: Marco Felsch <m.felsch@pengutronix.de>
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH 21/26] scripts: imx: add helper to write CSF Blocks command
Date: Fri, 13 Oct 2023 09:28:59 +0200	[thread overview]
Message-ID: <20231013072859.GM3359458@pengutronix.de> (raw)
In-Reply-To: <20231010143314.2031253-22-m.felsch@pengutronix.de>

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 <m.felsch@pengutronix.de>
> ---
>  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?

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 |



  reply	other threads:[~2023-10-13  7:30 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-10-10 14:32 [PATCH 00/26] i.MX8M HAB Fixes Marco Felsch
2023-10-10 14:32 ` [PATCH 01/26] kbuild: clean start*_*.{p,ps}imximg files Marco Felsch
2023-10-10 14:32 ` [PATCH 02/26] i.MX: HABv4: fix event status comparison Marco Felsch
2023-10-10 14:32 ` [PATCH 03/26] i.MX: HABv4: fix i.MX8MQ device lockdown Marco Felsch
2023-10-10 18:35   ` [PATCH] fixup! " Ahmad Fatoum
2023-10-11  5:00     ` Marco Felsch
2023-10-10 14:32 ` [PATCH 04/26] i.MX: HAB: remove unused init() hook Marco Felsch
2023-10-10 14:32 ` [PATCH 05/26] i.MX: HABv4: extend support to i.MX8M SoCs Marco Felsch
2023-10-10 14:32 ` [PATCH 06/26] i.MX: HABv4: retrieve HAB ROM version for i.MX8M Marco Felsch
2023-10-10 14:32 ` [PATCH 07/26] ARM: i.MX: allow HAB for i.MX8M family Marco Felsch
2023-10-10 14:32 ` [PATCH 08/26] ARM: i.MX: introduce build_imx8m_habv4img Marco Felsch
2023-10-10 14:32 ` [PATCH 09/26] ARM: i.MX: convert i.MX8M to helper Marco Felsch
2023-10-10 14:32 ` [PATCH 10/26] ARM: boards: i.MX8M: add HAB image support Marco Felsch
2023-10-10 14:32 ` [PATCH 11/26] ARM: i.MX8M: add flexspi-imx8m{m,p}-cfg.h header Marco Felsch
2023-10-13  6:27   ` Sascha Hauer
2023-10-16  5:44     ` Marco Felsch
2023-10-10 14:33 ` [PATCH 12/26] ARM: boards: i.MX8M: make use of new " Marco Felsch
2023-10-10 14:33 ` [PATCH 13/26] ARM: lds: introduce HAB_CSF_LEN define for the hab_csf section Marco Felsch
2023-10-10 14:33 ` [PATCH 14/26] ARM: lds: add support for a 2nd CSF area Marco Felsch
2023-10-13  6:37   ` Sascha Hauer
2023-10-16  5:45     ` Marco Felsch
2023-10-10 14:33 ` [PATCH 15/26] scripts: imx: force flexspi and hab option order Marco Felsch
2023-10-10 14:33 ` [PATCH 16/26] scripts: imx: move flexspi_image() into header Marco Felsch
2023-10-10 14:33 ` [PATCH 17/26] scripts: imx: fix i.MX8M CSF header placement Marco Felsch
2023-10-10 14:33 ` [PATCH 18/26] scripts: imx: add imx8m_get_offset_size helper Marco Felsch
2023-10-10 14:33 ` [PATCH 19/26] scripts: imx-image: header_v2: add CSF slots Marco Felsch
2023-10-10 14:33 ` [PATCH 20/26] scripts: imx-image: hab_sign: refactor function Marco Felsch
2023-10-10 14:33 ` [PATCH 21/26] scripts: imx: add helper to write CSF Blocks command Marco Felsch
2023-10-13  7:28   ` Sascha Hauer [this message]
2023-10-16  5:50     ` Marco Felsch
2023-10-16  7:44       ` Marco Felsch
2023-10-16  8:19         ` Sascha Hauer
2023-10-17 14:58           ` Marco Felsch
2023-10-10 14:33 ` [PATCH 22/26] scripts: imx: fix HAB for FlexSPI boot Marco Felsch
2023-10-10 14:33 ` [PATCH 23/26] scripts: imx-image: add missing close() Marco Felsch
2023-10-10 14:33 ` [PATCH 24/26] scripts: imx-image: add support for CST_EXTRA_CMDLINE_OPTIONS Marco Felsch
2023-10-10 14:33 ` [PATCH 25/26] Documentation: boards: imx: replace i.MX8MQ with i.MX8M Marco Felsch
2023-10-10 14:33 ` [PATCH 26/26] Documentation: boards: imx: add FlexSPI sub-section Marco Felsch

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20231013072859.GM3359458@pengutronix.de \
    --to=sha@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    --cc=m.felsch@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox