Skip to contentSkip to conversation

imx: imx8qm: cgtqmx8: switch to binman

PATCH Superseded Oliver Graute 2 participants 2 messages Oct 7, 2022 – Oct 14, 2022

Subsystems (3)

v4 of 6 Superseded Latest is v6 →

lore
Share & tools
lore
#0 lore raw

PATCH v4 1/1 imx: imx8qm: cgtqmx8: switch to binman

Switch to use binman to pack images

---
Changes for v4
- rebased on master

Changes for v3
-added Reviewed-by
- rebased on master

 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(-)
arch/arm/dts/imx8qm-cgtqmx8.dts +1 -0
index 555c357f6f..919d00644f 100644
@@ -12,6 +12,7 @@
 /memreserve/ 0x80000000 0x00020000;
 
 #include "fsl-imx8qm.dtsi"
+#include "imx8qm-u-boot.dtsi"
 
 / {
 	model = "Congatec QMX8 Qseven series";
arch/arm/mach-imx/imx8/Kconfig +1 -0
index ba2a38c7f7..a0036a32b5 100644
@@ -76,6 +76,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
board/congatec/cgtqmx8/imximage.cfg +2 -2
index 5ecde0c530..43035088e3 100644
@@ -4,8 +4,8 @@
  */
 
 
-/* Boot from SD, sector size 0x400 */
-BOOT_FROM SD 0x400
+BOOT_FROM	sd
+
 /* SoC type IMX8QM */
 SOC_TYPE IMX8QM
 /* Append seco container image */
configs/cgtqmx8_defconfig +1 -1
index ddc65a06b9..6b72afa80d 100644
@@ -21,7 +21,7 @@ CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80200000
 CONFIG_REMAKE_ELF=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_OF_BOARD_SETUP=y
 CONFIG_BOOTDELAY=3
 CONFIG_USE_BOOTCOMMAND=y
doc/board/congatec/cgtqmx8.rst +1 -2
index bccdef2f16..16711a844d 100644
@@ -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
 ---------------------------------
Signature · 1 line
2.17.1
Reviewed-by on v4 1/1
#1 lore raw
Quoted 5 lines · Oliver Graute

Switch to use binman to pack images

Quoted 82 lines

---
Changes for v4
- rebased on master

Changes for v3
-added Reviewed-by
- rebased on master

  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(-)
arch/arm/dts/imx8qm-cgtqmx8.dts +1 -0
index 555c357f6f..919d00644f 100644
@@ -12,6 +12,7 @@
  /memreserve/ 0x80000000 0x00020000;
 
  #include "fsl-imx8qm.dtsi"
+#include "imx8qm-u-boot.dtsi"
 
  / {
  	model = "Congatec QMX8 Qseven series";
arch/arm/mach-imx/imx8/Kconfig +1 -0
index ba2a38c7f7..a0036a32b5 100644
@@ -76,6 +76,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
board/congatec/cgtqmx8/imximage.cfg +2 -2
index 5ecde0c530..43035088e3 100644
@@ -4,8 +4,8 @@
   */
 
 
-/* Boot from SD, sector size 0x400 */
-BOOT_FROM SD 0x400
+BOOT_FROM	sd
+
  /* SoC type IMX8QM */
  SOC_TYPE IMX8QM
  /* Append seco container image */
configs/cgtqmx8_defconfig +1 -1
index ddc65a06b9..6b72afa80d 100644
@@ -21,7 +21,7 @@ CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80200000
  CONFIG_REMAKE_ELF=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_OF_BOARD_SETUP=y
  CONFIG_BOOTDELAY=3
  CONFIG_USE_BOOTCOMMAND=y
doc/board/congatec/cgtqmx8.rst +1 -2
index bccdef2f16..16711a844d 100644
@@ -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
  ---------------------------------