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. Please note that the struct config_data 'flexspi_csf' member is added in the follow up commit. Signed-off-by: Marco Felsch <m.fel...@pengutronix.de> --- Changelog: v2: - use new strcata() helper - v1-link: https://lore.barebox.org/barebox/20231010143314.2031253-1-m.fel...@pengutronix.de/T/#t 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 12c0df063469..5526fe41b477 100644 --- a/scripts/imx/imx.c +++ b/scripts/imx/imx.c @@ -325,6 +325,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) +{ + data->csf = strcata(data->csf, csf_str); + if (!data->csf) + return -ENOMEM; + + if (!flexspi_csf_str) + return 0; + + data->flexspi_csf = strcata(data->flexspi_csf, flexspi_csf_str); + if (!data->flexspi_csf) + return -ENOMEM; + + return 0; +} + static int do_hab(struct config_data *data, int argc, char *argv[]) { int i, ret; @@ -364,7 +382,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; @@ -399,7 +417,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
