[PATCH 1/4] ARM: boards: i.MX8M: add HAB support

[PATCH 1/4] ARM: boards: i.MX8M: add HAB support

[Marco Felsch]

The gencsf header is required to build HAB (secure-boot) compatible
images. This commit add the support for this for all i.MX8M boards.

To finally build HAB compatible images the CONFIG_HABV4 and
CONFIG_HABV4_IMAGE_SIGNED must be enabled.

Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
---
 .../boards/innocomm-imx8mm-wb15/flash-header-imx8mm-wb15.imxcfg | 2 ++
 .../flash-header-imx8mm-phyboard-polis-rdk.imxcfg               | 2 ++
 .../boards/phytec-som-imx8mq/flash-header-phycore-imx8mq.imxcfg | 2 ++
 arch/arm/boards/polyhex-debix/flash-header-polyhex-debix.imxcfg | 2 ++
 arch/arm/boards/protonic-imx8m/flash-header-prt8mm.imxcfg       | 2 ++
 arch/arm/boards/skov-imx8mp/flash-header-skov-imx8mp.imxcfg     | 2 ++
 arch/arm/boards/tqma8mpxl/flash-header-tqma8mpxl.imxcfg         | 2 ++
 .../flash-header-imx8mp-dart.imxcfg                             | 2 ++
 .../boards/zii-imx8mq-dev/flash-header-zii-imx8mq-dev.imxcfg    | 2 ++
 9 files changed, 18 insertions(+)

diff --git a/arch/arm/boards/innocomm-imx8mm-wb15/flash-header-imx8mm-wb15.imxcfg b/arch/arm/boards/innocomm-imx8mm-wb15/flash-header-imx8mm-wb15.imxcfg
index 10606ce29c96..8aff991618ec 100644
--- a/arch/arm/boards/innocomm-imx8mm-wb15/flash-header-imx8mm-wb15.imxcfg
+++ b/arch/arm/boards/innocomm-imx8mm-wb15/flash-header-imx8mm-wb15.imxcfg
@@ -5,3 +5,5 @@ soc imx8mm
 loadaddr 0x007e1000
 max_load_size 0x3f000
 ivtofs 0x400
+
+#include <mach/imx/habv4-imx8-gencsf.h>
diff --git a/arch/arm/boards/phytec-som-imx8mm/flash-header-imx8mm-phyboard-polis-rdk.imxcfg b/arch/arm/boards/phytec-som-imx8mm/flash-header-imx8mm-phyboard-polis-rdk.imxcfg
index 10606ce29c96..8aff991618ec 100644
--- a/arch/arm/boards/phytec-som-imx8mm/flash-header-imx8mm-phyboard-polis-rdk.imxcfg
+++ b/arch/arm/boards/phytec-som-imx8mm/flash-header-imx8mm-phyboard-polis-rdk.imxcfg
@@ -5,3 +5,5 @@ soc imx8mm
 loadaddr 0x007e1000
 max_load_size 0x3f000
 ivtofs 0x400
+
+#include <mach/imx/habv4-imx8-gencsf.h>
diff --git a/arch/arm/boards/phytec-som-imx8mq/flash-header-phycore-imx8mq.imxcfg b/arch/arm/boards/phytec-som-imx8mq/flash-header-phycore-imx8mq.imxcfg
index 93cf14f26ba5..f82759f8499a 100644
--- a/arch/arm/boards/phytec-som-imx8mq/flash-header-phycore-imx8mq.imxcfg
+++ b/arch/arm/boards/phytec-som-imx8mq/flash-header-phycore-imx8mq.imxcfg
@@ -5,3 +5,5 @@ soc imx8mq
 loadaddr 0x007E1000
 max_load_size 0x3F000
 ivtofs 0x400
+
+#include <mach/imx/habv4-imx8-gencsf.h>
diff --git a/arch/arm/boards/polyhex-debix/flash-header-polyhex-debix.imxcfg b/arch/arm/boards/polyhex-debix/flash-header-polyhex-debix.imxcfg
index 663bd102e9a2..6ea2e6c68ed7 100644
--- a/arch/arm/boards/polyhex-debix/flash-header-polyhex-debix.imxcfg
+++ b/arch/arm/boards/polyhex-debix/flash-header-polyhex-debix.imxcfg
@@ -5,3 +5,5 @@ soc imx8mp
 loadaddr 0x920000
 max_load_size 0x3f000
 ivtofs 0x0
