imx: imx8mq_phanbell: switch to binman

Switch to binman to pack images

Signed-off-by: Peng Fan <peng.fan@nxp.com>
Reviewed-by: Patrick Wildt <patrick@blueri.se>

diff --git a/arch/arm/dts/imx8mq-phanbell-u-boot.dtsi b/arch/arm/dts/imx8mq-phanbell-u-boot.dtsi
index 4712cf6a445894cc489f81f9d3909171c93957b1..a65a942ee7a6e9c5bd5410b402e92860411b7202 100644 (file)
--- a/arch/arm/dts/imx8mq-phanbell-u-boot.dtsi
+++ b/arch/arm/dts/imx8mq-phanbell-u-boot.dtsi
@@ -1,5 +1,7 @@
 // SPDX-License-Identifier: (GPL-2.0 OR MIT)
 
+#include "imx8mq-u-boot.dtsi"
+
 &reg_usdhc2_vmmc {
        u-boot,off-on-delay-us = <20000>;
 };

diff --git a/arch/arm/mach-imx/imx8m/Kconfig b/arch/arm/mach-imx/imx8m/Kconfig
index 0ea01d28dded5883e20758f21c863b3511dd6907..54e62e7f84bed85d464d6510ec902b7314d004e4 100644 (file)
--- a/arch/arm/mach-imx/imx8m/Kconfig
+++ b/arch/arm/mach-imx/imx8m/Kconfig
@@ -41,9 +41,10 @@ config TARGET_IMX8MQ_EVK
        select IMX8M_LPDDR4
 
 config TARGET_IMX8MQ_PHANBELL
-        bool "imx8mq_phanbell"
-        select IMX8MQ
-        select IMX8M_LPDDR4
+       bool "imx8mq_phanbell"
+       select BINMAN
+       select IMX8MQ
+       select IMX8M_LPDDR4
 
 config TARGET_IMX8MM_EVK
        bool "imx8mm LPDDR4 EVK board"

diff --git a/board/google/imx8mq_phanbell/Kconfig b/board/google/imx8mq_phanbell/Kconfig
index 54cfb99952722abdfdd002fa318baaa386604644..e59b03cb1789d5e4093e0ff95c0828bf88a81528 100644 (file)
--- a/board/google/imx8mq_phanbell/Kconfig
+++ b/board/google/imx8mq_phanbell/Kconfig
@@ -10,6 +10,6 @@ config SYS_CONFIG_NAME
        default "imx8mq_phanbell"
 
 config IMX_CONFIG
-       default "arch/arm/mach-imx/imx8m/imximage.cfg"
+       default "board/google/imx8mq_phanbell/imximage.cfg"
 
 endif

diff --git a/board/google/imx8mq_phanbell/imximage.cfg b/board/google/imx8mq_phanbell/imximage.cfg
new file mode 100644 (file)
index 0000000..74f12b3
--- /dev/null
+++ b/board/google/imx8mq_phanbell/imximage.cfg
@@ -0,0 +1,11 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * Copyright 2021 NXP
+ */
+
+#define __ASSEMBLY__
+
+FIT
+BOOT_FROM      sd
+SIGNED_HDMI    signed_hdmi.bin
+LOADER         mkimage.flash.mkimage   0x7e1000

diff --git a/configs/imx8mq_phanbell_defconfig b/configs/imx8mq_phanbell_defconfig
index 72ff17f93e46be3b52ecf4575776859ce7c21128..da6a06c13ab31ca90fdf02b2dda87fbb6513903d 100644 (file)
--- a/configs/imx8mq_phanbell_defconfig
+++ b/configs/imx8mq_phanbell_defconfig
@@ -24,7 +24,7 @@ CONFIG_SYS_LOAD_ADDR=0x40480000
 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_SD_BOOT=y
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_SPL_BOARD_INIT=y