diff mbox series

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

Message ID 20211022024220.23584-5-peng.fan@oss.nxp.com
State Accepted
Commit ea6ad1a42a770fa0cd18b1d2490bcd5a072c4f8b
Delegated to: Tom Rini
Headers show
Series imx8mq: switch to binman | expand

Commit Message

Peng Fan (OSS) Oct. 22, 2021, 2:42 a.m. UTC
From: Peng Fan <peng.fan@nxp.com>

After all these board switch to binman, we could use common imximage.cfg

Signed-off-by: Peng Fan <peng.fan@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

Comments

Patrick Wildt Nov. 11, 2021, 2:46 p.m. UTC | #1
On Fri, Oct 22, 2021 at 10:42:19AM +0800, Peng Fan (OSS) wrote:
> From: Peng Fan <peng.fan@nxp.com>
> 
> After all these board switch to binman, we could use common imximage.cfg

Reviewed-by: Patrick Wildt <patrick@blueri.se>

> Signed-off-by: Peng Fan <peng.fan@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
> 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
>
Heiko Thiery Nov. 11, 2021, 5:21 p.m. UTC | #2
Hi Peng,

Am Fr., 22. Okt. 2021 um 04:08 Uhr schrieb Peng Fan (OSS)
<peng.fan@oss.nxp.com>:
>
> From: Peng Fan <peng.fan@nxp.com>
>
> After all these board switch to binman, we could use common imximage.cfg
>
> Signed-off-by: Peng Fan <peng.fan@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
>
Peng Fan (OSS) Nov. 22, 2021, 8:56 a.m. UTC | #3
On 2021/11/12 1:21, Heiko Thiery wrote:
> Hi Peng,
> 
> Am Fr., 22. Okt. 2021 um 04:08 Uhr schrieb Peng Fan (OSS)
> <peng.fan@oss.nxp.com>:
>>
>> From: Peng Fan <peng.fan@nxp.com>
>>
>> After all these board switch to binman, we could use common imximage.cfg
>>
>> Signed-off-by: Peng Fan <peng.fan@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].

Thanks, I'll check and rework the patchset.

Thanks,
Peng.

> 
> [1] https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fpatchwork.ozlabs.org%2Fproject%2Fuboot%2Fpatch%2F20211014180824.10681-2-heiko.thiery%40gmail.com%2F&amp;data=04%7C01%7Cpeng.fan%40nxp.com%7C080150fe94714852252808d9a537b028%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C0%7C637722480863078675%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&amp;sdata=Yqxm1zT0476ZVGrAMgBzKAUevZRAO2fI4LC5b3C6%2BMg%3D&amp;reserved=0
> 
>> 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
>>
Tom Rini Jan. 8, 2022, 2:08 a.m. UTC | #4
On Fri, Oct 22, 2021 at 10:42:19AM +0800, Peng Fan (OSS) wrote:

> From: Peng Fan <peng.fan@nxp.com>
> 
> After all these board switch to binman, we could use common imximage.cfg
> 
> Signed-off-by: Peng Fan <peng.fan@nxp.com>
> Reviewed-by: Patrick Wildt <patrick@blueri.se>

Applied to u-boot/master, thanks!
diff mbox series

Patch

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/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