+
+#include <mach/imx/habv4-imx8-gencsf.h>
diff --git a/arch/arm/boards/protonic-imx8m/flash-header-prt8mm.imxcfg b/arch/arm/boards/protonic-imx8m/flash-header-prt8mm.imxcfg
index 10606ce29c96..8aff991618ec 100644
--- a/arch/arm/boards/protonic-imx8m/flash-header-prt8mm.imxcfg
+++ b/arch/arm/boards/protonic-imx8m/flash-header-prt8mm.imxcfg
@@ -5,3 +5,5 @@ soc imx8mm
 loadaddr 0x007e1000
 max_load_size 0x3f000
 ivtofs 0x400
+
+#include <mach/imx/habv4-imx8-gencsf.h>
diff --git a/arch/arm/boards/skov-imx8mp/flash-header-skov-imx8mp.imxcfg b/arch/arm/boards/skov-imx8mp/flash-header-skov-imx8mp.imxcfg
index 663bd102e9a2..6ea2e6c68ed7 100644
--- a/arch/arm/boards/skov-imx8mp/flash-header-skov-imx8mp.imxcfg
+++ b/arch/arm/boards/skov-imx8mp/flash-header-skov-imx8mp.imxcfg
@@ -5,3 +5,5 @@ soc imx8mp
 loadaddr 0x920000
 max_load_size 0x3f000
 ivtofs 0x0
+
+#include <mach/imx/habv4-imx8-gencsf.h>
diff --git a/arch/arm/boards/tqma8mpxl/flash-header-tqma8mpxl.imxcfg b/arch/arm/boards/tqma8mpxl/flash-header-tqma8mpxl.imxcfg
index 663bd102e9a2..6ea2e6c68ed7 100644
--- a/arch/arm/boards/tqma8mpxl/flash-header-tqma8mpxl.imxcfg
+++ b/arch/arm/boards/tqma8mpxl/flash-header-tqma8mpxl.imxcfg
@@ -5,3 +5,5 @@ soc imx8mp
 loadaddr 0x920000
 max_load_size 0x3f000
 ivtofs 0x0
+
+#include <mach/imx/habv4-imx8-gencsf.h>
diff --git a/arch/arm/boards/variscite-dt8mcustomboard-imx8mp/flash-header-imx8mp-dart.imxcfg b/arch/arm/boards/variscite-dt8mcustomboard-imx8mp/flash-header-imx8mp-dart.imxcfg
index 2b104edfb741..c3149a197f7d 100644
--- a/arch/arm/boards/variscite-dt8mcustomboard-imx8mp/flash-header-imx8mp-dart.imxcfg
+++ b/arch/arm/boards/variscite-dt8mcustomboard-imx8mp/flash-header-imx8mp-dart.imxcfg
@@ -5,3 +5,5 @@ soc imx8mp
 loadaddr 0x918000
 max_load_size 0x3f000
 ivtofs 0x0
+
+#include <mach/imx/habv4-imx8-gencsf.h>
diff --git a/arch/arm/boards/zii-imx8mq-dev/flash-header-zii-imx8mq-dev.imxcfg b/arch/arm/boards/zii-imx8mq-dev/flash-header-zii-imx8mq-dev.imxcfg
index 93cf14f26ba5..f82759f8499a 100644
--- a/arch/arm/boards/zii-imx8mq-dev/flash-header-zii-imx8mq-dev.imxcfg
+++ b/arch/arm/boards/zii-imx8mq-dev/flash-header-zii-imx8mq-dev.imxcfg
@@ -5,3 +5,5 @@ soc imx8mq
 loadaddr 0x007E1000
 max_load_size 0x3F000
 ivtofs 0x400
+
+#include <mach/imx/habv4-imx8-gencsf.h>
-- 
2.39.2

[PATCH 2/4] ARM: boars: i.MX8MQ: align SPDX header with other imxcfg files

[Marco Felsch]

Align the SPDX-License-Identifier information with the other .imxcfg
files. While on it add a space to separate the gencsf header from the
the remaining options. No functional changes.

Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
---
 arch/arm/boards/mnt-reform/flash-header-mnt-reform.imxcfg     | 3 ++-
 arch/arm/boards/nxp-imx8mq-evk/flash-header-imx8mq-evk.imxcfg | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boards/mnt-reform/flash-header-mnt-reform.imxcfg b/arch/arm/boards/mnt-reform/flash-header-mnt-reform.imxcfg
index 0f68c25b91f0..f82759f8499a 100644
--- a/arch/arm/boards/mnt-reform/flash-header-mnt-reform.imxcfg
+++ b/arch/arm/boards/mnt-reform/flash-header-mnt-reform.imxcfg
@@ -1,8 +1,9 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
+# SPDX-License-Identifier: GPL-2.0-only
 
 soc imx8mq
 
 loadaddr 0x007E1000
 max_load_size 0x3F000
 ivtofs 0x400
