[PATCH V3 4/5] imx: imx8mq use common imximage.cfg

[Heiko Thiery]

Hi Peng,

Am Fr., 22. Okt. 2021 um 04:08 Uhr schrieb Peng Fan (OSS)
<peng.fan at oss.nxp.com>:
>
> From: Peng Fan <peng.fan at nxp.com>
>
> After all these board switch to binman, we could use common imximage.cfg
>
> Signed-off-by: Peng Fan <peng.fan at nxp.com>
> ---
>  arch/arm/mach-imx/imx8m/imximage.cfg      | 12 +++---------
>  board/freescale/imx8mq_evk/Kconfig        |  2 +-
>  board/freescale/imx8mq_evk/imximage.cfg   | 11 -----------
>  board/google/imx8mq_phanbell/Kconfig      |  2 +-
>  board/google/imx8mq_phanbell/imximage.cfg | 11 -----------
>  board/technexion/pico-imx8mq/Kconfig      |  2 +-
>  board/technexion/pico-imx8mq/imximage.cfg | 11 -----------
>  7 files changed, 6 insertions(+), 45 deletions(-)
>  delete mode 100644 board/freescale/imx8mq_evk/imximage.cfg
>  delete mode 100644 board/google/imx8mq_phanbell/imximage.cfg
>  delete mode 100644 board/technexion/pico-imx8mq/imximage.cfg
>
> diff --git a/arch/arm/mach-imx/imx8m/imximage.cfg b/arch/arm/mach-imx/imx8m/imximage.cfg
> index 714b24273b..9c6eaf0a6d 100644
> --- a/arch/arm/mach-imx/imx8m/imximage.cfg
> +++ b/arch/arm/mach-imx/imx8m/imximage.cfg
> @@ -1,17 +1,11 @@
>  /* SPDX-License-Identifier: GPL-2.0+ */
>  /*
> - * Copyright 2018 NXP
> + * Copyright 2018-2021 NXP
>   */
>
>  #define __ASSEMBLY__
>
>  FIT
>  BOOT_FROM      sd
> -SIGNED_HDMI    signed_hdmi_imx8m.bin
> -LOADER         spl/u-boot-spl-ddr.bin  0x7E1000
> -SECOND_LOADER  u-boot.itb              0x40200000 0x60000
> -
> -DDR_FW lpddr4_pmu_train_1d_imem.bin
> -DDR_FW lpddr4_pmu_train_1d_dmem.bin
> -DDR_FW lpddr4_pmu_train_2d_imem.bin
> -DDR_FW lpddr4_pmu_train_2d_dmem.bin
> +SIGNED_HDMI    signed_hdmi.bin
> +LOADER         mkimage.flash.mkimage   0x7e1000

This file is only a temporarily created file by binman. You should use
the output file .. here it should be flash.bin.

But as Patrick already pointed out, we should create the final
flash.bin like before. I also have a patch for adding a new im8mq
board pending that has this already implemented.[1].

[1] https://patchwork.ozlabs.org/project/uboot/patch/20211014180824.10681-2-heiko.thiery@gmail.com/

> diff --git a/board/freescale/imx8mq_evk/Kconfig b/board/freescale/imx8mq_evk/Kconfig
> index a7c49744b3..c4d20ad7c7 100644
> --- a/board/freescale/imx8mq_evk/Kconfig
> +++ b/board/freescale/imx8mq_evk/Kconfig
> @@ -10,6 +10,6 @@ config SYS_CONFIG_NAME
>         default "imx8mq_evk"
>
>  config IMX_CONFIG
> -       default "board/freescale/imx8mq_evk/imximage.cfg"
> +       default "arch/arm/mach-imx/imx8m/imximage.cfg"
>
>  endif
> diff --git a/board/freescale/imx8mq_evk/imximage.cfg b/board/freescale/imx8mq_evk/imximage.cfg
> deleted file mode 100644
> index 74f12b30d2..0000000000
> --- a/board/freescale/imx8mq_evk/imximage.cfg
> +++ /dev/null
> @@ -1,11 +0,0 @@
> -/* 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/board/google/imx8mq_phanbell/Kconfig b/board/google/imx8mq_phanbell/Kconfig
> index e59b03cb17..54cfb99952 100644
> --- 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 "board/google/imx8mq_phanbell/imximage.cfg"
> +       default "arch/arm/mach-imx/imx8m/imximage.cfg"
>
>  endif
> diff --git a/board/google/imx8mq_phanbell/imximage.cfg b/board/google/imx8mq_phanbell/imximage.cfg
> deleted file mode 100644
> index 74f12b30d2..0000000000
> --- a/board/google/imx8mq_phanbell/imximage.cfg
> +++ /dev/null
> @@ -1,11 +0,0 @@
> -/* 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/board/technexion/pico-imx8mq/Kconfig b/board/technexion/pico-imx8mq/Kconfig
> index 97655517d8..628b051149 100644
> --- a/board/technexion/pico-imx8mq/Kconfig
> +++ b/board/technexion/pico-imx8mq/Kconfig
> @@ -10,6 +10,6 @@ config SYS_CONFIG_NAME
>         default "pico-imx8mq"
>
>  config IMX_CONFIG
> -       default "board/technexion/pico-imx8mq/imximage.cfg"
> +       default "arch/arm/mach-imx/imx8m/imximage.cfg"
>
>  endif
> diff --git a/board/technexion/pico-imx8mq/imximage.cfg b/board/technexion/pico-imx8mq/imximage.cfg
> deleted file mode 100644
> index 74f12b30d2..0000000000
> --- a/board/technexion/pico-imx8mq/imximage.cfg
> +++ /dev/null
> @@ -1,11 +0,0 @@
> -/* 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
> --
> 2.30.0
>