diff options
17 files changed, 17 insertions, 17 deletions
diff --git a/ble/ble_main.c b/ble/ble_main.c index 4c56615c..7d41e6a0 100644 --- a/ble/ble_main.c +++ b/ble/ble_main.c @@ -41,7 +41,7 @@ int exec_ble_main(int bootrom_flags) NOTICE("Starting binary extension\n"); - /* initiliaze time (for delay functionality) */ + /* initialize time (for delay functionality) */ plat_delay_timer_init(); #if PALLADIUM diff --git a/ble/ble_mem.S b/ble/ble_mem.S index be19a93d..be5108b2 100644 --- a/ble/ble_mem.S +++ b/ble/ble_mem.S @@ -6,7 +6,7 @@ */ #include <asm_macros.S> -#include <arm_def.h> +#include <marvell_def.h> #include <platform_def.h> #define PTE_NON_EXEC_OFF 54 /* XN - eXecute Never bit offset - see VMSAv8-64 */ diff --git a/include/plat/marvell/a3700/common/arm_def.h b/include/plat/marvell/a3700/common/marvell_def.h index 326aa62a..326aa62a 100644 --- a/include/plat/marvell/a3700/common/arm_def.h +++ b/include/plat/marvell/a3700/common/marvell_def.h diff --git a/include/plat/marvell/a8k-p/common/arm_def.h b/include/plat/marvell/a8k-p/common/marvell_def.h index 84196576..84196576 100644 --- a/include/plat/marvell/a8k-p/common/arm_def.h +++ b/include/plat/marvell/a8k-p/common/marvell_def.h diff --git a/include/plat/marvell/a8k/common/arm_def.h b/include/plat/marvell/a8k/common/marvell_def.h index 5bd2c11a..5bd2c11a 100644 --- a/include/plat/marvell/a8k/common/arm_def.h +++ b/include/plat/marvell/a8k/common/marvell_def.h diff --git a/include/plat/marvell/common/aarch64/arm_macros.S b/include/plat/marvell/common/aarch64/marvell_macros.S index 0a3e3798..0a3e3798 100644 --- a/include/plat/marvell/common/aarch64/arm_macros.S +++ b/include/plat/marvell/common/aarch64/marvell_macros.S diff --git a/plat/marvell/a3700/common/include/a3700_plat_def.h b/plat/marvell/a3700/common/include/a3700_plat_def.h index 96e8bbc3..05c71351 100644 --- a/plat/marvell/a3700/common/include/a3700_plat_def.h +++ b/plat/marvell/a3700/common/include/a3700_plat_def.h @@ -7,7 +7,7 @@ #ifndef __MVEBU_A3700_DEF_H__ #define __MVEBU_A3700_DEF_H__ -#include <arm_def.h> +#include <marvell_def.h> #define MVEBU_MAX_CPUS_PER_CLUSTER 2 diff --git a/plat/marvell/a3700/common/include/plat_macros.S b/plat/marvell/a3700/common/include/plat_macros.S index 31056bc8..af084882 100644 --- a/plat/marvell/a3700/common/include/plat_macros.S +++ b/plat/marvell/a3700/common/include/plat_macros.S @@ -7,7 +7,7 @@ #ifndef __PLAT_MACROS_S__ #define __PLAT_MACROS_S__ -#include <arm_macros.S> +#include <marvell_macros.S> /* --------------------------------------------- * The below macro prints out relevant GIC and diff --git a/plat/marvell/a8k-p/common/aarch64/plat_helpers.S b/plat/marvell/a8k-p/common/aarch64/plat_helpers.S index 407779a4..e126578e 100644 --- a/plat/marvell/a8k-p/common/aarch64/plat_helpers.S +++ b/plat/marvell/a8k-p/common/aarch64/plat_helpers.S @@ -6,9 +6,9 @@ */ #include <asm_macros.S> -#include <arm_def.h> -#include <platform_def.h> +#include <marvell_def.h> #include <marvell_pm.h> +#include <platform_def.h> .globl plat_marvell_calc_core_pos_die .globl plat_marvell_calc_core_pos diff --git a/plat/marvell/a8k-p/common/include/a8kp_plat_def.h b/plat/marvell/a8k-p/common/include/a8kp_plat_def.h index 10301a71..45c17ac6 100644 --- a/plat/marvell/a8k-p/common/include/a8kp_plat_def.h +++ b/plat/marvell/a8k-p/common/include/a8kp_plat_def.h @@ -7,7 +7,7 @@ #ifndef __MVEBU_A8K_DEF_H__ #define __MVEBU_A8K_DEF_H__ -#include <arm_def.h> +#include <marvell_def.h> #include <mvebu.h> #define MVEBU_PRIMARY_CPU 0x0 diff --git a/plat/marvell/a8k-p/common/include/plat_macros.S b/plat/marvell/a8k-p/common/include/plat_macros.S index 10bfeeda..8138ea1b 100644 --- a/plat/marvell/a8k-p/common/include/plat_macros.S +++ b/plat/marvell/a8k-p/common/include/plat_macros.S @@ -8,7 +8,7 @@ #ifndef __PLAT_MACROS_S__ #define __PLAT_MACROS_S__ -#include <arm_macros.S> +#include <marvell_macros.S> /* * Required platform porting macros diff --git a/plat/marvell/a8k/common/include/a8k_plat_def.h b/plat/marvell/a8k/common/include/a8k_plat_def.h index e36bbbaf..57a5c242 100644 --- a/plat/marvell/a8k/common/include/a8k_plat_def.h +++ b/plat/marvell/a8k/common/include/a8k_plat_def.h @@ -4,11 +4,11 @@ * SPDX-License-Identifier: BSD-3-Clause * https://spdx.org/licenses */ - + #ifndef __MVEBU_A8K_DEF_H__ #define __MVEBU_A8K_DEF_H__ -#include <arm_def.h> +#include <marvell_def.h> #define MVEBU_PRIMARY_CPU 0x0 #define MVEBU_AP0 0x0 diff --git a/plat/marvell/a8k/common/include/plat_macros.S b/plat/marvell/a8k/common/include/plat_macros.S index 63a74ae4..b082208d 100644 --- a/plat/marvell/a8k/common/include/plat_macros.S +++ b/plat/marvell/a8k/common/include/plat_macros.S @@ -4,11 +4,11 @@ * SPDX-License-Identifier: BSD-3-Clause * https://spdx.org/licenses */ - + #ifndef __PLAT_MACROS_S__ #define __PLAT_MACROS_S__ -#include <arm_macros.S> +#include <marvell_macros.S> /* * Required platform porting macros diff --git a/plat/marvell/common/aarch64/marvell_helpers.S b/plat/marvell/common/aarch64/marvell_helpers.S index 247c96ce..45bd2a2c 100644 --- a/plat/marvell/common/aarch64/marvell_helpers.S +++ b/plat/marvell/common/aarch64/marvell_helpers.S @@ -34,7 +34,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include <asm_macros.S> -#include <arm_def.h> +#include <marvell_def.h> #include <platform_def.h> #ifndef PLAT_a3700 #include <ccu.h> diff --git a/plat/marvell/common/marvell_bl2_setup.c b/plat/marvell/common/marvell_bl2_setup.c index 997a411a..6a91b572 100644 --- a/plat/marvell/common/marvell_bl2_setup.c +++ b/plat/marvell/common/marvell_bl2_setup.c @@ -11,9 +11,9 @@ */ #include <arch_helpers.h> -#include <arm_def.h> #include <bl_common.h> #include <console.h> +#include <marvell_def.h> #include <platform_def.h> #include <plat_marvell.h> #include <string.h> diff --git a/plat/marvell/common/marvell_bl31_setup.c b/plat/marvell/common/marvell_bl31_setup.c index 9c93a77f..d281356a 100644 --- a/plat/marvell/common/marvell_bl31_setup.c +++ b/plat/marvell/common/marvell_bl31_setup.c @@ -10,10 +10,10 @@ * SPDX-License-Identifier: BSD-3-Clause */ #include <arch.h> -#include <arm_def.h> #include <assert.h> #include <console.h> #include <debug.h> +#include <marvell_def.h> #include <plat_marvell.h> #include <plat_private.h> #include <platform.h> diff --git a/plat/marvell/common/marvell_gicv3.c b/plat/marvell/common/marvell_gicv3.c index 5699be96..c4d2b3de 100644 --- a/plat/marvell/common/marvell_gicv3.c +++ b/plat/marvell/common/marvell_gicv3.c @@ -9,10 +9,10 @@ * * SPDX-License-Identifier: BSD-3-Clause */ -#include <arm_def.h> #include <debug.h> #include <gicv3.h> #include <interrupt_props.h> +#include <marvell_def.h> #include <plat_marvell.h> #include <platform.h> #include <platform_def.h> @@ -200,4 +200,4 @@ void plat_marvell_gic_irq_pcpu_save(void) void plat_marvell_gic_irq_pcpu_restore(void) { gicv3_rdistif_init_restore(plat_my_core_pos(), &rdist_ctx); -}
\ No newline at end of file +} |