We already have <mach/xload.h> with related functions, so reuse that header instead of adding a new one. Signed-off-by: Ahmad Fatoum <a.fatoum@xxxxxxxxxxxxxx> --- arch/arm/boards/nxp-imx8mm-evk/lowlevel.c | 2 +- arch/arm/boards/nxp-imx8mp-evk/lowlevel.c | 1 - arch/arm/boards/protonic-imx8m/lowlevel-prt8mm.c | 1 - arch/arm/mach-imx/atf.c | 1 - arch/arm/mach-imx/include/mach/xload.h | 3 +++ include/soc/imx8m.h | 9 --------- 6 files changed, 4 insertions(+), 13 deletions(-) delete mode 100644 include/soc/imx8m.h diff --git a/arch/arm/boards/nxp-imx8mm-evk/lowlevel.c b/arch/arm/boards/nxp-imx8mm-evk/lowlevel.c index d13474602cb2..888bdd079083 100644 --- a/arch/arm/boards/nxp-imx8mm-evk/lowlevel.c +++ b/arch/arm/boards/nxp-imx8mm-evk/lowlevel.c @@ -15,7 +15,7 @@ #include <mach/iomux-mx8mm.h> #include <mach/imx8m-ccm-regs.h> #include <mfd/bd71837.h> -#include <soc/imx8m.h> +#include <mach/xload.h> #include <soc/imx8m/ddr.h> #include <image-metadata.h> diff --git a/arch/arm/boards/nxp-imx8mp-evk/lowlevel.c b/arch/arm/boards/nxp-imx8mp-evk/lowlevel.c index df4925f533e7..338c8024c4a1 100644 --- a/arch/arm/boards/nxp-imx8mp-evk/lowlevel.c +++ b/arch/arm/boards/nxp-imx8mp-evk/lowlevel.c @@ -22,7 +22,6 @@ #include <mfd/pca9450.h> #include <soc/imx8m/ddr.h> #include <soc/fsl/fsl_udc.h> -#include <soc/imx8m.h> extern char __dtb_z_imx8mp_evk_start[]; diff --git a/arch/arm/boards/protonic-imx8m/lowlevel-prt8mm.c b/arch/arm/boards/protonic-imx8m/lowlevel-prt8mm.c index c3272654265a..bfae39ea522e 100644 --- a/arch/arm/boards/protonic-imx8m/lowlevel-prt8mm.c +++ b/arch/arm/boards/protonic-imx8m/lowlevel-prt8mm.c @@ -14,7 +14,6 @@ #include <mach/xload.h> #include <soc/fsl/fsl_udc.h> #include <soc/imx8m/ddr.h> -#include <soc/imx8m.h> extern char __dtb_z_imx8mm_prt8mm_start[]; diff --git a/arch/arm/mach-imx/atf.c b/arch/arm/mach-imx/atf.c index d9aaee1bc621..8fc523d3de61 100644 --- a/arch/arm/mach-imx/atf.c +++ b/arch/arm/mach-imx/atf.c @@ -7,7 +7,6 @@ #include <mach/generic.h> #include <mach/xload.h> #include <mach/romapi.h> -#include <soc/imx8m.h> #include <soc/fsl/fsl_udc.h> /** diff --git a/arch/arm/mach-imx/include/mach/xload.h b/arch/arm/mach-imx/include/mach/xload.h index 03ec23ebbdb0..cfc52a94879d 100644 --- a/arch/arm/mach-imx/include/mach/xload.h +++ b/arch/arm/mach-imx/include/mach/xload.h @@ -13,6 +13,9 @@ int imx8m_esdhc_load_image(int instance, bool start); int imx8mn_esdhc_load_image(int instance, bool start); int imx8mp_esdhc_load_image(int instance, bool start); +void imx8mm_load_and_start_image_via_tfa(void); +void imx8mp_load_and_start_image_via_tfa(void); + int imx_image_size(void); int piggydata_size(void); diff --git a/include/soc/imx8m.h b/include/soc/imx8m.h deleted file mode 100644 index 15f7a4c2c001..000000000000 --- a/include/soc/imx8m.h +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#ifndef __MACH_IMX8M_H__ -#define __MACH_IMX8M_H__ - -void imx8mm_load_and_start_image_via_tfa(void); -void imx8mp_load_and_start_image_via_tfa(void); - -#endif -- 2.30.2
