> Subject: [PATCH 23/33] arm: imx: Remove <common.h> and add needed
> includes
>
> Remove <common.h> from all mach-imx, CPU specific sub-directories and
> include/asm/arch-mx* files and when needed add missing include files
> directly.
>
> Signed-off-by: Tom Rini <tr...@konsulko.com>
Acked-by: Peng Fan <peng....@nxp.com>
> ---
> Cc: Stefano Babic <sba...@denx.de>
> Cc: Fabio Estevam <feste...@gmail.com>
> Cc: "NXP i.MX U-Boot Team" <uboot-...@nxp.com>
> ---
> arch/arm/cpu/arm1136/mx31/devices.c | 1 -
> arch/arm/cpu/arm1136/mx31/generic.c | 1 -
> arch/arm/cpu/arm1136/mx31/timer.c | 1 -
> arch/arm/cpu/arm926ejs/mxs/clock.c | 1 -
> arch/arm/cpu/arm926ejs/mxs/iomux.c | 1 -
> arch/arm/cpu/arm926ejs/mxs/mxs.c | 1 -
> arch/arm/cpu/arm926ejs/mxs/spl_boot.c | 1 -
> arch/arm/cpu/arm926ejs/mxs/spl_lradc_init.c | 1 -
> arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c | 1 -
> arch/arm/cpu/arm926ejs/mxs/spl_power_init.c | 1 -
> arch/arm/cpu/arm926ejs/mxs/start.S | 1 -
> arch/arm/cpu/arm926ejs/mxs/timer.c | 1 -
> arch/arm/include/asm/arch-mx5/clock.h | 2 ++
> arch/arm/include/asm/arch-mx7/sys_proto.h | 2 ++
> arch/arm/mach-imx/cache.c | 2 +-
> arch/arm/mach-imx/cmd_bmode.c | 1 -
> arch/arm/mach-imx/cmd_dek.c | 3 ++-
> arch/arm/mach-imx/cmd_hdmidet.c | 1 -
> arch/arm/mach-imx/cmd_mfgprot.c | 2 +-
> arch/arm/mach-imx/cmd_nandbcb.c | 1 -
> arch/arm/mach-imx/cpu.c | 1 -
> arch/arm/mach-imx/ddrmc-vf610-calibration.c | 1 -
> arch/arm/mach-imx/ddrmc-vf610.c | 1 -
> arch/arm/mach-imx/ele_ahab.c | 2 +-
> arch/arm/mach-imx/hab.c | 1 -
> arch/arm/mach-imx/i2c-mxv7.c | 2 +-
> arch/arm/mach-imx/image-container.c | 2 +-
> arch/arm/mach-imx/imx8/ahab.c | 1 -
> arch/arm/mach-imx/imx8/clock.c | 1 -
> arch/arm/mach-imx/imx8/cpu.c | 1 -
> arch/arm/mach-imx/imx8/fdt.c | 1 -
> arch/arm/mach-imx/imx8/iomux.c | 1 -
> arch/arm/mach-imx/imx8/misc.c | 1 -
> arch/arm/mach-imx/imx8/snvs_security_sc.c | 1 -
> arch/arm/mach-imx/imx8m/clock_imx8mm.c | 1 -
> arch/arm/mach-imx/imx8m/clock_imx8mq.c | 1 -
> arch/arm/mach-imx/imx8m/clock_slice.c | 1 -
> arch/arm/mach-imx/imx8m/psci.c | 1 -
> arch/arm/mach-imx/imx8m/soc.c | 2 +-
> arch/arm/mach-imx/imx8ulp/cgc.c | 1 -
> arch/arm/mach-imx/imx8ulp/clock.c | 1 -
> arch/arm/mach-imx/imx8ulp/iomux.c | 1 -
> arch/arm/mach-imx/imx8ulp/pcc.c | 1 -
> arch/arm/mach-imx/imx8ulp/rdc.c | 3 ++-
> arch/arm/mach-imx/imx9/clock.c | 1 -
> arch/arm/mach-imx/imx9/clock_root.c | 2 +-
> arch/arm/mach-imx/imx9/imx_bootaux.c | 3 ++-
> arch/arm/mach-imx/imx9/soc.c | 2 +-
> arch/arm/mach-imx/imx9/trdc.c | 2 +-
> arch/arm/mach-imx/imx_bootaux.c | 5 ++++-
> arch/arm/mach-imx/imxrt/soc.c | 1 -
> arch/arm/mach-imx/iomux-v3.c | 1 -
> arch/arm/mach-imx/mac.c | 1 -
> arch/arm/mach-imx/misc.c | 1 -
> arch/arm/mach-imx/mmc_env.c | 1 -
> arch/arm/mach-imx/mmdc_size.c | 2 +-
> arch/arm/mach-imx/mx5/clock.c | 1 -
> arch/arm/mach-imx/mx5/mx53_dram.c | 2 +-
> arch/arm/mach-imx/mx5/soc.c | 1 -
> arch/arm/mach-imx/mx6/clock.c | 2 +-
> arch/arm/mach-imx/mx6/ddr.c | 1 -
> arch/arm/mach-imx/mx6/litesom.c | 2 +-
> arch/arm/mach-imx/mx6/module_fuse.c | 1 -
> arch/arm/mach-imx/mx6/mp.c | 1 -
> arch/arm/mach-imx/mx6/opos6ul.c | 2 +-
> arch/arm/mach-imx/mx6/soc.c | 1 -
> arch/arm/mach-imx/mx7/clock.c | 3 ++-
> arch/arm/mach-imx/mx7/clock_slice.c | 1 -
> arch/arm/mach-imx/mx7/ddr.c | 1 -
> arch/arm/mach-imx/mx7/psci-mx7.c | 1 -
> arch/arm/mach-imx/mx7/soc.c | 1 -
> arch/arm/mach-imx/mx7ulp/clock.c | 2 +-
> arch/arm/mach-imx/mx7ulp/iomux.c | 1 -
> arch/arm/mach-imx/mx7ulp/pcc.c | 1 -
> arch/arm/mach-imx/mx7ulp/scg.c | 2 +-
> arch/arm/mach-imx/mx7ulp/soc.c | 2 +-
> arch/arm/mach-imx/priblob.c | 1 -
> arch/arm/mach-imx/rdc-sema.c | 1 -
> arch/arm/mach-imx/speed.c | 2 +-
> arch/arm/mach-imx/spl.c | 2 +-
> arch/arm/mach-imx/spl_imx_romapi.c | 1 -
> arch/arm/mach-imx/syscounter.c | 2 +-
> arch/arm/mach-imx/timer.c | 1 -
> arch/arm/mach-imx/video.c | 3 ++-
> 84 files changed, 38 insertions(+), 82 deletions(-)
>
> diff --git a/arch/arm/cpu/arm1136/mx31/devices.c
> b/arch/arm/cpu/arm1136/mx31/devices.c
> index 9997e8fc3396..87ca303e31ba 100644
> --- a/arch/arm/cpu/arm1136/mx31/devices.c
> +++ b/arch/arm/cpu/arm1136/mx31/devices.c
> @@ -6,7 +6,6 @@
> * (c) 2007 Pengutronix, Sascha Hauer <s.ha...@pengutronix.de>
> */
>
> -#include <common.h>
> #include <asm/arch/imx-regs.h>
> #include <asm/arch/clock.h>
>
> diff --git a/arch/arm/cpu/arm1136/mx31/generic.c
> b/arch/arm/cpu/arm1136/mx31/generic.c
> index a3d4f1479623..fc56baccfcd6 100644
> --- a/arch/arm/cpu/arm1136/mx31/generic.c
> +++ b/arch/arm/cpu/arm1136/mx31/generic.c
> @@ -4,7 +4,6 @@
> * Sascha Hauer, Pengutronix
> */
>
> -#include <common.h>
> #include <div64.h>
> #include <init.h>
> #include <asm/arch/imx-regs.h>
> diff --git a/arch/arm/cpu/arm1136/mx31/timer.c
> b/arch/arm/cpu/arm1136/mx31/timer.c
> index a913860491cb..b41ca68ae552 100644
> --- a/arch/arm/cpu/arm1136/mx31/timer.c
> +++ b/arch/arm/cpu/arm1136/mx31/timer.c
> @@ -4,7 +4,6 @@
> * Sascha Hauer, Pengutronix
> */
>
> -#include <common.h>
> #include <init.h>
> #include <asm/arch/imx-regs.h>
> #include <asm/io.h>
> diff --git a/arch/arm/cpu/arm926ejs/mxs/clock.c
> b/arch/arm/cpu/arm926ejs/mxs/clock.c
> index 4e1cf3a1e32b..58f6cf80cae0 100644
> --- a/arch/arm/cpu/arm926ejs/mxs/clock.c
> +++ b/arch/arm/cpu/arm926ejs/mxs/clock.c
> @@ -9,7 +9,6 @@
> * Copyright (C) 2010 Freescale Semiconductor, Inc.
> */
>
> -#include <common.h>
> #include <log.h>
> #include <linux/errno.h>
> #include <asm/io.h>
> diff --git a/arch/arm/cpu/arm926ejs/mxs/iomux.c
> b/arch/arm/cpu/arm926ejs/mxs/iomux.c
> index 381264b8a18d..851b4deb080b 100644
> --- a/arch/arm/cpu/arm926ejs/mxs/iomux.c
> +++ b/arch/arm/cpu/arm926ejs/mxs/iomux.c
> @@ -6,7 +6,6 @@
> * <armli...@phytec.de>
> */
>
> -#include <common.h>
> #include <linux/errno.h>
> #include <asm/io.h>
> #include <asm/arch/clock.h>
> diff --git a/arch/arm/cpu/arm926ejs/mxs/mxs.c
> b/arch/arm/cpu/arm926ejs/mxs/mxs.c
> index 4f3cb63c56df..7b2bb09551b5 100644
> --- a/arch/arm/cpu/arm926ejs/mxs/mxs.c
> +++ b/arch/arm/cpu/arm926ejs/mxs/mxs.c
> @@ -9,7 +9,6 @@
> * Copyright (C) 2010 Freescale Semiconductor, Inc.
> */
>
> -#include <common.h>
> #include <command.h>
> #include <cpu_func.h>
> #include <hang.h>
> diff --git a/arch/arm/cpu/arm926ejs/mxs/spl_boot.c
> b/arch/arm/cpu/arm926ejs/mxs/spl_boot.c
> index 249f8de8fbe1..76a69d7f9586 100644
> --- a/arch/arm/cpu/arm926ejs/mxs/spl_boot.c
> +++ b/arch/arm/cpu/arm926ejs/mxs/spl_boot.c
> @@ -6,7 +6,6 @@
> * on behalf of DENX Software Engineering GmbH
> */
>
> -#include <common.h>
> #include <config.h>
> #include <init.h>
> #include <log.h>
> diff --git a/arch/arm/cpu/arm926ejs/mxs/spl_lradc_init.c
> b/arch/arm/cpu/arm926ejs/mxs/spl_lradc_init.c
> index 2cfbd780953d..b2d3b2b13efd 100644
> --- a/arch/arm/cpu/arm926ejs/mxs/spl_lradc_init.c
> +++ b/arch/arm/cpu/arm926ejs/mxs/spl_lradc_init.c
> @@ -6,7 +6,6 @@
> * on behalf of DENX Software Engineering GmbH
> */
>
> -#include <common.h>
> #include <config.h>
> #include <log.h>
> #include <asm/io.h>
> diff --git a/arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c
> b/arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c
> index a94803ee93d9..c3136dd8976a 100644
> --- a/arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c
> +++ b/arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c
> @@ -6,7 +6,6 @@
> * on behalf of DENX Software Engineering GmbH
> */
>
> -#include <common.h>
> #include <config.h>
> #include <init.h>
> #include <log.h>
> diff --git a/arch/arm/cpu/arm926ejs/mxs/spl_power_init.c
> b/arch/arm/cpu/arm926ejs/mxs/spl_power_init.c
> index 77bca7e331a0..8b65c094a8ad 100644
> --- a/arch/arm/cpu/arm926ejs/mxs/spl_power_init.c
> +++ b/arch/arm/cpu/arm926ejs/mxs/spl_power_init.c
> @@ -6,7 +6,6 @@
> * on behalf of DENX Software Engineering GmbH
> */
>
> -#include <common.h>
> #include <config.h>
> #include <hang.h>
> #include <log.h>
> diff --git a/arch/arm/cpu/arm926ejs/mxs/start.S
> b/arch/arm/cpu/arm926ejs/mxs/start.S
> index 61982e38a1d4..a6eb053cadb0 100644
> --- a/arch/arm/cpu/arm926ejs/mxs/start.S
> +++ b/arch/arm/cpu/arm926ejs/mxs/start.S
> @@ -20,7 +20,6 @@
>
> #include <asm-offsets.h>
> #include <config.h>
> -#include <common.h>
> #include <system-constants.h>
>
> /*
> diff --git a/arch/arm/cpu/arm926ejs/mxs/timer.c
> b/arch/arm/cpu/arm926ejs/mxs/timer.c
> index 3dff3d768d1c..cbd3b5d9958a 100644
> --- a/arch/arm/cpu/arm926ejs/mxs/timer.c
> +++ b/arch/arm/cpu/arm926ejs/mxs/timer.c
> @@ -9,7 +9,6 @@
> * (C) Copyright 2009-2010 Freescale Semiconductor, Inc.
> */
>
> -#include <common.h>
> #include <init.h>
> #include <time.h>
> #include <asm/global_data.h>
> diff --git a/arch/arm/include/asm/arch-mx5/clock.h
> b/arch/arm/include/asm/arch-mx5/clock.h
> index d585b5cf4b22..58013a85951a 100644
> --- a/arch/arm/include/asm/arch-mx5/clock.h
> +++ b/arch/arm/include/asm/arch-mx5/clock.h
> @@ -7,6 +7,8 @@
> #ifndef __ASM_ARCH_CLOCK_H
> #define __ASM_ARCH_CLOCK_H
>
> +#include <stdbool.h>
> +
> #ifdef CONFIG_SYS_MX5_HCLK
> #define MXC_HCLK CONFIG_SYS_MX5_HCLK
> #else
> diff --git a/arch/arm/include/asm/arch-mx7/sys_proto.h
> b/arch/arm/include/asm/arch-mx7/sys_proto.h
> index 634736cc09cd..5da0037b2c6b 100644
> --- a/arch/arm/include/asm/arch-mx7/sys_proto.h
> +++ b/arch/arm/include/asm/arch-mx7/sys_proto.h
> @@ -7,6 +7,8 @@
>
> #include <asm/mach-imx/sys_proto.h>
>
> +struct wdog_regs;
> +
> void set_wdog_reset(struct wdog_regs *wdog);
>
> #endif /* __SYS_PROTO_IMX7_ */
> diff --git a/arch/arm/mach-imx/cache.c b/arch/arm/mach-imx/cache.c index
> ab9b621a2a62..b368db49fce5 100644
> --- a/arch/arm/mach-imx/cache.c
> +++ b/arch/arm/mach-imx/cache.c
> @@ -3,7 +3,7 @@
> * Copyright 2015 Freescale Semiconductor, Inc.
> */
>
> -#include <common.h>
> +#include <config.h>
> #include <cpu_func.h>
> #include <asm/armv7.h>
> #include <asm/cache.h>
> diff --git a/arch/arm/mach-imx/cmd_bmode.c b/arch/arm/mach-
> imx/cmd_bmode.c index 5b2f4686230c..c20e80725f8b 100644
> --- a/arch/arm/mach-imx/cmd_bmode.c
> +++ b/arch/arm/mach-imx/cmd_bmode.c
> @@ -2,7 +2,6 @@
> /*
> * Copyright (C) 2012 Boundary Devices Inc.
> */
> -#include <common.h>
> #include <linux/errno.h>
> #include <asm/io.h>
> #include <asm/mach-imx/boot_mode.h>
> diff --git a/arch/arm/mach-imx/cmd_dek.c b/arch/arm/mach-imx/cmd_dek.c
> index 2f389dbe8df0..c7962ead2d54 100644
> --- a/arch/arm/mach-imx/cmd_dek.c
> +++ b/arch/arm/mach-imx/cmd_dek.c
> @@ -6,7 +6,7 @@
> * Command for encapsulating DEK blob
> */
>
> -#include <common.h>
> +#include <config.h>
> #include <command.h>
> #include <log.h>
> #include <malloc.h>
> @@ -17,6 +17,7 @@
> #include <asm/arch/clock.h>
> #include <mapmem.h>
> #include <tee.h>
> +#include <vsprintf.h>
> #ifdef CONFIG_IMX_SECO_DEK_ENCAP
> #include <imx_container.h>
> #include <firmware/imx/sci/sci.h>
> diff --git a/arch/arm/mach-imx/cmd_hdmidet.c b/arch/arm/mach-
> imx/cmd_hdmidet.c index e2571adfb006..8104ab26b08f 100644
> --- a/arch/arm/mach-imx/cmd_hdmidet.c
> +++ b/arch/arm/mach-imx/cmd_hdmidet.c
> @@ -2,7 +2,6 @@
> /*
> * Copyright (C) 2012 Boundary Devices Inc.
> */
> -#include <common.h>
> #include <command.h>
> #include <asm/arch/imx-regs.h>
> #include <asm/arch/mxc_hdmi.h>
> diff --git a/arch/arm/mach-imx/cmd_mfgprot.c b/arch/arm/mach-
> imx/cmd_mfgprot.c index 9576b48dde30..9925c9922687 100644
> --- a/arch/arm/mach-imx/cmd_mfgprot.c
> +++ b/arch/arm/mach-imx/cmd_mfgprot.c
> @@ -11,7 +11,7 @@
> #include <asm/arch/clock.h>
> #include <linux/compiler.h>
> #include <command.h>
> -#include <common.h>
> +#include <config.h>
> #include <env.h>
> #include <fsl_sec.h>
> #include <mapmem.h>
> diff --git a/arch/arm/mach-imx/cmd_nandbcb.c b/arch/arm/mach-
> imx/cmd_nandbcb.c index 70a213a49dd0..c2e452b69270 100644
> --- a/arch/arm/mach-imx/cmd_nandbcb.c
> +++ b/arch/arm/mach-imx/cmd_nandbcb.c
> @@ -11,7 +11,6 @@
> * SPDX-License-Identifier: GPL-2.0+
> */
>
> -#include <common.h>
> #include <command.h>
> #include <log.h>
> #include <malloc.h>
> diff --git a/arch/arm/mach-imx/cpu.c b/arch/arm/mach-imx/cpu.c index
> 488638c90585..ceee31eecd79 100644
> --- a/arch/arm/mach-imx/cpu.c
> +++ b/arch/arm/mach-imx/cpu.c
> @@ -7,7 +7,6 @@
> */
>
> #include <bootm.h>
> -#include <common.h>
> #include <dm.h>
> #include <init.h>
> #include <log.h>
> diff --git a/arch/arm/mach-imx/ddrmc-vf610-calibration.c b/arch/arm/mach-
> imx/ddrmc-vf610-calibration.c
> index 7d787d045980..2cf684322ea3 100644
> --- a/arch/arm/mach-imx/ddrmc-vf610-calibration.c
> +++ b/arch/arm/mach-imx/ddrmc-vf610-calibration.c
> @@ -7,7 +7,6 @@
> *
> */
> /* #define DEBUG */
> -#include <common.h>
> #include <log.h>
> #include <asm/io.h>
> #include <asm/arch/imx-regs.h>
> diff --git a/arch/arm/mach-imx/ddrmc-vf610.c b/arch/arm/mach-imx/ddrmc-
> vf610.c index 7895ee66f8a8..e449fa6f552d 100644
> --- a/arch/arm/mach-imx/ddrmc-vf610.c
> +++ b/arch/arm/mach-imx/ddrmc-vf610.c
> @@ -6,7 +6,6 @@
> * Copyright 2013 Freescale Semiconductor, Inc.
> */
>
> -#include <common.h>
> #include <asm/io.h>
> #include <asm/arch/imx-regs.h>
> #include <asm/arch/iomux-vf610.h>
> diff --git a/arch/arm/mach-imx/ele_ahab.c b/arch/arm/mach-imx/ele_ahab.c
> index d02316ed6cb1..eaeecf600423 100644
> --- a/arch/arm/mach-imx/ele_ahab.c
> +++ b/arch/arm/mach-imx/ele_ahab.c
> @@ -3,7 +3,6 @@
> * Copyright 2022 NXP
> */
>
> -#include <common.h>
> #include <command.h>
> #include <errno.h>
> #include <imx_container.h>
> @@ -15,6 +14,7 @@
> #include <console.h>
> #include <cpu_func.h>
> #include <asm/global_data.h>
> +#include <asm/u-boot.h>
>
> DECLARE_GLOBAL_DATA_PTR;
>
> diff --git a/arch/arm/mach-imx/hab.c b/arch/arm/mach-imx/hab.c index
> 27e053ef701c..85d90686f680 100644
> --- a/arch/arm/mach-imx/hab.c
> +++ b/arch/arm/mach-imx/hab.c
> @@ -3,7 +3,6 @@
> * Copyright (C) 2010-2015 Freescale Semiconductor, Inc.
> */
>
> -#include <common.h>
> #include <command.h>
> #include <config.h>
> #include <display_options.h>
> diff --git a/arch/arm/mach-imx/i2c-mxv7.c b/arch/arm/mach-imx/i2c-mxv7.c
> index a5866cf9f703..256db150818a 100644
> --- a/arch/arm/mach-imx/i2c-mxv7.c
> +++ b/arch/arm/mach-imx/i2c-mxv7.c
> @@ -2,8 +2,8 @@
> /*
> * Copyright (C) 2012 Boundary Devices Inc.
> */
> -#include <common.h>
> #include <malloc.h>
> +#include <time.h>
> #include <asm/arch/clock.h>
> #include <asm/arch/imx-regs.h>
> #include <linux/delay.h>
> diff --git a/arch/arm/mach-imx/image-container.c b/arch/arm/mach-
> imx/image-container.c
> index 35da0ae04258..e2388e3fef86 100644
> --- a/arch/arm/mach-imx/image-container.c
> +++ b/arch/arm/mach-imx/image-container.c
> @@ -3,7 +3,7 @@
> * Copyright 2019 NXP
> */
>
> -#include <common.h>
> +#include <config.h>
> #include <errno.h>
> #include <imx_container.h>
> #include <log.h>
> diff --git a/arch/arm/mach-imx/imx8/ahab.c b/arch/arm/mach-
> imx/imx8/ahab.c index 1c072f6af11d..ed44df394b15 100644
> --- a/arch/arm/mach-imx/imx8/ahab.c
> +++ b/arch/arm/mach-imx/imx8/ahab.c
> @@ -3,7 +3,6 @@
> * Copyright 2018-2019, 2022 NXP
> */
>
> -#include <common.h>
> #include <command.h>
> #include <errno.h>
> #include <imx_container.h>
> diff --git a/arch/arm/mach-imx/imx8/clock.c b/arch/arm/mach-
> imx/imx8/clock.c index 9941b57b4be5..4e49b5bf3755 100644
> --- a/arch/arm/mach-imx/imx8/clock.c
> +++ b/arch/arm/mach-imx/imx8/clock.c
> @@ -3,7 +3,6 @@
> * Copyright 2018 NXP
> */
>
> -#include <common.h>
> #include <asm/global_data.h>
> #include <linux/errno.h>
> #include <asm/arch/clock.h>
> diff --git a/arch/arm/mach-imx/imx8/cpu.c b/arch/arm/mach-imx/imx8/cpu.c
> index 6e643188f402..627baa1d83fd 100644
> --- a/arch/arm/mach-imx/imx8/cpu.c
> +++ b/arch/arm/mach-imx/imx8/cpu.c
> @@ -3,7 +3,6 @@
> * Copyright 2018, 2021 NXP
> */
>
> -#include <common.h>
> #include <clk.h>
> #include <cpu.h>
> #include <cpu_func.h>
> diff --git a/arch/arm/mach-imx/imx8/fdt.c b/arch/arm/mach-imx/imx8/fdt.c
> index c2bed3e0c1fb..6d0585f5cc67 100644
> --- a/arch/arm/mach-imx/imx8/fdt.c
> +++ b/arch/arm/mach-imx/imx8/fdt.c
> @@ -3,7 +3,6 @@
> * Copyright 2019 NXP
> */
>
> -#include <common.h>
> #include <log.h>
> #include <firmware/imx/sci/sci.h>
> #include <asm/arch/sys_proto.h>
> diff --git a/arch/arm/mach-imx/imx8/iomux.c b/arch/arm/mach-
> imx/imx8/iomux.c index e4f7651bd1d4..3e27d75827a5 100644
> --- a/arch/arm/mach-imx/imx8/iomux.c
> +++ b/arch/arm/mach-imx/imx8/iomux.c
> @@ -3,7 +3,6 @@
> * Copyright 2018 NXP
> */
>
> -#include <common.h>
> #include <log.h>
> #include <asm/global_data.h>
> #include <asm/io.h>
> diff --git a/arch/arm/mach-imx/imx8/misc.c b/arch/arm/mach-
> imx/imx8/misc.c index 0ce3036818b6..c77104d0338f 100644
> --- a/arch/arm/mach-imx/imx8/misc.c
> +++ b/arch/arm/mach-imx/imx8/misc.c
> @@ -1,5 +1,4 @@
> // SPDX-License-Identifier: GPL-2.0+
> -#include <common.h>
> #include <log.h>
> #include <firmware/imx/sci/sci.h>
> #include <asm/mach-imx/sys_proto.h>
> diff --git a/arch/arm/mach-imx/imx8/snvs_security_sc.c b/arch/arm/mach-
> imx/imx8/snvs_security_sc.c
> index 1eaa68f8d5ff..f13dfc155165 100644
> --- a/arch/arm/mach-imx/imx8/snvs_security_sc.c
> +++ b/arch/arm/mach-imx/imx8/snvs_security_sc.c
> @@ -14,7 +14,6 @@
> #include <command.h>
> #include <log.h>
> #include <stddef.h>
> -#include <common.h>
> #include <firmware/imx/sci/sci.h>
> #include <asm/arch-imx8/imx8-pins.h>
> #include <asm/arch-imx8/snvs_security_sc.h>
> diff --git a/arch/arm/mach-imx/imx8m/clock_imx8mm.c b/arch/arm/mach-
> imx/imx8m/clock_imx8mm.c
> index 47219957b58c..de630e940c90 100644
> --- a/arch/arm/mach-imx/imx8m/clock_imx8mm.c
> +++ b/arch/arm/mach-imx/imx8m/clock_imx8mm.c
> @@ -5,7 +5,6 @@
> * Peng Fan <peng....@nxp.com>
> */
>
> -#include <common.h>
> #include <asm/arch/clock.h>
> #include <asm/arch/imx-regs.h>
> #include <asm/arch/sys_proto.h>
> diff --git a/arch/arm/mach-imx/imx8m/clock_imx8mq.c b/arch/arm/mach-
> imx/imx8m/clock_imx8mq.c
> index 9db62b944e4c..7e6c37487163 100644
> --- a/arch/arm/mach-imx/imx8m/clock_imx8mq.c
> +++ b/arch/arm/mach-imx/imx8m/clock_imx8mq.c
> @@ -5,7 +5,6 @@
> * Peng Fan <peng....@nxp.com>
> */
>
> -#include <common.h>
> #include <command.h>
> #include <asm/arch/clock.h>
> #include <asm/arch/imx-regs.h>
> diff --git a/arch/arm/mach-imx/imx8m/clock_slice.c b/arch/arm/mach-
> imx/imx8m/clock_slice.c
> index b5ed27a923e0..7cfdc46d349e 100644
> --- a/arch/arm/mach-imx/imx8m/clock_slice.c
> +++ b/arch/arm/mach-imx/imx8m/clock_slice.c
> @@ -5,7 +5,6 @@
> * Peng Fan <peng....@nxp.com>
> */
>
> -#include <common.h>
> #include <asm/arch/clock.h>
> #include <asm/arch/imx-regs.h>
> #include <asm/io.h>
> diff --git a/arch/arm/mach-imx/imx8m/psci.c b/arch/arm/mach-
> imx/imx8m/psci.c index 62f0b768cfa4..f5644c642bd6 100644
> --- a/arch/arm/mach-imx/imx8m/psci.c
> +++ b/arch/arm/mach-imx/imx8m/psci.c
> @@ -10,7 +10,6 @@
> #include <asm/io.h>
> #include <asm/psci.h>
> #include <asm/secure.h>
> -#include <common.h>
> #include <cpu_func.h>
> #include <debug_uart.h>
> #include <fsl_wdog.h>
> diff --git a/arch/arm/mach-imx/imx8m/soc.c b/arch/arm/mach-
> imx/imx8m/soc.c index 0c49fb9cd488..be38ca528850 100644
> --- a/arch/arm/mach-imx/imx8m/soc.c
> +++ b/arch/arm/mach-imx/imx8m/soc.c
> @@ -5,7 +5,7 @@
> * Peng Fan <peng....@nxp.com>
> */
>
> -#include <common.h>
> +#include <config.h>
> #include <cpu_func.h>
> #include <event.h>
> #include <init.h>
> diff --git a/arch/arm/mach-imx/imx8ulp/cgc.c b/arch/arm/mach-
> imx/imx8ulp/cgc.c index d2fadb4877c9..f9d8ed5b048b 100644
> --- a/arch/arm/mach-imx/imx8ulp/cgc.c
> +++ b/arch/arm/mach-imx/imx8ulp/cgc.c
> @@ -3,7 +3,6 @@
> * Copyright 2021 NXP
> */
>
> -#include <common.h>
> #include <div64.h>
> #include <asm/io.h>
> #include <errno.h>
> diff --git a/arch/arm/mach-imx/imx8ulp/clock.c b/arch/arm/mach-
> imx/imx8ulp/clock.c
> index 36d12943a059..fadf165ece27 100644
> --- a/arch/arm/mach-imx/imx8ulp/clock.c
> +++ b/arch/arm/mach-imx/imx8ulp/clock.c
> @@ -3,7 +3,6 @@
> * Copyright 2020 NXP
> */
>
> -#include <common.h>
> #include <command.h>
> #include <div64.h>
> #include <asm/arch/imx-regs.h>
> diff --git a/arch/arm/mach-imx/imx8ulp/iomux.c b/arch/arm/mach-
> imx/imx8ulp/iomux.c
> index c6d20f546809..43f856bf7324 100644
> --- a/arch/arm/mach-imx/imx8ulp/iomux.c
> +++ b/arch/arm/mach-imx/imx8ulp/iomux.c
> @@ -3,7 +3,6 @@
> * Copyright 2020-2021 NXP
> */
>
> -#include <common.h>
> #include <asm/io.h>
> #include <asm/arch/imx-regs.h>
> #include <asm/arch/iomux.h>
> diff --git a/arch/arm/mach-imx/imx8ulp/pcc.c b/arch/arm/mach-
> imx/imx8ulp/pcc.c index e3c6d6760be2..449e496521f1 100644
> --- a/arch/arm/mach-imx/imx8ulp/pcc.c
> +++ b/arch/arm/mach-imx/imx8ulp/pcc.c
> @@ -3,7 +3,6 @@
> * Copyright 2021 NXP
> */
>
> -#include <common.h>
> #include <div64.h>
> #include <asm/io.h>
> #include <errno.h>
> diff --git a/arch/arm/mach-imx/imx8ulp/rdc.c b/arch/arm/mach-
> imx/imx8ulp/rdc.c index cfc09e79cbd5..ca657748ed9a 100644
> --- a/arch/arm/mach-imx/imx8ulp/rdc.c
> +++ b/arch/arm/mach-imx/imx8ulp/rdc.c
> @@ -3,7 +3,8 @@
> * Copyright 2021 NXP
> */
>
> -#include <common.h>
> +#include <config.h>
> +#include <linux/errno.h>
> #include <asm/io.h>
> #include <asm/types.h>
> #include <asm/arch/imx-regs.h>
> diff --git a/arch/arm/mach-imx/imx9/clock.c b/arch/arm/mach-
> imx/imx9/clock.c index 75d92af036a1..0abf4579a1e0 100644
> --- a/arch/arm/mach-imx/imx9/clock.c
> +++ b/arch/arm/mach-imx/imx9/clock.c
> @@ -5,7 +5,6 @@
> * Peng Fan <peng....@nxp.com>
> */
>
> -#include <common.h>
> #include <command.h>
> #include <asm/arch/clock.h>
> #include <asm/arch/imx-regs.h>
> diff --git a/arch/arm/mach-imx/imx9/clock_root.c b/arch/arm/mach-
> imx/imx9/clock_root.c
> index 7d7ae865946f..47106fffefba 100644
> --- a/arch/arm/mach-imx/imx9/clock_root.c
> +++ b/arch/arm/mach-imx/imx9/clock_root.c
> @@ -5,7 +5,7 @@
> * Peng Fan <peng....@nxp.com>
> */
>
> -#include <common.h>
> +#include <config.h>
> #include <command.h>
> #include <asm/arch/clock.h>
> #include <asm/arch/sys_proto.h>
> diff --git a/arch/arm/mach-imx/imx9/imx_bootaux.c b/arch/arm/mach-
> imx/imx9/imx_bootaux.c
> index 6afb59e05159..73f2e72263d6 100644
> --- a/arch/arm/mach-imx/imx9/imx_bootaux.c
> +++ b/arch/arm/mach-imx/imx9/imx_bootaux.c
> @@ -3,11 +3,12 @@
> * Copyright 2022 NXP
> */
>
> -#include <common.h>
> #include <command.h>
> #include <log.h>
> #include <imx_sip.h>
> +#include <vsprintf.h>
> #include <linux/arm-smccc.h>
> +#include <linux/errno.h>
>
> int arch_auxiliary_core_check_up(u32 core_id) { diff --git a/arch/arm/mach-
> imx/imx9/soc.c b/arch/arm/mach-imx/imx9/soc.c index
> 2117489f2320..32208220b207 100644
> --- a/arch/arm/mach-imx/imx9/soc.c
> +++ b/arch/arm/mach-imx/imx9/soc.c
> @@ -5,7 +5,7 @@
> * Peng Fan <peng....@nxp.com>
> */
>
> -#include <common.h>
> +#include <config.h>
> #include <cpu_func.h>
> #include <init.h>
> #include <log.h>
> diff --git a/arch/arm/mach-imx/imx9/trdc.c b/arch/arm/mach-
> imx/imx9/trdc.c index d0f855bb1bc1..8cdb28459a36 100644
> --- a/arch/arm/mach-imx/imx9/trdc.c
> +++ b/arch/arm/mach-imx/imx9/trdc.c
> @@ -3,8 +3,8 @@
> * Copyright 2022 NXP
> */
>
> -#include <common.h>
> #include <log.h>
> +#include <linux/errno.h>
> #include <asm/io.h>
> #include <asm/types.h>
> #include <asm/arch/imx-regs.h>
> diff --git a/arch/arm/mach-imx/imx_bootaux.c b/arch/arm/mach-
> imx/imx_bootaux.c index f7b14ca38d94..26374fdc33ec 100644
> --- a/arch/arm/mach-imx/imx_bootaux.c
> +++ b/arch/arm/mach-imx/imx_bootaux.c
> @@ -3,15 +3,18 @@
> * Copyright (C) 2016 Freescale Semiconductor, Inc.
> */
>
> -#include <common.h>
> #include <log.h>
> +#include <asm/arch/imx-regs.h>
> #include <asm/io.h>
> #include <asm/mach-imx/sys_proto.h>
> #include <command.h>
> #include <elf.h>
> #include <imx_sip.h>
> +#include <vsprintf.h>
> #include <linux/arm-smccc.h>
> #include <linux/compiler.h>
> +#include <linux/errno.h>
> +#include <linux/string.h>
> #include <cpu_func.h>
>
> #ifndef CONFIG_IMX8
> diff --git a/arch/arm/mach-imx/imxrt/soc.c b/arch/arm/mach-imx/imxrt/soc.c
> index 34162a3976fb..3028957953bd 100644
> --- a/arch/arm/mach-imx/imxrt/soc.c
> +++ b/arch/arm/mach-imx/imxrt/soc.c
> @@ -4,7 +4,6 @@
> * Author(s): Giulio Benetti <giulio.bene...@benettiengineering.com>
> */
>
> -#include <common.h>
> #include <init.h>
> #include <asm/io.h>
> #include <asm/armv7_mpu.h>
> diff --git a/arch/arm/mach-imx/iomux-v3.c b/arch/arm/mach-imx/iomux-v3.c
> index 18131a20f438..c134e95ed780 100644
> --- a/arch/arm/mach-imx/iomux-v3.c
> +++ b/arch/arm/mach-imx/iomux-v3.c
> @@ -7,7 +7,6 @@
> *
> * Copyright (C) 2004-2011 Freescale Semiconductor, Inc.
> */
> -#include <common.h>
> #include <asm/io.h>
> #include <asm/arch/imx-regs.h>
> #include <asm/mach-imx/iomux-v3.h>
> diff --git a/arch/arm/mach-imx/mac.c b/arch/arm/mach-imx/mac.c index
> 9bb63d25b488..e739fd14c898 100644
> --- a/arch/arm/mach-imx/mac.c
> +++ b/arch/arm/mach-imx/mac.c
> @@ -5,7 +5,6 @@
> * Peng Fan <peng....@nxp.com>
> */
>
> -#include <common.h>
> #include <asm/arch/imx-regs.h>
> #include <asm/io.h>
> #include <asm/arch/sys_proto.h>
> diff --git a/arch/arm/mach-imx/misc.c b/arch/arm/mach-imx/misc.c index
> 09a758ff6e89..7452b82f1105 100644
> --- a/arch/arm/mach-imx/misc.c
> +++ b/arch/arm/mach-imx/misc.c
> @@ -3,7 +3,6 @@
> * Copyright 2013 Stefan Roese <s...@denx.de>
> */
>
> -#include <common.h>
> #include <lmb.h>
> #include <log.h>
> #include <asm/arch/sys_proto.h>
> diff --git a/arch/arm/mach-imx/mmc_env.c b/arch/arm/mach-
> imx/mmc_env.c index 9c822f721c60..34a7d1706f3d 100644
> --- a/arch/arm/mach-imx/mmc_env.c
> +++ b/arch/arm/mach-imx/mmc_env.c
> @@ -3,7 +3,6 @@
> * Copyright (C) 2017 NXP
> */
>
> -#include <common.h>
> #include <asm/arch/imx-regs.h>
> #include <asm/arch/sys_proto.h>
> #include <asm/io.h>
> diff --git a/arch/arm/mach-imx/mmdc_size.c b/arch/arm/mach-
> imx/mmdc_size.c index 41a5af6bd307..2b1d203f8635 100644
> --- a/arch/arm/mach-imx/mmdc_size.c
> +++ b/arch/arm/mach-imx/mmdc_size.c
> @@ -1,6 +1,6 @@
> // SPDX-License-Identifier: GPL-2.0+
>
> -#include <common.h>
> +#include <config.h>
> #include <asm/io.h>
>
> #if defined(CONFIG_MX53)
> diff --git a/arch/arm/mach-imx/mx5/clock.c b/arch/arm/mach-
> imx/mx5/clock.c index bbaddd5a33fa..0b8a10fd7294 100644
> --- a/arch/arm/mach-imx/mx5/clock.c
> +++ b/arch/arm/mach-imx/mx5/clock.c
> @@ -6,7 +6,6 @@
> * (C) Copyright 2009 Freescale Semiconductor, Inc.
> */
>
> -#include <common.h>
> #include <command.h>
> #include <log.h>
> #include <asm/io.h>
> diff --git a/arch/arm/mach-imx/mx5/mx53_dram.c b/arch/arm/mach-
> imx/mx5/mx53_dram.c
> index f74414419470..6459b4a82d25 100644
> --- a/arch/arm/mach-imx/mx5/mx53_dram.c
> +++ b/arch/arm/mach-imx/mx5/mx53_dram.c
> @@ -4,9 +4,9 @@
> * Patrick Bruenn <p.bru...@beckhoff.com>
> */
>
> -#include <common.h>
> #include <init.h>
> #include <asm/global_data.h>
> +#include <asm/u-boot.h>
>
> DECLARE_GLOBAL_DATA_PTR;
>
> diff --git a/arch/arm/mach-imx/mx5/soc.c b/arch/arm/mach-imx/mx5/soc.c
> index 47f531dc856c..4df5f9c16416 100644
> --- a/arch/arm/mach-imx/mx5/soc.c
> +++ b/arch/arm/mach-imx/mx5/soc.c
> @@ -6,7 +6,6 @@
> * (C) Copyright 2009 Freescale Semiconductor, Inc.
> */
>
> -#include <common.h>
> #include <cpu_func.h>
> #include <asm/arch/imx-regs.h>
> #include <asm/arch/clock.h>
> diff --git a/arch/arm/mach-imx/mx6/clock.c b/arch/arm/mach-
> imx/mx6/clock.c index e0da9c239584..fb9f56d2e63c 100644
> --- a/arch/arm/mach-imx/mx6/clock.c
> +++ b/arch/arm/mach-imx/mx6/clock.c
> @@ -3,10 +3,10 @@
> * Copyright (C) 2010-2011 Freescale Semiconductor, Inc.
> */
>
> -#include <common.h>
> #include <command.h>
> #include <div64.h>
> #include <log.h>
> +#include <time.h>
> #include <asm/io.h>
> #include <linux/errno.h>
> #include <asm/arch/imx-regs.h>
> diff --git a/arch/arm/mach-imx/mx6/ddr.c b/arch/arm/mach-imx/mx6/ddr.c
> index 3c87c577737b..5a1258e002d2 100644
> --- a/arch/arm/mach-imx/mx6/ddr.c
> +++ b/arch/arm/mach-imx/mx6/ddr.c
> @@ -4,7 +4,6 @@
> * Author: Tim Harvey <thar...@gateworks.com>
> */
>
> -#include <common.h>
> #include <hang.h>
> #include <log.h>
> #include <linux/delay.h>
> diff --git a/arch/arm/mach-imx/mx6/litesom.c b/arch/arm/mach-
> imx/mx6/litesom.c index 2ba3245e226c..ab5de2665778 100644
> --- a/arch/arm/mach-imx/mx6/litesom.c
> +++ b/arch/arm/mach-imx/mx6/litesom.c
> @@ -17,7 +17,7 @@
> #include <asm/mach-imx/iomux-v3.h>
> #include <asm/mach-imx/boot_mode.h>
> #include <asm/io.h>
> -#include <common.h>
> +#include <config.h>
> #include <fsl_esdhc_imx.h>
> #include <linux/delay.h>
> #include <linux/sizes.h>
> diff --git a/arch/arm/mach-imx/mx6/module_fuse.c b/arch/arm/mach-
> imx/mx6/module_fuse.c
> index b58f11c1e562..8b23d48a854c 100644
> --- a/arch/arm/mach-imx/mx6/module_fuse.c
> +++ b/arch/arm/mach-imx/mx6/module_fuse.c
> @@ -3,7 +3,6 @@
> * Copyright 2019 NXP
> */
>
> -#include <common.h>
> #include <fdt_support.h>
> #include <asm/io.h>
> #include <asm/arch/sys_proto.h>
> diff --git a/arch/arm/mach-imx/mx6/mp.c b/arch/arm/mach-imx/mx6/mp.c
> index de9ace083ce8..091a37238316 100644
> --- a/arch/arm/mach-imx/mx6/mp.c
> +++ b/arch/arm/mach-imx/mx6/mp.c
> @@ -6,7 +6,6 @@
> * (C) Copyright 2009 Freescale Semiconductor, Inc.
> */
>
> -#include <common.h>
> #include <cpu_func.h>
> #include <asm/io.h>
> #include <linux/errno.h>
> diff --git a/arch/arm/mach-imx/mx6/opos6ul.c b/arch/arm/mach-
> imx/mx6/opos6ul.c index 38ead8ace20c..340e6147b638 100644
> --- a/arch/arm/mach-imx/mx6/opos6ul.c
> +++ b/arch/arm/mach-imx/mx6/opos6ul.c
> @@ -10,7 +10,7 @@
> #include <asm/arch/sys_proto.h>
> #include <asm/global_data.h>
> #include <asm/io.h>
> -#include <common.h>
> +#include <config.h>
> #include <env.h>
>
> DECLARE_GLOBAL_DATA_PTR;
> diff --git a/arch/arm/mach-imx/mx6/soc.c b/arch/arm/mach-imx/mx6/soc.c
> index c2875e727c94..3a3e01f3d0aa 100644
> --- a/arch/arm/mach-imx/mx6/soc.c
> +++ b/arch/arm/mach-imx/mx6/soc.c
> @@ -7,7 +7,6 @@
> * Copyright 2021 NXP
> */
>
> -#include <common.h>
> #include <env.h>
> #include <init.h>
> #include <linux/delay.h>
> diff --git a/arch/arm/mach-imx/mx7/clock.c b/arch/arm/mach-
> imx/mx7/clock.c index 4e232385afc3..a8606fa9b24b 100644
> --- a/arch/arm/mach-imx/mx7/clock.c
> +++ b/arch/arm/mach-imx/mx7/clock.c
> @@ -6,11 +6,12 @@
> * Peng Fan <peng....@freescale.com>
> */
>
> -#include <common.h>
> +#include <config.h>
> #include <clock_legacy.h>
> #include <command.h>
> #include <div64.h>
> #include <log.h>
> +#include <time.h>
> #include <asm/global_data.h>
> #include <asm/io.h>
> #include <linux/errno.h>
> diff --git a/arch/arm/mach-imx/mx7/clock_slice.c b/arch/arm/mach-
> imx/mx7/clock_slice.c
> index dd731d949621..2a1304fc1128 100644
> --- a/arch/arm/mach-imx/mx7/clock_slice.c
> +++ b/arch/arm/mach-imx/mx7/clock_slice.c
> @@ -6,7 +6,6 @@
> * Peng Fan <peng....@freescale.com>
> */
>
> -#include <common.h>
> #include <div64.h>
> #include <asm/io.h>
> #include <linux/errno.h>
> diff --git a/arch/arm/mach-imx/mx7/ddr.c b/arch/arm/mach-imx/mx7/ddr.c
> index cf25569765ea..c4a90be3945b 100644
> --- a/arch/arm/mach-imx/mx7/ddr.c
> +++ b/arch/arm/mach-imx/mx7/ddr.c
> @@ -12,7 +12,6 @@
> #include <asm/arch/imx-regs.h>
> #include <asm/arch/crm_regs.h>
> #include <asm/arch/mx7-ddr.h>
> -#include <common.h>
> #include <linux/delay.h>
>
> /*
> diff --git a/arch/arm/mach-imx/mx7/psci-mx7.c b/arch/arm/mach-
> imx/mx7/psci-mx7.c
> index 0b71fa403446..12d6a63b9255 100644
> --- a/arch/arm/mach-imx/mx7/psci-mx7.c
> +++ b/arch/arm/mach-imx/mx7/psci-mx7.c
> @@ -13,7 +13,6 @@
> #include <asm/armv7.h>
> #include <asm/gic.h>
> #include <linux/bitops.h>
> -#include <common.h>
> #include <fsl_wdog.h>
>
> #define GPC_LPCR_A7_BSC 0x0
> diff --git a/arch/arm/mach-imx/mx7/soc.c b/arch/arm/mach-imx/mx7/soc.c
> index 689dbefe8ee0..16c77cbf7bee 100644
> --- a/arch/arm/mach-imx/mx7/soc.c
> +++ b/arch/arm/mach-imx/mx7/soc.c
> @@ -4,7 +4,6 @@
> * Copyright 2021 NXP
> */
>
> -#include <common.h>
> #include <init.h>
> #include <asm/io.h>
> #include <asm/arch/imx-regs.h>
> diff --git a/arch/arm/mach-imx/mx7ulp/clock.c b/arch/arm/mach-
> imx/mx7ulp/clock.c
> index 37d8565c20fc..fb19c62a5200 100644
> --- a/arch/arm/mach-imx/mx7ulp/clock.c
> +++ b/arch/arm/mach-imx/mx7ulp/clock.c
> @@ -3,7 +3,7 @@
> * Copyright (C) 2016 Freescale Semiconductor, Inc.
> */
>
> -#include <common.h>
> +#include <config.h>
> #include <clock_legacy.h>
> #include <command.h>
> #include <div64.h>
> diff --git a/arch/arm/mach-imx/mx7ulp/iomux.c b/arch/arm/mach-
> imx/mx7ulp/iomux.c
> index 05ddeed2a64b..2c87a8c18b96 100644
> --- a/arch/arm/mach-imx/mx7ulp/iomux.c
> +++ b/arch/arm/mach-imx/mx7ulp/iomux.c
> @@ -2,7 +2,6 @@
> /*
> * Copyright (C) 2016 Freescale Semiconductor, Inc.
> */
> -#include <common.h>
> #include <log.h>
> #include <asm/io.h>
> #include <asm/arch/imx-regs.h>
> diff --git a/arch/arm/mach-imx/mx7ulp/pcc.c b/arch/arm/mach-
> imx/mx7ulp/pcc.c index aa7ea86a443e..0bfd8f71815a 100644
> --- a/arch/arm/mach-imx/mx7ulp/pcc.c
> +++ b/arch/arm/mach-imx/mx7ulp/pcc.c
> @@ -3,7 +3,6 @@
> * Copyright (C) 2016 Freescale Semiconductor, Inc.
> */
>
> -#include <common.h>
> #include <div64.h>
> #include <log.h>
> #include <asm/io.h>
> diff --git a/arch/arm/mach-imx/mx7ulp/scg.c b/arch/arm/mach-
> imx/mx7ulp/scg.c index 4c066557c1ca..d4fb5389cacb 100644
> --- a/arch/arm/mach-imx/mx7ulp/scg.c
> +++ b/arch/arm/mach-imx/mx7ulp/scg.c
> @@ -3,7 +3,7 @@
> * Copyright (C) 2016 Freescale Semiconductor, Inc.
> */
>
> -#include <common.h>
> +#include <config.h>
> #include <div64.h>
> #include <log.h>
> #include <asm/io.h>
> diff --git a/arch/arm/mach-imx/mx7ulp/soc.c b/arch/arm/mach-
> imx/mx7ulp/soc.c index 217b7c45867d..198ae2d919c9 100644
> --- a/arch/arm/mach-imx/mx7ulp/soc.c
> +++ b/arch/arm/mach-imx/mx7ulp/soc.c
> @@ -4,7 +4,7 @@
> * Copyright 2021 NXP
> */
>
> -#include <common.h>
> +#include <config.h>
> #include <cpu_func.h>
> #include <init.h>
> #include <log.h>
> diff --git a/arch/arm/mach-imx/priblob.c b/arch/arm/mach-imx/priblob.c
> index 5b022d5c8201..65924483bc89 100644
> --- a/arch/arm/mach-imx/priblob.c
> +++ b/arch/arm/mach-imx/priblob.c
> @@ -11,7 +11,6 @@
> */
>
> #include <asm/io.h>
> -#include <common.h>
> #include <command.h>
> #include <fsl_sec.h>
>
> diff --git a/arch/arm/mach-imx/rdc-sema.c b/arch/arm/mach-imx/rdc-sema.c
> index e683673753e1..56725cc109f0 100644
> --- a/arch/arm/mach-imx/rdc-sema.c
> +++ b/arch/arm/mach-imx/rdc-sema.c
> @@ -2,7 +2,6 @@
> /*
> * Copyright (C) 2016 Freescale Semiconductor, Inc.
> */
> -#include <common.h>
> #include <asm/io.h>
> #include <asm/arch/imx-regs.h>
> #include <asm/mach-imx/rdc-sema.h>
> diff --git a/arch/arm/mach-imx/speed.c b/arch/arm/mach-imx/speed.c index
> 0e81cc880a1a..98a42b22f9cc 100644
> --- a/arch/arm/mach-imx/speed.c
> +++ b/arch/arm/mach-imx/speed.c
> @@ -7,7 +7,7 @@
> * TsiChung Liew (tsi-chung.l...@freescale.com)
> */
>
> -#include <common.h>
> +#include <config.h>
> #include <clock_legacy.h>
> #include <asm/arch/imx-regs.h>
> #include <asm/arch/clock.h>
> diff --git a/arch/arm/mach-imx/spl.c b/arch/arm/mach-imx/spl.c index
> b30cd9625538..bc291dcd1296 100644
> --- a/arch/arm/mach-imx/spl.c
> +++ b/arch/arm/mach-imx/spl.c
> @@ -6,7 +6,7 @@
> * Author: Tim Harvey <thar...@gateworks.com>
> */
>
> -#include <common.h>
> +#include <config.h>
> #include <hang.h>
> #include <init.h>
> #include <log.h>
> diff --git a/arch/arm/mach-imx/spl_imx_romapi.c b/arch/arm/mach-
> imx/spl_imx_romapi.c
> index b9ff9bb83b3c..9a86f5c133f7 100644
> --- a/arch/arm/mach-imx/spl_imx_romapi.c
> +++ b/arch/arm/mach-imx/spl_imx_romapi.c
> @@ -3,7 +3,6 @@
> * Copyright 2019 NXP
> */
>
> -#include <common.h>
> #include <errno.h>
> #include <image.h>
> #include <imx_container.h>
> diff --git a/arch/arm/mach-imx/syscounter.c b/arch/arm/mach-
> imx/syscounter.c index 16df1186759e..922f851c56b7 100644
> --- a/arch/arm/mach-imx/syscounter.c
> +++ b/arch/arm/mach-imx/syscounter.c
> @@ -5,7 +5,7 @@
> * The file use ls102xa/timer.c as a reference.
> */
>
> -#include <common.h>
> +#include <config.h>
> #include <init.h>
> #include <time.h>
> #include <asm/global_data.h>
> diff --git a/arch/arm/mach-imx/timer.c b/arch/arm/mach-imx/timer.c index
> fcd45f09f181..5ac8f28e670d 100644
> --- a/arch/arm/mach-imx/timer.c
> +++ b/arch/arm/mach-imx/timer.c
> @@ -6,7 +6,6 @@
> * (C) Copyright 2009 Freescale Semiconductor, Inc.
> */
>
> -#include <common.h>
> #include <init.h>
> #include <time.h>
> #include <asm/io.h>
> diff --git a/arch/arm/mach-imx/video.c b/arch/arm/mach-imx/video.c index
> 1bc9b7cc7e15..6cbb49da53cc 100644
> --- a/arch/arm/mach-imx/video.c
> +++ b/arch/arm/mach-imx/video.c
> @@ -1,8 +1,9 @@
> // SPDX-License-Identifier: GPL-2.0+
>
> -#include <common.h>
> +#include <stdio.h>
> #include <env.h>
> #include <linux/errno.h>
> +#include <asm/arch/imx-regs.h>
> #include <asm/mach-imx/video.h>
>
> #ifdef CONFIG_IMX_HDMI
> --
> 2.34.1
