andrius
/
arm-trusted-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1658 from glneo/plat-arm-remove 

ti: k3: common: Remove use of ARM platform code
This commit is contained in:
Antonio Niño Díaz 2018-11-01 12:46:24 +01:00 committed by GitHub
parent 3d7ae0b9d6 ef20285779
commit 3c1fb7a700
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
plat/ti/k3/common/k3_bl31_setup.c
View File

@ -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);
}

3
plat/ti/k3/common/plat_common.mk
View File

@ -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} \