[PATCH v1] imx: imx8qm: cgtqmx8: switch to binman

[PATCH v1] imx: imx8qm: cgtqmx8: switch to binman

[Oliver Graute]

Switch to use binman to pack images

Signed-off-by: Oliver Graute <oliver.graute@kococonnector.com>
---
 arch/arm/dts/imx8qm-cgtqmx8.dts     | 1 +
 arch/arm/mach-imx/imx8/Kconfig      | 1 +
 board/congatec/cgtqmx8/imximage.cfg | 4 ++--
 configs/cgtqmx8_defconfig           | 2 +-
 doc/board/congatec/cgtqmx8.rst      | 3 +--
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/arch/arm/dts/imx8qm-cgtqmx8.dts b/arch/arm/dts/imx8qm-cgtqmx8.dts
index 555c357f6f..919d00644f 100644
--- a/arch/arm/dts/imx8qm-cgtqmx8.dts
+++ b/arch/arm/dts/imx8qm-cgtqmx8.dts
@@ -12,6 +12,7 @@
 /memreserve/ 0x80000000 0x00020000;
 
 #include "fsl-imx8qm.dtsi"
+#include "imx8qm-u-boot.dtsi"
 
 / {
 	model = "Congatec QMX8 Qseven series";
diff --git a/arch/arm/mach-imx/imx8/Kconfig b/arch/arm/mach-imx/imx8/Kconfig
index 6cd321fbb6..6e4b25961f 100644
--- a/arch/arm/mach-imx/imx8/Kconfig
+++ b/arch/arm/mach-imx/imx8/Kconfig
@@ -75,6 +75,7 @@ config TARGET_IMX8QM_MEK
 
 config TARGET_CONGA_QMX8
 	bool "Support congatec conga-QMX8 board"
+	select BINMAN
 	select BOARD_LATE_INIT
 	select SUPPORT_SPL
 	select IMX8QM
diff --git a/board/congatec/cgtqmx8/imximage.cfg b/board/congatec/cgtqmx8/imximage.cfg
index e324c7ca37..58eeef54f6 100644
--- a/board/congatec/cgtqmx8/imximage.cfg
+++ b/board/congatec/cgtqmx8/imximage.cfg
@@ -5,8 +5,8 @@
 
 #define __ASSEMBLY__
 
-/* Boot from SD, sector size 0x400 */
-BOOT_FROM SD 0x400
+BOOT_FROM	sd
+
 /* SoC type IMX8QM */
 SOC_TYPE IMX8QM
 /* Append seco container image */
diff --git a/configs/cgtqmx8_defconfig b/configs/cgtqmx8_defconfig
index 34aca6ea85..48433bdef9 100644
--- a/configs/cgtqmx8_defconfig
+++ b/configs/cgtqmx8_defconfig
@@ -18,7 +18,7 @@ CONFIG_SPL_DRIVERS_MISC=y
 CONFIG_SPL=y
 CONFIG_FIT=y
 CONFIG_SPL_LOAD_FIT=y
-CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh"
+# CONFIG_USE_SPL_FIT_GENERATOR is not set
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/congatec/cgtqmx8/imximage.cfg"
 CONFIG_BOOTDELAY=3
 CONFIG_LOG=y
diff --git a/doc/board/congatec/cgtqmx8.rst b/doc/board/congatec/cgtqmx8.rst
index bccdef2f16..16711a844d 100644
--- a/doc/board/congatec/cgtqmx8.rst
+++ b/doc/board/congatec/cgtqmx8.rst
@@ -57,8 +57,7 @@ Build U-Boot
      $ export ATF_LOAD_ADDR=0x80000000
      $ export BL33_LOAD_ADDR=0x80020000
      $ make cgtqmx8_defconfig
-     $ make u-boot.bin
-     $ make flash.bin
+     $ make
 
 Flash the binary into the SD card
 ---------------------------------
-- 
2.17.1

Re: [PATCH v1] imx: imx8qm: cgtqmx8: switch to binman

[Simon Glass]

On Wed, 16 Feb 2022 at 07:02, Oliver Graute
<oliver.graute@kococonnector.com> wrote:
>
> Switch to use binman to pack images
>
> Signed-off-by: Oliver Graute <oliver.graute@kococonnector.com>
> ---
>  arch/arm/dts/imx8qm-cgtqmx8.dts     | 1 +
>  arch/arm/mach-imx/imx8/Kconfig      | 1 +
>  board/congatec/cgtqmx8/imximage.cfg | 4 ++--
>  configs/cgtqmx8_defconfig           | 2 +-
>  doc/board/congatec/cgtqmx8.rst      | 3 +--
>  5 files changed, 6 insertions(+), 5 deletions(-)

Reviewed-by: Simon Glass <sjg@chromium.org>

Re: [PATCH v1] imx: imx8qm: cgtqmx8: switch to binman

[Stefano Babic]

Hi Oliver,

On 16.02.22 20:00, Simon Glass wrote:
> On Wed, 16 Feb 2022 at 07:02, Oliver Graute
> <oliver.graute@kococonnector.com> wrote:
>>
>> Switch to use binman to pack images
>>
>> Signed-off-by: Oliver Graute <oliver.graute@kococonnector.com>
>> ---
>>   arch/arm/dts/imx8qm-cgtqmx8.dts     | 1 +
>>   arch/arm/mach-imx/imx8/Kconfig      | 1 +
>>   board/congatec/cgtqmx8/imximage.cfg | 4 ++--
>>   configs/cgtqmx8_defconfig           | 2 +-
>>   doc/board/congatec/cgtqmx8.rst      | 3 +--
>>   5 files changed, 6 insertions(+), 5 deletions(-)
> 
> Reviewed-by: Simon Glass <sjg@chromium.org>

Applying this, build fails. Could you take a look, rebase and repost ? 
Thanks !

Best regards,
Stefano



-- 
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic@denx.de
=====================================================================

Re: [PATCH v1] imx: imx8qm: cgtqmx8: switch to binman

[Oliver Graute]

On 18/02/22, Stefano Babic wrote:
> Hi Oliver,
> 
> On 16.02.22 20:00, Simon Glass wrote:
> > On Wed, 16 Feb 2022 at 07:02, Oliver Graute
> > <oliver.graute@kococonnector.com> wrote:
> > > 
> > > Switch to use binman to pack images
> > > 
> > > Signed-off-by: Oliver Graute <oliver.graute@kococonnector.com>
> > > ---
> > >   arch/arm/dts/imx8qm-cgtqmx8.dts     | 1 +
> > >   arch/arm/mach-imx/imx8/Kconfig      | 1 +
> > >   board/congatec/cgtqmx8/imximage.cfg | 4 ++--
> > >   configs/cgtqmx8_defconfig           | 2 +-
> > >   doc/board/congatec/cgtqmx8.rst      | 3 +--
> > >   5 files changed, 6 insertions(+), 5 deletions(-)
> > 
> > Reviewed-by: Simon Glass <sjg@chromium.org>
> 
> Applying this, build fails. Could you take a look, rebase and repost ?
> Thanks !

ok, 'll do.

Best Regards,

Oliver