diff options
| author | Antonio Nino Diaz <antonio.ninodiaz@arm.com> | 2018-09-24 17:16:52 +0100 |
|---|---|---|
| committer | Antonio Nino Diaz <antonio.ninodiaz@arm.com> | 2018-09-28 15:31:54 +0100 |
| commit | 8cff97d1b402f28f8fae727fc2ac13589a15a14d (patch) | |
| tree | c750444ea2b5c029e5261910a1b74d2bfe484b98 /plat/xilinx | |
| parent | 210d90a985afe42c4d17f84f94e82f73a4ba306c (diff) | |
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 <siva.durga.paladugu@xilinx.com>
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
Diffstat (limited to 'plat/xilinx')
| -rw-r--r-- | plat/xilinx/zynqmp/bl31_zynqmp_setup.c | 8 | ||||
| -rw-r--r-- | plat/xilinx/zynqmp/platform.mk | 1 |
2 files changed, 4 insertions, 5 deletions
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 |