From 59fffc7171519913f746d8d84b2512cb78475b57 Mon Sep 17 00:00:00 2001 From: Etienne Carriere Date: Wed, 12 Apr 2017 10:46:56 +0200 Subject: core: deprecate DEVICEx_TYPE/_PA_BASE/_SIZE Macros DEVICEx_TYPE, DEVICEx_PA_BASE and DEVICEx__SIZE used to help platform to register their address range mapping requirements. These are now deprecated since platform should use the more flexible register_phys_mem() macro. This change removes all occurrences of DEVICEx_TYPE/_PA_BASE/_SIZE and use the register_phys_mem() instead. Signed-off-by: Etienne Carriere Reviewed-by: Jens Wiklander --- core/arch/arm/plat-zynqmp/main.c | 12 ++++++++++++ core/arch/arm/plat-zynqmp/platform_config.h | 18 ------------------ 2 files changed, 12 insertions(+), 18 deletions(-) (limited to 'core/arch/arm/plat-zynqmp') diff --git a/core/arch/arm/plat-zynqmp/main.c b/core/arch/arm/plat-zynqmp/main.c index a00d1ae8..cccb0092 100644 --- a/core/arch/arm/plat-zynqmp/main.c +++ b/core/arch/arm/plat-zynqmp/main.c @@ -48,6 +48,18 @@ static void main_fiq(void); static struct gic_data gic_data; static struct cdns_uart_data console_data __early_bss; +register_phys_mem(MEM_AREA_IO_SEC, + ROUNDDOWN(CONSOLE_UART_BASE, CORE_MMU_DEVICE_SIZE), + CORE_MMU_DEVICE_SIZE); + +register_phys_mem(MEM_AREA_IO_SEC, + ROUNDDOWN(GIC_BASE, CORE_MMU_DEVICE_SIZE), + CORE_MMU_DEVICE_SIZE); + +register_phys_mem(MEM_AREA_IO_SEC, + ROUNDDOWN(GIC_BASE + GICD_OFFSET, CORE_MMU_DEVICE_SIZE), + CORE_MMU_DEVICE_SIZE); + static const struct thread_handlers handlers = { .std_smc = tee_entry_std, .fast_smc = tee_entry_fast, diff --git a/core/arch/arm/plat-zynqmp/platform_config.h b/core/arch/arm/plat-zynqmp/platform_config.h index 91c0f82f..a02d10f2 100644 --- a/core/arch/arm/plat-zynqmp/platform_config.h +++ b/core/arch/arm/plat-zynqmp/platform_config.h @@ -93,24 +93,6 @@ #define CFG_TA_RAM_SIZE ROUNDDOWN((TZDRAM_SIZE - CFG_TEE_RAM_VA_SIZE), \ CORE_MMU_DEVICE_SIZE) - -#define DEVICE0_PA_BASE ROUNDDOWN(CONSOLE_UART_BASE, \ - CORE_MMU_DEVICE_SIZE) -#define DEVICE0_VA_BASE DEVICE0_PA_BASE -#define DEVICE0_SIZE CORE_MMU_DEVICE_SIZE -#define DEVICE0_TYPE MEM_AREA_IO_SEC - -#define DEVICE1_PA_BASE ROUNDDOWN(GIC_BASE, CORE_MMU_DEVICE_SIZE) -#define DEVICE1_VA_BASE DEVICE1_PA_BASE -#define DEVICE1_SIZE CORE_MMU_DEVICE_SIZE -#define DEVICE1_TYPE MEM_AREA_IO_SEC - -#define DEVICE2_PA_BASE ROUNDDOWN(GIC_BASE + GICD_OFFSET, \ - CORE_MMU_DEVICE_SIZE) -#define DEVICE2_VA_BASE DEVICE2_PA_BASE -#define DEVICE2_SIZE CORE_MMU_DEVICE_SIZE -#define DEVICE2_TYPE MEM_AREA_IO_SEC - #ifndef UART_BAUDRATE #define UART_BAUDRATE 115200 #endif -- cgit v1.2.3