From 8cff97d1b402f28f8fae727fc2ac13589a15a14d Mon Sep 17 00:00:00 2001 From: Antonio Nino Diaz Date: Mon, 24 Sep 2018 17:16:52 +0100 Subject: [PATCH] zynqmp: Migrate to new interfaces - Remove references to removed build options. - Migrate to bl31_early_platform_setup2(). Change-Id: Ibeb8982a0a841f55ce778c4f09f06b72b47b21d8 Tested-by: Siva Durga Prasad Paladugu Signed-off-by: Antonio Nino Diaz --- docs/plat/xilinx-zynqmp.rst | 4 ++-- plat/xilinx/zynqmp/bl31_zynqmp_setup.c | 8 ++++---- plat/xilinx/zynqmp/platform.mk | 1 - 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/docs/plat/xilinx-zynqmp.rst b/docs/plat/xilinx-zynqmp.rst index 42802414..2b48ba92 100644 --- a/docs/plat/xilinx-zynqmp.rst +++ b/docs/plat/xilinx-zynqmp.rst @@ -14,13 +14,13 @@ To build: .. code:: bash - make ERROR_DEPRECATED=1 CROSS_COMPILE=aarch64-none-elf- PLAT=zynqmp bl31 + make CROSS_COMPILE=aarch64-none-elf- PLAT=zynqmp bl31 To build bl32 TSP you have to rebuild bl31 too: .. code:: bash - make ERROR_DEPRECATED=1 CROSS_COMPILE=aarch64-none-elf- PLAT=zynqmp SPD=tspd bl31 bl32 + make CROSS_COMPILE=aarch64-none-elf- PLAT=zynqmp SPD=tspd bl31 bl32 ZynqMP platform specific build options ====================================== diff --git a/plat/xilinx/zynqmp/bl31_zynqmp_setup.c b/plat/xilinx/zynqmp/bl31_zynqmp_setup.c index abfb8c6f..02f1811f 100644 --- a/plat/xilinx/zynqmp/bl31_zynqmp_setup.c +++ b/plat/xilinx/zynqmp/bl31_zynqmp_setup.c @@ -54,8 +54,8 @@ static inline void bl31_set_default_config(void) * are lost (potentially). This needs to be done before the MMU is initialized * so that the memory layout can be used while creating page tables. */ -void bl31_early_platform_setup(bl31_params_t *from_bl2, - void *plat_params_from_bl2) +void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1, + u_register_t arg2, u_register_t arg3) { /* Initialize the console to provide early debug support */ console_init(ZYNQMP_UART_BASE, zynqmp_get_uart_clk(), @@ -65,8 +65,8 @@ void bl31_early_platform_setup(bl31_params_t *from_bl2, zynqmp_config_setup(); /* There are no parameters from BL2 if BL31 is a reset vector */ - assert(from_bl2 == NULL); - assert(plat_params_from_bl2 == NULL); + assert(arg0 == 0U); + assert(arg1 == 0U); /* * Do initial security configuration to allow DRAM/device access. On diff --git a/plat/xilinx/zynqmp/platform.mk b/plat/xilinx/zynqmp/platform.mk index f806d460..53d93c32 100644 --- a/plat/xilinx/zynqmp/platform.mk +++ b/plat/xilinx/zynqmp/platform.mk @@ -4,7 +4,6 @@ # SPDX-License-Identifier: BSD-3-Clause override ERRATA_A53_855873 := 1 -override ENABLE_PLAT_COMPAT := 0 override PROGRAMMABLE_RESET_ADDRESS := 1 PSCI_EXTENDED_STATE_ID := 1 A53_DISABLE_NON_TEMPORAL_HINT := 0 -- 2.30.2