Switch to use binman to pack images
Signed-off-by: Oliver Graute
Reviewed-by: Fabio Estevam
Reviewed-by: Simon Glass
Reviewed-by: Peng Fan
---
Changes for v6
- added CONFIG_SPL_BINMAN_UBOOT_SYMBOLS is not set
Changes for v5
- added CONFIG_FIT_EXTERNAL_OFFSET
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 | 4 +++-
doc/board/congatec/cgtqmx8.rst | 3 +--
5 files changed, 8 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/ 0x8000 0x0002;
#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 a7e3af57dc..d423cf8563 100644
--- a/arch/arm/mach-imx/imx8/Kconfig
+++ b/arch/arm/mach-imx/imx8/Kconfig
@@ -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
diff --git a/board/congatec/cgtqmx8/imximage.cfg
b/board/congatec/cgtqmx8/imximage.cfg
index 5ecde0c530..43035088e3 100644
--- a/board/congatec/cgtqmx8/imximage.cfg
+++ b/board/congatec/cgtqmx8/imximage.cfg
@@ -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 */
diff --git a/configs/cgtqmx8_defconfig b/configs/cgtqmx8_defconfig
index ddc65a06b9..4d1dfe4212 100644
--- a/configs/cgtqmx8_defconfig
+++ b/configs/cgtqmx8_defconfig
@@ -20,8 +20,10 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x8020
CONFIG_REMAKE_ELF=y
CONFIG_FIT=y
+CONFIG_FIT_EXTERNAL_OFFSET=0x3000
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_SPL_BINMAN_UBOOT_SYMBOLS is not set
CONFIG_OF_BOARD_SETUP=y
CONFIG_BOOTDELAY=3
CONFIG_USE_BOOTCOMMAND=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=0x8000
$ export BL33_LOAD_ADDR=0x8002
$ make cgtqmx8_defconfig
- $ make u-boot.bin
- $ make flash.bin
+ $ make
Flash the binary into the SD card
-
--
2.17.1
