From: Marco Felsch <m.felsch@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH v2 18/29] scripts: imx: add imx8m_get_offset_size helper
Date: Tue, 17 Oct 2023 16:51:20 +0200 [thread overview]
Message-ID: <20231017145131.3069283-19-m.felsch@pengutronix.de> (raw)
In-Reply-To: <20231017145131.3069283-1-m.felsch@pengutronix.de>
No functional change, just move the offset and signed_size calculation
into a dedicated helper.
Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
---
Changelog:
v2:
- unchanged
- v1-link: https://lore.barebox.org/barebox/20231010143314.2031253-1-m.felsch@pengutronix.de/T/#t
scripts/imx/imx.c | 29 ++++++++++++++++++-----------
1 file changed, 18 insertions(+), 11 deletions(-)
diff --git a/scripts/imx/imx.c b/scripts/imx/imx.c
index 3cfa046504e3..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;
@@ -346,17 +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)) {
- unsigned int hdrlen = HEADER_LEN;
-
- 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
next prev parent reply other threads:[~2023-10-17 14:56 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-17 14:51 [PATCH v2 00/29] i.MX8M HAB Fixes Marco Felsch
2023-10-17 14:51 ` [PATCH v2 01/29] kbuild: clean start*_*.{p,ps}imximg files Marco Felsch
2023-10-17 14:51 ` [PATCH v2 02/29] i.MX: HABv4: fix event status comparison Marco Felsch
2023-10-17 14:51 ` [PATCH v2 03/29] i.MX: HABv4: fix i.MX8MQ device lockdown Marco Felsch
2023-10-17 14:51 ` [PATCH v2 04/29] i.MX: HAB: remove unused init() hook Marco Felsch
2023-10-17 14:51 ` [PATCH v2 05/29] i.MX: HABv4: extend support to i.MX8M SoCs Marco Felsch
2023-10-17 14:51 ` [PATCH v2 06/29] i.MX: HABv4: retrieve HAB ROM version for i.MX8M Marco Felsch
2023-10-17 14:51 ` [PATCH v2 07/29] ARM: i.MX: allow HAB for i.MX8M family Marco Felsch
2023-10-17 14:51 ` [PATCH v2 08/29] ARM: i.MX: introduce build_imx8m_habv4img Marco Felsch
2023-10-17 14:51 ` [PATCH v2 09/29] ARM: i.MX: convert i.MX8M to helper Marco Felsch
2023-10-17 14:51 ` [PATCH v2 10/29] ARM: boards: i.MX8M: add HAB image support Marco Felsch
2023-10-17 14:51 ` [PATCH v2 11/29] ARM: i.MX8M: add flexspi-imx8m{m,p}-cfg.h header Marco Felsch
2023-10-17 14:51 ` [PATCH v2 12/29] ARM: boards: i.MX8M: make use of new " Marco Felsch
2023-10-17 14:51 ` [PATCH v2 13/29] ARM: lds: introduce HAB_CSF_LEN define for the hab_csf section Marco Felsch
2023-10-17 14:51 ` [PATCH v2 14/29] ARM: lds: add support for a 2nd CSF area Marco Felsch
2023-10-17 14:51 ` [PATCH v2 15/29] scripts: imx: force flexspi and hab option order Marco Felsch
2023-10-17 14:51 ` [PATCH v2 16/29] scripts: imx: move flexspi_image() into header Marco Felsch
2023-10-17 14:51 ` [PATCH v2 17/29] scripts: imx: fix i.MX8M CSF header placement Marco Felsch
2023-10-17 14:51 ` Marco Felsch [this message]
2023-10-17 14:51 ` [PATCH v2 19/29] scripts: imx-image: header_v2: add CSF slots Marco Felsch
2023-10-17 14:51 ` [PATCH v2 20/29] scripts: imx-image: hab_sign: refactor function Marco Felsch
2023-10-17 14:51 ` [PATCH v2 21/29] scripts: imx: replace static string allocation Marco Felsch
2023-10-17 14:51 ` [PATCH v2 22/29] scripts: imx: add hab_qspi support Marco Felsch
2023-10-17 14:51 ` [PATCH v2 23/29] scripts: imx: add helper to write CSF Blocks command Marco Felsch
2023-10-17 14:51 ` [PATCH v2 24/29] scripts: imx: fix HAB for FlexSPI boot Marco Felsch
2023-10-17 14:51 ` [PATCH v2 25/29] scripts: imx-image: add missing close() Marco Felsch
2023-10-17 14:51 ` [PATCH v2 26/29] scripts: imx-image: add support for CST_EXTRA_CMDLINE_OPTIONS Marco Felsch
2023-10-17 14:51 ` [PATCH v2 27/29] ARM: i.MX: add hab qspi support if enabled Marco Felsch
2023-10-17 14:51 ` [PATCH v2 28/29] Documentation: boards: imx: replace i.MX8MQ with i.MX8M Marco Felsch
2023-10-17 14:51 ` [PATCH v2 29/29] Documentation: boards: imx: add FlexSPI sub-section Marco Felsch
2023-10-18 8:08 ` [PATCH v2 00/29] i.MX8M HAB Fixes Sascha Hauer
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=20231017145131.3069283-19-m.felsch@pengutronix.de \
--to=m.felsch@pengutronix.de \
--cc=barebox@lists.infradead.org \
/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