From: Marco Felsch <m.felsch@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH 16/26] scripts: imx: move flexspi_image() into header
Date: Tue, 10 Oct 2023 16:33:04 +0200 [thread overview]
Message-ID: <20231010143314.2031253-17-m.felsch@pengutronix.de> (raw)
In-Reply-To: <20231010143314.2031253-1-m.felsch@pengutronix.de>
Move the flexspi_image() into the imx.h header to make the code reusable
between imx.c and imx-image.c. No functional change.
Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
---
scripts/imx/imx-image.c | 12 ------------
scripts/imx/imx.h | 13 +++++++++++++
2 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/scripts/imx/imx-image.c b/scripts/imx/imx-image.c
index 1f96b383901f..ecb16187de17 100644
--- a/scripts/imx/imx-image.c
+++ b/scripts/imx/imx-image.c
@@ -290,18 +290,6 @@ static int write_mem_v1(uint32_t addr, uint32_t val, int width, int set_bits, in
return 0;
}
-static bool flexspi_image(const struct config_data *data)
-{
- /*
- * | FlexSPI-FCFB | FlexSPI-IVT
- * -----------------------------------------
- * i.MX8MM | 0x0 | 0x1000
- * i.MX8MN/P | 0x400 | 0x0
- */
-
- return data->image_flexspi_ivt_offset || data->image_flexspi_fcfb_offset;
-}
-
/*
* ============================================================================
* i.MX flash header v2 handling. Found on i.MX50, i.MX53 and i.MX6
diff --git a/scripts/imx/imx.h b/scripts/imx/imx.h
index 08cdf8321a09..65697a9b0d43 100644
--- a/scripts/imx/imx.h
+++ b/scripts/imx/imx.h
@@ -15,4 +15,17 @@ static inline int cpu_is_mx8m(const struct config_data *data)
}
}
+static inline bool flexspi_image(const struct config_data *data)
+{
+ /*
+ * | FlexSPI-FCFB | FlexSPI-IVT
+ * -----------------------------------------
+ * i.MX8MM | 0x0 | 0x1000
+ * i.MX8MN/P | 0x400 | 0x0
+ */
+
+ return data->image_flexspi_ivt_offset ||
+ data->image_flexspi_fcfb_offset;
+}
+
int parse_config(struct config_data *data, const char *filename);
--
2.39.2
next prev parent reply other threads:[~2023-10-10 14:34 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 ` Marco Felsch [this message]
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
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=20231010143314.2031253-17-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