mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Ahmad Fatoum <a.fatoum@pengutronix.de>
To: barebox@lists.infradead.org
Cc: Ahmad Fatoum <a.fatoum@pengutronix.de>
Subject: [PATCH] ARM: i.MX: HABv4: point out i.MX6 specifics in docs and Kconfig help text
Date: Thu, 21 Sep 2023 09:55:11 +0200	[thread overview]
Message-ID: <20230921075511.2098569-1-a.fatoum@pengutronix.de> (raw)

Signed USB images are a i.MX6 quirk as we need a point to DCD for
imx-usb-loader to work with, but the DCD pointer needs to be invalidated
for actual boot.

On i.MX8M*, RAM setup can't be done completely by DCD anymore, so not
having a DCD table is the norm and we don't need a signed USB image.

Thus mark CONFIG_HABV4_IMAGE_SIGNED_USB i.MX6 only and while at it, fix
hardcoded instances of i.MX6 headers.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 Documentation/boards/imx.rst |  6 +++---
 arch/arm/mach-imx/Kconfig    | 11 +++++++----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/Documentation/boards/imx.rst b/Documentation/boards/imx.rst
index 5a4f52b392d5..c64446aff640 100644
--- a/Documentation/boards/imx.rst
+++ b/Documentation/boards/imx.rst
@@ -150,7 +150,7 @@ Unlike the typical ``imximg`` file extension the following ones are used for
 these cases:
 
 * ``simximg``: generate signed image
-* ``usimximg``: generate signed USB image
+* ``usimximg``: generate signed USB image (i.MX6-specific)
 * ``esimximg``: generate encrypted and signed image
 
 The imx-image tool is then automatically called with the appropriate flags
@@ -168,9 +168,9 @@ keys/certificates are expected in these config variables (assuming HABv4):
   CONFIG_HABV4_IMG_CRT_PEM
 
 A CSF template is located in
-``include/mach/imx/habv4-imx6-gencsf.h`` which is preprocessed
+``include/mach/imx/habv4-imx*-gencsf.h`` which is preprocessed
 by barebox.
-It must be included in the board's flash header:
+It must be included in the board's flash header, e.g. for i.MX6:
 
 .. code-block:: none
 
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index 8cab6de7763f..2d55015e5acb 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -798,11 +798,13 @@ if HABV4
 config HABV4_IMAGE_SIGNED
 	bool "build signed images"
 	help
-	  enable the creation of a signed image, if the habv4-imx6-gencsf.h
-	  included in the flash-header and the NXP cst Tool is available
+	  enable the creation of a signed image, if the habv4-imx*-gencsf.h
+	  file appropriate for the SoC is included in the flash-header and
+	  the NXP cst Tool is available
 
 config HABV4_IMAGE_SIGNED_USB
 	bool "build signed USB images"
+	depends on ARCH_IMX6
 	help
 	  enable the creation of a usb signed image, if the habv4-imx6-gencsf.h
 	  included in the flash-header and the NXP cst Tool is available
@@ -810,8 +812,9 @@ config HABV4_IMAGE_SIGNED_USB
 config HABV4_IMAGE_SIGNED_ENCRYPTED
 	bool "build signed encrypted images"
 	help
-	  enable the creation of the encrypted image, if the habv4-imx6-gencsf.h
-	  included in the flash-header and the NXP cst Tool is available
+	  enable the creation of the encrypted image, if the habv4-imx*-gencsf.h
+	  file appropriate for the SoC is included in the flash-header and
+	  the NXP cst Tool is available
 
 endif
 
-- 
2.39.2




             reply	other threads:[~2023-09-21  7:57 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-09-21  7:55 Ahmad Fatoum [this message]
2023-09-21  8:51 ` 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=20230921075511.2098569-1-a.fatoum@pengutronix.de \
    --to=a.fatoum@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