diff options
| author | Antonio Niño Díaz <antonio.ninodiaz@arm.com> | 2018-11-01 12:46:24 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-01 12:46:24 +0100 |
| commit | 3c1fb7a7006b2cd076d958aa8ba14eba25e82de8 (patch) | |
| tree | e9d6f0e78aace8066997e0ae88235e752acc12e2 /plat | |
| parent | 3d7ae0b9d6d1403baa96bc8e8482f66c882f0b8b (diff) | |
| parent | ef20285779a078158681191d0498f11ff4f78775 (diff) | |
| download | platform_external_arm-trusted-firmware-3c1fb7a7006b2cd076d958aa8ba14eba25e82de8.tar.gz platform_external_arm-trusted-firmware-3c1fb7a7006b2cd076d958aa8ba14eba25e82de8.tar.bz2 platform_external_arm-trusted-firmware-3c1fb7a7006b2cd076d958aa8ba14eba25e82de8.zip | |
Merge pull request #1658 from glneo/plat-arm-remove
ti: k3: common: Remove use of ARM platform code
Diffstat (limited to 'plat')
| -rw-r--r-- | plat/ti/k3/common/k3_bl31_setup.c | 9 | ||||
| -rw-r--r-- | plat/ti/k3/common/plat_common.mk | 3 |
2 files changed, 4 insertions, 8 deletions
diff --git a/plat/ti/k3/common/k3_bl31_setup.c b/plat/ti/k3/common/k3_bl31_setup.c index e438dc36c..c0cf5e2a8 100644 --- a/plat/ti/k3/common/k3_bl31_setup.c +++ b/plat/ti/k3/common/k3_bl31_setup.c @@ -10,14 +10,14 @@ #include <bl_common.h> #include <debug.h> #include <k3_console.h> -#include <plat_arm.h> -#include <platform_def.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_arm_mmap[] = { +const mmap_region_t plat_k3_mmap[] = { MAP_REGION_FLAT(SHARED_RAM_BASE, SHARED_RAM_SIZE, MT_DEVICE | MT_RW | MT_SECURE), MAP_REGION_FLAT(K3_USART_BASE_ADDRESS, K3_USART_SIZE, MT_DEVICE | MT_RW | MT_SECURE), MAP_REGION_FLAT(K3_GICD_BASE, K3_GICD_SIZE, MT_DEVICE | MT_RW | MT_SECURE), @@ -97,7 +97,6 @@ void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1, void bl31_plat_arch_setup(void) { - const mmap_region_t bl_regions[] = { MAP_REGION_FLAT(BL31_BASE, BL31_END - BL31_BASE, MT_MEMORY | MT_RW | MT_SECURE), @@ -108,7 +107,7 @@ void bl31_plat_arch_setup(void) {0} }; - setup_page_tables(bl_regions, plat_arm_get_mmap()); + setup_page_tables(bl_regions, plat_k3_mmap); enable_mmu_el3(0); } diff --git a/plat/ti/k3/common/plat_common.mk b/plat/ti/k3/common/plat_common.mk index d8354368d..fbd79b4ad 100644 --- a/plat/ti/k3/common/plat_common.mk +++ b/plat/ti/k3/common/plat_common.mk @@ -35,8 +35,6 @@ include lib/xlat_tables_v2/xlat_tables.mk PLAT_INCLUDES += \ -I${PLAT_PATH}/include \ - -Iinclude/plat/arm/common/ \ - -Iinclude/plat/arm/common/aarch64/ \ -I${PLAT_PATH}/common/drivers/sec_proxy \ -I${PLAT_PATH}/common/drivers/ti_sci \ @@ -63,7 +61,6 @@ K3_TI_SCI_SOURCES += \ ${PLAT_PATH}/common/drivers/ti_sci/ti_sci.c \ PLAT_BL_COMMON_SOURCES += \ - plat/arm/common/arm_common.c \ lib/cpus/aarch64/cortex_a53.S \ ${XLAT_TABLES_LIB_SRCS} \ ${K3_CONSOLE_SOURCES} \ |