+
 #include <mach/imx/habv4-imx8-gencsf.h>
diff --git a/arch/arm/boards/nxp-imx8mq-evk/flash-header-imx8mq-evk.imxcfg b/arch/arm/boards/nxp-imx8mq-evk/flash-header-imx8mq-evk.imxcfg
index 0f68c25b91f0..f82759f8499a 100644
--- a/arch/arm/boards/nxp-imx8mq-evk/flash-header-imx8mq-evk.imxcfg
+++ b/arch/arm/boards/nxp-imx8mq-evk/flash-header-imx8mq-evk.imxcfg
@@ -1,8 +1,9 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
+# SPDX-License-Identifier: GPL-2.0-only
 
 soc imx8mq
 
 loadaddr 0x007E1000
 max_load_size 0x3F000
 ivtofs 0x400
+
 #include <mach/imx/habv4-imx8-gencsf.h>
-- 
2.39.2

Re: [PATCH 2/4] ARM: boars: i.MX8MQ: align SPDX header with other imxcfg files

[Marco Felsch]

Hi Sascha,

On 24-01-02, Marco Felsch wrote:
> Align the SPDX-License-Identifier information with the other .imxcfg
> files. While on it add a space to separate the gencsf header from the
> the remaining options. No functional changes.
> 
> Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>

I noticed a typo within the subject right after sending the patch, can
you fix this while applying?

Regards,
  Marco

> ---
>  arch/arm/boards/mnt-reform/flash-header-mnt-reform.imxcfg     | 3 ++-
>  arch/arm/boards/nxp-imx8mq-evk/flash-header-imx8mq-evk.imxcfg | 3 ++-
>  2 files changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm/boards/mnt-reform/flash-header-mnt-reform.imxcfg b/arch/arm/boards/mnt-reform/flash-header-mnt-reform.imxcfg
> index 0f68c25b91f0..f82759f8499a 100644
> --- a/arch/arm/boards/mnt-reform/flash-header-mnt-reform.imxcfg
> +++ b/arch/arm/boards/mnt-reform/flash-header-mnt-reform.imxcfg
> @@ -1,8 +1,9 @@
> -/* SPDX-License-Identifier: GPL-2.0-only */
> +# SPDX-License-Identifier: GPL-2.0-only
>  
>  soc imx8mq
>  
>  loadaddr 0x007E1000
>  max_load_size 0x3F000
>  ivtofs 0x400
> +
>  #include <mach/imx/habv4-imx8-gencsf.h>
> diff --git a/arch/arm/boards/nxp-imx8mq-evk/flash-header-imx8mq-evk.imxcfg b/arch/arm/boards/nxp-imx8mq-evk/flash-header-imx8mq-evk.imxcfg
> index 0f68c25b91f0..f82759f8499a 100644
> --- a/arch/arm/boards/nxp-imx8mq-evk/flash-header-imx8mq-evk.imxcfg
> +++ b/arch/arm/boards/nxp-imx8mq-evk/flash-header-imx8mq-evk.imxcfg
> @@ -1,8 +1,9 @@
> -/* SPDX-License-Identifier: GPL-2.0-only */
> +# SPDX-License-Identifier: GPL-2.0-only
>  
>  soc imx8mq
>  
>  loadaddr 0x007E1000
>  max_load_size 0x3F000
>  ivtofs 0x400
> +
>  #include <mach/imx/habv4-imx8-gencsf.h>
> -- 
> 2.39.2
> 
> 
> 

[PATCH 3/4] images: Makefile.imx: add i.MX9 comment

[Marco Felsch]

We have separate sections for each i.MX SoC within the makefile, add one
for the i.MX9 SoC too.

Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
---
 images/Makefile.imx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/images/Makefile.imx b/images/Makefile.imx
index 693f7ca12a7e..a4f50892eb0d 100644
--- a/images/Makefile.imx
+++ b/images/Makefile.imx
@@ -496,6 +496,7 @@ MAX_PBL_MEMORY_SIZE_start_mnt_reform = 0x3f000
 FILE_barebox-mnt-reform.img = start_mnt_reform.pblb.imximg
 image-$(CONFIG_MACH_MNT_REFORM) += barebox-mnt-reform.img
 
+# ----------------------- i.MX9 based boards --------------------------
 quiet_cmd_imx9img = IMX9IMG  $@
 cmd_imx9img = $(objtree)/scripts/imx9image -soc IMX9 -c -ap $< a55 0x2049A000 -out $@ \
 		-pblsize $($(patsubst $(obj)/%.pblb,PBL_MEMORY_SIZE_%,$<)) > /dev/null
