[PATCH V2 6/7] imx: imx8mq use common imximage.cfg

[Stefano Babic]

Hi Peng,

On 08.10.21 06:05, Peng Fan (OSS) wrote:
> 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/imximage.cfg   | 11 -----------
>   board/google/imx8mq_phanbell/imximage.cfg | 11 -----------
>   board/technexion/pico-imx8mq/imximage.cfg | 11 -----------
>   configs/imx8mq_evk_defconfig              |  2 +-
>   configs/imx8mq_phanbell_defconfig         |  2 +-
>   configs/pico-imx8mq_defconfig             |  2 +-
>   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
> 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/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/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
> diff --git a/configs/imx8mq_evk_defconfig b/configs/imx8mq_evk_defconfig
> index 4e74c6f235..412d05e41a 100644
> --- a/configs/imx8mq_evk_defconfig
> +++ b/configs/imx8mq_evk_defconfig
> @@ -19,7 +19,7 @@ CONFIG_FIT=y
>   CONFIG_FIT_EXTERNAL_OFFSET=0x3000
>   CONFIG_SPL_LOAD_FIT=y
>   # CONFIG_USE_SPL_FIT_GENERATOR is not set
> -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/imx8mq_evk/imximage.cfg"
> +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage.cfg"

Have we not switched to CONFIG_IMX_CONFIG ?

Regards,
Stefano

>   CONFIG_BOARD_EARLY_INIT_F=y
>   CONFIG_BOARD_LATE_INIT=y
>   CONFIG_SPL_BOARD_INIT=y
> diff --git a/configs/imx8mq_phanbell_defconfig b/configs/imx8mq_phanbell_defconfig
> index 24922ce2e0..3a6e428617 100644
> --- a/configs/imx8mq_phanbell_defconfig
> +++ b/configs/imx8mq_phanbell_defconfig
> @@ -19,7 +19,7 @@ CONFIG_FIT=y
>   CONFIG_FIT_EXTERNAL_OFFSET=0x3000
>   CONFIG_SPL_LOAD_FIT=y
>   # CONFIG_USE_SPL_FIT_GENERATOR is not set
> -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/google/imx8mq_phanbell/imximage.cfg"
> +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage.cfg"
>   CONFIG_SD_BOOT=y
>   CONFIG_BOARD_EARLY_INIT_F=y
>   CONFIG_SPL_BOARD_INIT=y
> diff --git a/configs/pico-imx8mq_defconfig b/configs/pico-imx8mq_defconfig
> index c510b0b7cb..3db75826c1 100644
> --- a/configs/pico-imx8mq_defconfig
> +++ b/configs/pico-imx8mq_defconfig
> @@ -18,7 +18,7 @@ CONFIG_FIT=y
>   CONFIG_FIT_EXTERNAL_OFFSET=0x3000
>   CONFIG_SPL_LOAD_FIT=y
>   # CONFIG_USE_SPL_FIT_GENERATOR is not set
> -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/technexion/pico-imx8mq/imximage.cfg"
> +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage.cfg"
>   CONFIG_BOARD_EARLY_INIT_F=y
>   CONFIG_BOARD_LATE_INIT=y
>   CONFIG_SPL_BOARD_INIT=y
> 


-- 
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================