diff options
author | Antonio Nino Diaz <antonio.ninodiaz@arm.com> | 2018-09-24 17:16:20 +0100 |
---|---|---|
committer | Antonio Nino Diaz <antonio.ninodiaz@arm.com> | 2018-09-28 15:34:17 +0100 |
commit | 2d6f1f01b141775a192e36d120073f67b7b378c2 (patch) | |
tree | 5f3c453c6fece1a0fe535731a4cdf9de309ec4bc /plat/rockchip/rk3368 | |
parent | fdcc112797327fc46bfad5d4753faf8f887f505d (diff) | |
download | trusted-firmware-a-2d6f1f01b141775a192e36d120073f67b7b378c2.tar.gz |
rockchip: Migrate to new interfaces
- Migrate to new GIC interfaces.
- Migrate to bl31_early_platform_setup2().
- Use bl31_warm_entrypoint() instead of psci_entrypoint().
- Use PLAT_VIRT_ADDR_SPACE_SIZE and PLAT_PHY_ADDR_SPACE_SIZE.
- Update Makefile paths.
- Remove references to removed build options.
- Use private definition of bl31_params_t.
Change-Id: I860341594b5c868b2fcaa59d23957ee718472ef1
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
Diffstat (limited to 'plat/rockchip/rk3368')
-rw-r--r-- | plat/rockchip/rk3368/include/platform_def.h | 16 | ||||
-rw-r--r-- | plat/rockchip/rk3368/platform.mk | 1 | ||||
-rw-r--r-- | plat/rockchip/rk3368/rk3368_def.h | 4 |
3 files changed, 6 insertions, 15 deletions
diff --git a/plat/rockchip/rk3368/include/platform_def.h b/plat/rockchip/rk3368/include/platform_def.h index d9a80a7af0..4083938ef1 100644 --- a/plat/rockchip/rk3368/include/platform_def.h +++ b/plat/rockchip/rk3368/include/platform_def.h @@ -12,8 +12,6 @@ #include <rk3368_def.h> #include <utils_def.h> -#define DEBUG_XLAT_TABLE 0 - /******************************************************************************* * Platform binary types for linking ******************************************************************************/ @@ -25,9 +23,7 @@ ******************************************************************************/ /* Size of cacheable stacks */ -#if DEBUG_XLAT_TABLE -#define PLATFORM_STACK_SIZE 0x800 -#elif defined(IMAGE_BL1) +#if defined(IMAGE_BL1) #define PLATFORM_STACK_SIZE 0x440 #elif defined(IMAGE_BL2) #define PLATFORM_STACK_SIZE 0x400 @@ -86,7 +82,8 @@ /******************************************************************************* * Platform specific page table and MMU setup constants ******************************************************************************/ -#define ADDR_SPACE_SIZE (1ULL << 32) +#define PLAT_VIRT_ADDR_SPACE_SIZE (1ULL << 32) +#define PLAT_PHY_ADDR_SPACE_SIZE (1ULL << 32) #define MAX_XLAT_TABLES 8 #define MAX_MMAP_REGIONS 16 @@ -108,13 +105,6 @@ #define PLAT_RK_GICD_BASE RK3368_GICD_BASE #define PLAT_RK_GICC_BASE RK3368_GICC_BASE -/* - * Define a list of Group 1 Secure and Group 0 interrupts as per GICv3 - * terminology. On a GICv2 system or mode, the lists will be merged and treated - * as Group 0 interrupts. - */ -#define PLAT_RK_G1S_IRQS RK_G1S_IRQS - #define PLAT_RK_UART_BASE RK3368_UART2_BASE #define PLAT_RK_UART_CLOCK RK3368_UART_CLOCK #define PLAT_RK_UART_BAUDRATE RK3368_BAUDRATE diff --git a/plat/rockchip/rk3368/platform.mk b/plat/rockchip/rk3368/platform.mk index 7ecb21ad5e..050a2c423c 100644 --- a/plat/rockchip/rk3368/platform.mk +++ b/plat/rockchip/rk3368/platform.mk @@ -48,7 +48,6 @@ BL31_SOURCES += ${RK_GIC_SOURCES} \ ${RK_PLAT_SOC}/drivers/soc/soc.c \ ${RK_PLAT_SOC}/drivers/ddr/ddr_rk3368.c \ -ENABLE_PLAT_COMPAT := 0 MULTI_CONSOLE_API := 1 include lib/coreboot/coreboot.mk diff --git a/plat/rockchip/rk3368/rk3368_def.h b/plat/rockchip/rk3368/rk3368_def.h index 7cb82da212..9ebe3be06f 100644 --- a/plat/rockchip/rk3368/rk3368_def.h +++ b/plat/rockchip/rk3368/rk3368_def.h @@ -100,6 +100,8 @@ * terminology. On a GICv2 system or mode, the lists will be merged and treated * as Group 0 interrupts. */ -#define RK_G1S_IRQS (RK_IRQ_SEC_PHY_TIMER) +#define PLAT_RK_GICV2_G1S_IRQS \ + INTR_PROP_DESC(RK_IRQ_SEC_PHY_TIMER, GIC_HIGHEST_SEC_PRIORITY, \ + GICV2_INTR_GROUP1, GIC_INTR_CFG_LEVEL) #endif /* __PLAT_DEF_H__ */ |