-- 
2.39.2

[PATCH 4/4] ARM: boards: polyhex-debix: fix file mode for 8g-lpddr4-timing.c

[Marco Felsch]

Drop the execution mode from the file.

Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
---
 arch/arm/boards/polyhex-debix/8g-lpddr4-timing.c | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 arch/arm/boards/polyhex-debix/8g-lpddr4-timing.c

diff --git a/arch/arm/boards/polyhex-debix/8g-lpddr4-timing.c b/arch/arm/boards/polyhex-debix/8g-lpddr4-timing.c
old mode 100755
new mode 100644
-- 
2.39.2

Re: [PATCH 1/4] ARM: boards: i.MX8M: add HAB support

[Sascha Hauer]

On Tue, Jan 02, 2024 at 12:01:15PM +0100, Marco Felsch wrote:
> The gencsf header is required to build HAB (secure-boot) compatible
> images. This commit add the support for this for all i.MX8M boards.
> 
> To finally build HAB compatible images the CONFIG_HABV4 and
> CONFIG_HABV4_IMAGE_SIGNED must be enabled.
> 
> Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
> ---
>  .../boards/innocomm-imx8mm-wb15/flash-header-imx8mm-wb15.imxcfg | 2 ++
>  .../flash-header-imx8mm-phyboard-polis-rdk.imxcfg               | 2 ++
>  .../boards/phytec-som-imx8mq/flash-header-phycore-imx8mq.imxcfg | 2 ++
>  arch/arm/boards/polyhex-debix/flash-header-polyhex-debix.imxcfg | 2 ++
>  arch/arm/boards/protonic-imx8m/flash-header-prt8mm.imxcfg       | 2 ++
>  arch/arm/boards/skov-imx8mp/flash-header-skov-imx8mp.imxcfg     | 2 ++
>  arch/arm/boards/tqma8mpxl/flash-header-tqma8mpxl.imxcfg         | 2 ++
>  .../flash-header-imx8mp-dart.imxcfg                             | 2 ++
>  .../boards/zii-imx8mq-dev/flash-header-zii-imx8mq-dev.imxcfg    | 2 ++
>  9 files changed, 18 insertions(+)

Applied, thanks

Sascha

