diff options
Diffstat (limited to 'plat/ti/k3/common')
-rw-r--r-- | plat/ti/k3/common/drivers/sec_proxy/sec_proxy.c | 14 | ||||
-rw-r--r-- | plat/ti/k3/common/drivers/ti_sci/ti_sci.c | 5 | ||||
-rw-r--r-- | plat/ti/k3/common/k3_bl31_setup.c | 15 | ||||
-rw-r--r-- | plat/ti/k3/common/k3_console.c | 8 | ||||
-rw-r--r-- | plat/ti/k3/common/k3_gicv3.c | 14 | ||||
-rw-r--r-- | plat/ti/k3/common/k3_psci.c | 18 | ||||
-rw-r--r-- | plat/ti/k3/common/k3_topology.c | 3 |
7 files changed, 45 insertions, 32 deletions
diff --git a/plat/ti/k3/common/drivers/sec_proxy/sec_proxy.c b/plat/ti/k3/common/drivers/sec_proxy/sec_proxy.c index 92414b9050..5dd54d4ff3 100644 --- a/plat/ti/k3/common/drivers/sec_proxy/sec_proxy.c +++ b/plat/ti/k3/common/drivers/sec_proxy/sec_proxy.c @@ -7,14 +7,16 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <arch_helpers.h> -#include <debug.h> #include <errno.h> -#include <mmio.h> -#include <platform_def.h> #include <stdlib.h> -#include <utils.h> -#include <utils_def.h> + +#include <platform_def.h> + +#include <arch_helpers.h> +#include <common/debug.h> +#include <lib/mmio.h> +#include <lib/utils.h> +#include <lib/utils_def.h> #include "sec_proxy.h" diff --git a/plat/ti/k3/common/drivers/ti_sci/ti_sci.c b/plat/ti/k3/common/drivers/ti_sci/ti_sci.c index 7ba0267dcc..b211bdf60b 100644 --- a/plat/ti/k3/common/drivers/ti_sci/ti_sci.c +++ b/plat/ti/k3/common/drivers/ti_sci/ti_sci.c @@ -7,13 +7,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <debug.h> #include <errno.h> -#include <platform_def.h> #include <stdbool.h> #include <stddef.h> #include <string.h> +#include <platform_def.h> + +#include <common/debug.h> #include <sec_proxy.h> #include "ti_sci_protocol.h" diff --git a/plat/ti/k3/common/k3_bl31_setup.c b/plat/ti/k3/common/k3_bl31_setup.c index c0cf5e2a87..3fa11b2318 100644 --- a/plat/ti/k3/common/k3_bl31_setup.c +++ b/plat/ti/k3/common/k3_bl31_setup.c @@ -4,17 +4,20 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include <assert.h> +#include <string.h> + +#include <platform_def.h> + #include <arch.h> #include <arch_helpers.h> -#include <assert.h> -#include <bl_common.h> -#include <debug.h> +#include <common/bl_common.h> +#include <common/debug.h> +#include <lib/xlat_tables/xlat_tables_v2.h> + #include <k3_console.h> #include <k3_gicv3.h> -#include <platform_def.h> -#include <string.h> #include <ti_sci.h> -#include <xlat_tables_v2.h> /* Table of regions to map using the MMU */ const mmap_region_t plat_k3_mmap[] = { diff --git a/plat/ti/k3/common/k3_console.c b/plat/ti/k3/common/k3_console.c index ff3ca61ce6..31c963245d 100644 --- a/plat/ti/k3/common/k3_console.c +++ b/plat/ti/k3/common/k3_console.c @@ -4,10 +4,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <console.h> -#include <k3_console.h> #include <platform_def.h> -#include <uart_16550.h> + +#include <drivers/console.h> +#include <drivers/ti/uart/uart_16550.h> + +#include <k3_console.h> void bl31_console_setup(void) { diff --git a/plat/ti/k3/common/k3_gicv3.c b/plat/ti/k3/common/k3_gicv3.c index 3253130f6e..b7c7880141 100644 --- a/plat/ti/k3/common/k3_gicv3.c +++ b/plat/ti/k3/common/k3_gicv3.c @@ -4,13 +4,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <bl_common.h> -#include <gicv3.h> -#include <interrupt_props.h> -#include <k3_gicv3.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 <k3_gicv3.h> /* The GICv3 driver only needs to be initialized in EL3 */ uintptr_t rdistif_base_addrs[PLATFORM_CORE_COUNT]; diff --git a/plat/ti/k3/common/k3_psci.c b/plat/ti/k3/common/k3_psci.c index 787cc82fda..cb75bf6544 100644 --- a/plat/ti/k3/common/k3_psci.c +++ b/plat/ti/k3/common/k3_psci.c @@ -4,19 +4,21 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <arch_helpers.h> #include <assert.h> -#include <cpu_data.h> -#include <debug.h> -#include <k3_gicv3.h> -#include <psci.h> -/* Need to flush psci internal locks before shutdown or their values are lost */ -#include <../../lib/psci/psci_private.h> -#include <platform.h> #include <stdbool.h> +#include <arch_helpers.h> +#include <common/debug.h> +#include <lib/el3_runtime/cpu_data.h> +#include <lib/psci/psci.h> +#include <plat/common/platform.h> + +#include <k3_gicv3.h> #include <ti_sci.h> +/* Need to flush psci internal locks before shutdown or their values are lost */ +#include "../../../../lib/psci/psci_private.h" + #define STUB() ERROR("stub %s called\n", __func__) uintptr_t k3_sec_entrypoint; diff --git a/plat/ti/k3/common/k3_topology.c b/plat/ti/k3/common/k3_topology.c index d7ac0a5894..2b98acb278 100644 --- a/plat/ti/k3/common/k3_topology.c +++ b/plat/ti/k3/common/k3_topology.c @@ -5,7 +5,8 @@ */ #include <platform_def.h> -#include <psci.h> + +#include <lib/psci/psci.h> /* The power domain tree descriptor */ static unsigned char power_domain_tree_desc[] = { |