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

[Peng Fan]

On 10/7/2022 9:11 PM, Oliver Graute wrote:
> Switch to use binman to pack images
> 
> Signed-off-by: Oliver Graute <oliver.graute at kococonnector.com>
> Reviewed-by: Fabio Estevam <festevam at denx.de>
> Reviewed-by: Simon Glass <sjg at chromium.org>

Reviewed-by: Peng Fan <peng.fan at nxp.com>

> 
> ---
> 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(-)
> 
> 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 ba2a38c7f7..a0036a32b5 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..6b72afa80d 100644
> --- a/configs/cgtqmx8_defconfig
> +++ b/configs/cgtqmx8_defconfig
> @@ -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
> 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
>   ---------------------------------