> 
> diff --git a/arch/arm/boards/innocomm-imx8mm-wb15/flash-header-imx8mm-wb15.imxcfg b/arch/arm/boards/innocomm-imx8mm-wb15/flash-header-imx8mm-wb15.imxcfg
> index 10606ce29c96..8aff991618ec 100644
> --- a/arch/arm/boards/innocomm-imx8mm-wb15/flash-header-imx8mm-wb15.imxcfg
> +++ b/arch/arm/boards/innocomm-imx8mm-wb15/flash-header-imx8mm-wb15.imxcfg
> @@ -5,3 +5,5 @@ soc imx8mm
>  loadaddr 0x007e1000
>  max_load_size 0x3f000
>  ivtofs 0x400
> +
> +#include <mach/imx/habv4-imx8-gencsf.h>
> diff --git a/arch/arm/boards/phytec-som-imx8mm/flash-header-imx8mm-phyboard-polis-rdk.imxcfg b/arch/arm/boards/phytec-som-imx8mm/flash-header-imx8mm-phyboard-polis-rdk.imxcfg
> index 10606ce29c96..8aff991618ec 100644
> --- a/arch/arm/boards/phytec-som-imx8mm/flash-header-imx8mm-phyboard-polis-rdk.imxcfg
> +++ b/arch/arm/boards/phytec-som-imx8mm/flash-header-imx8mm-phyboard-polis-rdk.imxcfg
> @@ -5,3 +5,5 @@ soc imx8mm
>  loadaddr 0x007e1000
>  max_load_size 0x3f000
>  ivtofs 0x400
> +
> +#include <mach/imx/habv4-imx8-gencsf.h>
> diff --git a/arch/arm/boards/phytec-som-imx8mq/flash-header-phycore-imx8mq.imxcfg b/arch/arm/boards/phytec-som-imx8mq/flash-header-phycore-imx8mq.imxcfg
> index 93cf14f26ba5..f82759f8499a 100644
> --- a/arch/arm/boards/phytec-som-imx8mq/flash-header-phycore-imx8mq.imxcfg
> +++ b/arch/arm/boards/phytec-som-imx8mq/flash-header-phycore-imx8mq.imxcfg
> @@ -5,3 +5,5 @@ soc imx8mq
>  loadaddr 0x007E1000
>  max_load_size 0x3F000
>  ivtofs 0x400
> +
> +#include <mach/imx/habv4-imx8-gencsf.h>
> diff --git a/arch/arm/boards/polyhex-debix/flash-header-polyhex-debix.imxcfg b/arch/arm/boards/polyhex-debix/flash-header-polyhex-debix.imxcfg
> index 663bd102e9a2..6ea2e6c68ed7 100644
> --- a/arch/arm/boards/polyhex-debix/flash-header-polyhex-debix.imxcfg
> +++ b/arch/arm/boards/polyhex-debix/flash-header-polyhex-debix.imxcfg
> @@ -5,3 +5,5 @@ soc imx8mp
>  loadaddr 0x920000
>  max_load_size 0x3f000
>  ivtofs 0x0
> +
> +#include <mach/imx/habv4-imx8-gencsf.h>
> diff --git a/arch/arm/boards/protonic-imx8m/flash-header-prt8mm.imxcfg b/arch/arm/boards/protonic-imx8m/flash-header-prt8mm.imxcfg
> index 10606ce29c96..8aff991618ec 100644
> --- a/arch/arm/boards/protonic-imx8m/flash-header-prt8mm.imxcfg
> +++ b/arch/arm/boards/protonic-imx8m/flash-header-prt8mm.imxcfg
> @@ -5,3 +5,5 @@ soc imx8mm
>  loadaddr 0x007e1000
>  max_load_size 0x3f000
>  ivtofs 0x400
> +
> +#include <mach/imx/habv4-imx8-gencsf.h>
> diff --git a/arch/arm/boards/skov-imx8mp/flash-header-skov-imx8mp.imxcfg b/arch/arm/boards/skov-imx8mp/flash-header-skov-imx8mp.imxcfg
> index 663bd102e9a2..6ea2e6c68ed7 100644
> --- a/arch/arm/boards/skov-imx8mp/flash-header-skov-imx8mp.imxcfg
> +++ b/arch/arm/boards/skov-imx8mp/flash-header-skov-imx8mp.imxcfg
> @@ -5,3 +5,5 @@ soc imx8mp
>  loadaddr 0x920000
>  max_load_size 0x3f000
>  ivtofs 0x0
> +
> +#include <mach/imx/habv4-imx8-gencsf.h>
> diff --git a/arch/arm/boards/tqma8mpxl/flash-header-tqma8mpxl.imxcfg b/arch/arm/boards/tqma8mpxl/flash-header-tqma8mpxl.imxcfg
> index 663bd102e9a2..6ea2e6c68ed7 100644
> --- a/arch/arm/boards/tqma8mpxl/flash-header-tqma8mpxl.imxcfg
> +++ b/arch/arm/boards/tqma8mpxl/flash-header-tqma8mpxl.imxcfg
> @@ -5,3 +5,5 @@ soc imx8mp
>  loadaddr 0x920000
>  max_load_size 0x3f000
>  ivtofs 0x0
> +
> +#include <mach/imx/habv4-imx8-gencsf.h>
> diff --git a/arch/arm/boards/variscite-dt8mcustomboard-imx8mp/flash-header-imx8mp-dart.imxcfg b/arch/arm/boards/variscite-dt8mcustomboard-imx8mp/flash-header-imx8mp-dart.imxcfg
> index 2b104edfb741..c3149a197f7d 100644
> --- a/arch/arm/boards/variscite-dt8mcustomboard-imx8mp/flash-header-imx8mp-dart.imxcfg
> +++ b/arch/arm/boards/variscite-dt8mcustomboard-imx8mp/flash-header-imx8mp-dart.imxcfg
> @@ -5,3 +5,5 @@ soc imx8mp
>  loadaddr 0x918000
>  max_load_size 0x3f000
>  ivtofs 0x0
> +
> +#include <mach/imx/habv4-imx8-gencsf.h>
> diff --git a/arch/arm/boards/zii-imx8mq-dev/flash-header-zii-imx8mq-dev.imxcfg b/arch/arm/boards/zii-imx8mq-dev/flash-header-zii-imx8mq-dev.imxcfg
> index 93cf14f26ba5..f82759f8499a 100644
> --- a/arch/arm/boards/zii-imx8mq-dev/flash-header-zii-imx8mq-dev.imxcfg
> +++ b/arch/arm/boards/zii-imx8mq-dev/flash-header-zii-imx8mq-dev.imxcfg
> @@ -5,3 +5,5 @@ soc imx8mq
>  loadaddr 0x007E1000
>  max_load_size 0x3F000
>  ivtofs 0x400
> +
> +#include <mach/imx/habv4-imx8-gencsf.h>
> -- 
> 2.39.2
> 
> 
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |