imx: imx8mq use common imximage.cfg

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>

diff --git a/arch/arm/mach-imx/imx8m/imximage.cfg b/arch/arm/mach-imx/imx8m/imximage.cfg
index 714b242..9c6eaf0 100644 (file)
--- 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 a7c4974..c4d20ad 100644 (file)
--- 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 (file)
index 74f12b3..0000000
--- 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 e59b03c..54cfb99 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 "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 (file)
index 74f12b3..0000000
--- 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 9765551..628b051 100644 (file)
--- 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 (file)
index 74f12b3..0000000
--- 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