diff options
Diffstat (limited to 'plat/imx/common')
-rw-r--r-- | plat/imx/common/imx8_psci.c | 6 | ||||
-rw-r--r-- | plat/imx/common/imx8_topology.c | 2 | ||||
-rw-r--r-- | plat/imx/common/imx_aips.c | 5 | ||||
-rw-r--r-- | plat/imx/common/imx_caam.c | 5 | ||||
-rw-r--r-- | plat/imx/common/imx_clock.c | 7 | ||||
-rw-r--r-- | plat/imx/common/imx_csu.c | 4 | ||||
-rw-r--r-- | plat/imx/common/imx_io_mux.c | 3 | ||||
-rw-r--r-- | plat/imx/common/imx_snvs.c | 3 | ||||
-rw-r--r-- | plat/imx/common/imx_wdog.c | 3 | ||||
-rw-r--r-- | plat/imx/common/include/imx8_lpuart.h | 2 | ||||
-rw-r--r-- | plat/imx/common/include/imx_snvs.h | 1 | ||||
-rw-r--r-- | plat/imx/common/include/imx_uart.h | 2 | ||||
-rw-r--r-- | plat/imx/common/include/imx_wdog.h | 3 | ||||
-rw-r--r-- | plat/imx/common/include/plat_imx8.h | 4 | ||||
-rw-r--r-- | plat/imx/common/include/sci/sci_rpc.h | 3 | ||||
-rw-r--r-- | plat/imx/common/plat_imx8_gic.c | 14 | ||||
-rw-r--r-- | plat/imx/common/sci/imx8_mu.c | 3 | ||||
-rw-r--r-- | plat/imx/common/sci/ipc.c | 6 | ||||
-rw-r--r-- | plat/imx/common/sci/svc/pad/pad_rpc_clnt.c | 3 | ||||
-rw-r--r-- | plat/imx/common/sci/svc/pm/pm_rpc_clnt.c | 4 | ||||
-rw-r--r-- | plat/imx/common/sci/svc/rm/rm_rpc_clnt.c | 4 |
21 files changed, 57 insertions, 30 deletions
diff --git a/plat/imx/common/imx8_psci.c b/plat/imx/common/imx8_psci.c index 22a531bf83..588d8b4e25 100644 --- a/plat/imx/common/imx8_psci.c +++ b/plat/imx/common/imx8_psci.c @@ -4,12 +4,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include <stdbool.h> + #include <arch.h> #include <arch_helpers.h> -#include <debug.h> +#include <common/debug.h> + #include <plat_imx8.h> #include <sci/sci.h> -#include <stdbool.h> void __dead2 imx_system_off(void) { diff --git a/plat/imx/common/imx8_topology.c b/plat/imx/common/imx8_topology.c index 64145c4ca8..5e14d17fa2 100644 --- a/plat/imx/common/imx8_topology.c +++ b/plat/imx/common/imx8_topology.c @@ -6,7 +6,7 @@ #include <arch.h> #include <arch_helpers.h> -#include <platform.h> +#include <plat/common/platform.h> const unsigned char imx_power_domain_tree_desc[] = { PWR_DOMAIN_AT_MAX_LVL, diff --git a/plat/imx/common/imx_aips.c b/plat/imx/common/imx_aips.c index 991c262bc4..532d9c0eb1 100644 --- a/plat/imx/common/imx_aips.c +++ b/plat/imx/common/imx_aips.c @@ -4,8 +4,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <mmio.h> -#include <utils_def.h> +#include <lib/mmio.h> +#include <lib/utils_def.h> + #include <imx_aips.h> #include <imx_regs.h> diff --git a/plat/imx/common/imx_caam.c b/plat/imx/common/imx_caam.c index 335e1ed8ec..d9c141f562 100644 --- a/plat/imx/common/imx_caam.c +++ b/plat/imx/common/imx_caam.c @@ -3,8 +3,11 @@ * * SPDX-License-Identifier: BSD-3-Clause */ + #include <stdint.h> -#include <mmio.h> + +#include <lib/mmio.h> + #include <imx_caam.h> void imx_caam_init(void) diff --git a/plat/imx/common/imx_clock.c b/plat/imx/common/imx_clock.c index ccf2aeb138..743de553ab 100644 --- a/plat/imx/common/imx_clock.c +++ b/plat/imx/common/imx_clock.c @@ -3,10 +3,13 @@ * * SPDX-License-Identifier: BSD-3-Clause */ -#include <arch.h> -#include <mmio.h> + #include <stdint.h> #include <stdbool.h> + +#include <arch.h> +#include <lib/mmio.h> + #include <imx_regs.h> #include <imx_clock.h> diff --git a/plat/imx/common/imx_csu.c b/plat/imx/common/imx_csu.c index 7c6a63e8a2..7e165d9281 100644 --- a/plat/imx/common/imx_csu.c +++ b/plat/imx/common/imx_csu.c @@ -3,7 +3,9 @@ * * SPDX-License-Identifier: BSD-3-Clause */ -#include <mmio.h> + +#include <lib/mmio.h> + #include <imx_csu.h> #include <imx_regs.h> diff --git a/plat/imx/common/imx_io_mux.c b/plat/imx/common/imx_io_mux.c index 723064716a..75de5d14e4 100644 --- a/plat/imx/common/imx_io_mux.c +++ b/plat/imx/common/imx_io_mux.c @@ -4,7 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <mmio.h> +#include <lib/mmio.h> + #include <imx_regs.h> #include <imx_io_mux.h> diff --git a/plat/imx/common/imx_snvs.c b/plat/imx/common/imx_snvs.c index 4a2a7d7250..9b3a737768 100644 --- a/plat/imx/common/imx_snvs.c +++ b/plat/imx/common/imx_snvs.c @@ -4,7 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <mmio.h> +#include <lib/mmio.h> + #include <imx_regs.h> #include <imx_snvs.h> diff --git a/plat/imx/common/imx_wdog.c b/plat/imx/common/imx_wdog.c index 86813dd017..af6d7678e9 100644 --- a/plat/imx/common/imx_wdog.c +++ b/plat/imx/common/imx_wdog.c @@ -4,7 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <mmio.h> +#include <lib/mmio.h> + #include <imx_regs.h> #include <imx_wdog.h> diff --git a/plat/imx/common/include/imx8_lpuart.h b/plat/imx/common/include/imx8_lpuart.h index 8e1184f959..63449e7def 100644 --- a/plat/imx/common/include/imx8_lpuart.h +++ b/plat/imx/common/include/imx8_lpuart.h @@ -7,7 +7,7 @@ #ifndef IMX8_LPUART_H #define IMX8_LPUART_H -#include <console.h> +#include <drivers/console.h> #define VERID 0x0 #define PARAM 0x4 diff --git a/plat/imx/common/include/imx_snvs.h b/plat/imx/common/include/imx_snvs.h index 0aed1e142f..0b3d1085f7 100644 --- a/plat/imx/common/include/imx_snvs.h +++ b/plat/imx/common/include/imx_snvs.h @@ -7,6 +7,7 @@ #define IMX_SNVS_H #include <stdint.h> + #include <arch.h> struct snvs { diff --git a/plat/imx/common/include/imx_uart.h b/plat/imx/common/include/imx_uart.h index d2c3968886..a251024f16 100644 --- a/plat/imx/common/include/imx_uart.h +++ b/plat/imx/common/include/imx_uart.h @@ -7,7 +7,7 @@ #ifndef IMX_UART_H #define IMX_UART_H -#include <console.h> +#include <drivers/console.h> #ifndef __ASSEMBLY__ diff --git a/plat/imx/common/include/imx_wdog.h b/plat/imx/common/include/imx_wdog.h index 7b3037dfea..75a729a99d 100644 --- a/plat/imx/common/include/imx_wdog.h +++ b/plat/imx/common/include/imx_wdog.h @@ -7,9 +7,10 @@ #ifndef IMX_WDOG_H #define IMX_WDOG_H -#include <arch.h> #include <stdint.h> +#include <arch.h> + struct wdog_regs { uint16_t wcr; uint16_t wsr; diff --git a/plat/imx/common/include/plat_imx8.h b/plat/imx/common/include/plat_imx8.h index 03799c459b..8d83173fdb 100644 --- a/plat/imx/common/include/plat_imx8.h +++ b/plat/imx/common/include/plat_imx8.h @@ -7,8 +7,8 @@ #ifndef PLAT_IMX8_H #define PLAT_IMX8_H -#include <gicv3.h> -#include <psci.h> +#include <drivers/arm/gicv3.h> +#include <lib/psci/psci.h> unsigned int plat_calc_core_pos(uint64_t mpidr); void imx_mailbox_init(uintptr_t base_addr); diff --git a/plat/imx/common/include/sci/sci_rpc.h b/plat/imx/common/include/sci/sci_rpc.h index 1771baed37..60dbc27b6b 100644 --- a/plat/imx/common/include/sci/sci_rpc.h +++ b/plat/imx/common/include/sci/sci_rpc.h @@ -13,9 +13,10 @@ /* Includes */ +#include <stdbool.h> + #include <sci/sci_types.h> #include <sci/sci_ipc.h> -#include <stdbool.h> /* Defines */ diff --git a/plat/imx/common/plat_imx8_gic.c b/plat/imx/common/plat_imx8_gic.c index 2da9cc0d98..aec0b6c9b1 100644 --- a/plat/imx/common/plat_imx8_gic.c +++ b/plat/imx/common/plat_imx8_gic.c @@ -4,13 +4,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <bl_common.h> -#include <gicv3.h> -#include <interrupt_props.h> -#include <plat_imx8.h> -#include <platform.h> #include <platform_def.h> -#include <utils.h> + +#include <common/bl_common.h> +#include <common/interrupt_props.h> +#include <drivers/arm/gicv3.h> +#include <lib/utils.h> +#include <plat/common/platform.h> + +#include <plat_imx8.h> /* the GICv3 driver only needs to be initialized in EL3 */ uintptr_t rdistif_base_addrs[PLATFORM_CORE_COUNT]; diff --git a/plat/imx/common/sci/imx8_mu.c b/plat/imx/common/sci/imx8_mu.c index 8028c76d62..26d9bdfef9 100644 --- a/plat/imx/common/sci/imx8_mu.c +++ b/plat/imx/common/sci/imx8_mu.c @@ -4,7 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <mmio.h> +#include <lib/mmio.h> + #include "imx8_mu.h" void MU_EnableRxFullInt(uint32_t base, uint32_t index) diff --git a/plat/imx/common/sci/ipc.c b/plat/imx/common/sci/ipc.c index 2af2567828..6491ca575f 100644 --- a/plat/imx/common/sci/ipc.c +++ b/plat/imx/common/sci/ipc.c @@ -4,11 +4,13 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <bakery_lock.h> +#include <stdlib.h> + +#include <lib/bakery_lock.h> + #include <sci/sci_scfw.h> #include <sci/sci_ipc.h> #include <sci/sci_rpc.h> -#include <stdlib.h> #include "imx8_mu.h" DEFINE_BAKERY_LOCK(sc_ipc_bakery_lock); diff --git a/plat/imx/common/sci/svc/pad/pad_rpc_clnt.c b/plat/imx/common/sci/svc/pad/pad_rpc_clnt.c index 555e7047a8..319d4696d8 100644 --- a/plat/imx/common/sci/svc/pad/pad_rpc_clnt.c +++ b/plat/imx/common/sci/svc/pad/pad_rpc_clnt.c @@ -14,11 +14,12 @@ /* Includes */ +#include <stdlib.h> + #include <sci/sci_types.h> #include <sci/svc/rm/sci_rm_api.h> #include <sci/svc/pad/sci_pad_api.h> #include <sci/sci_rpc.h> -#include <stdlib.h> #include "sci_pad_rpc.h" /* Local Defines */ diff --git a/plat/imx/common/sci/svc/pm/pm_rpc_clnt.c b/plat/imx/common/sci/svc/pm/pm_rpc_clnt.c index b108c499b5..66a57a13d5 100644 --- a/plat/imx/common/sci/svc/pm/pm_rpc_clnt.c +++ b/plat/imx/common/sci/svc/pm/pm_rpc_clnt.c @@ -14,11 +14,13 @@ /* Includes */ +#include <stdlib.h> + #include <sci/sci_types.h> #include <sci/svc/rm/sci_rm_api.h> #include <sci/svc/pm/sci_pm_api.h> #include <sci/sci_rpc.h> -#include <stdlib.h> + #include "sci_pm_rpc.h" /* Local Defines */ diff --git a/plat/imx/common/sci/svc/rm/rm_rpc_clnt.c b/plat/imx/common/sci/svc/rm/rm_rpc_clnt.c index 230956c7cc..16771a5836 100644 --- a/plat/imx/common/sci/svc/rm/rm_rpc_clnt.c +++ b/plat/imx/common/sci/svc/rm/rm_rpc_clnt.c @@ -14,10 +14,12 @@ /* Includes */ +#include <stdlib.h> + #include <sci/sci_types.h> #include <sci/svc/rm/sci_rm_api.h> #include <sci/sci_rpc.h> -#include <stdlib.h> + #include "sci_rm_rpc.h" /* Local Defines */ |