No functional change, just move the offset and signed_size calculation
into a dedicated helper.
Signed-off-by: Marco Felsch <m.felsch@xxxxxxxxxxxxxx>
---
scripts/imx/imx.c | 28 ++++++++++++++++++----------
1 file changed, 18 insertions(+), 10 deletions(-)
diff --git a/scripts/imx/imx.c b/scripts/imx/imx.c
index b3c13510af84..933019eba449 100644
--- a/scripts/imx/imx.c
+++ b/scripts/imx/imx.c
@@ -325,6 +325,22 @@ static int do_hab(struct config_data *data, int argc, char *argv[])
return 0;
}
+static void
+imx8m_get_offset_size(struct config_data *data,
+ uint32_t *offset, uint32_t *signed_length)
+{
+ unsigned int hdrlen = HEADER_LEN;
+
+ if (flexspi_image(data))
+ hdrlen += FLEXSPI_HEADER_LEN;
+
+ *signed_size = roundup(data->pbl_code_size + hdrlen, 0x1000);
+
+ *offset += data->header_gap;
+ if (data->signed_hdmi_firmware_file)
+ *offset += PLUGIN_HDMI_SIZE;
+}
+
static int do_hab_blocks(struct config_data *data, int argc, char *argv[])
{
char *str;
@@ -332,7 +348,6 @@ static int do_hab_blocks(struct config_data *data, int argc, char *argv[])
int i;
uint32_t signed_size = data->load_size;
uint32_t offset = data->image_ivt_offset;
- unsigned int hdrlen = HEADER_LEN;
if (!data->csf)
return -EINVAL;
@@ -347,15 +362,8 @@ static int do_hab_blocks(struct config_data *data, int argc, char *argv[])
/*
* Ensure we only sign the PBL for i.MX8MQ
*/
- if (data->pbl_code_size && cpu_is_mx8m(data)) {
- if (flexspi_image(data))
- hdrlen += FLEXSPI_HEADER_LEN;
-
- offset += data->header_gap;
- signed_size = roundup(data->pbl_code_size + hdrlen, 0x1000);
- if (data->signed_hdmi_firmware_file)
- offset += PLUGIN_HDMI_SIZE;
- }
+ if (data->pbl_code_size && cpu_is_mx8m(data))
+ imx8m_get_offset_size(data, &offset, &signed_size)
if (signed_size > 0) {
ret = asprintf(&str, "Blocks = 0x%08x 0x%08x 0x%08x \"%s\"",
--
2.39.2
