diff options
| author | Joanna Farley <joanna.farley@arm.com> | 2023-02-22 10:47:41 +0100 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2023-02-22 10:47:41 +0100 |
| commit | e5ffd27f9b2c520a17580267929ec403bc28400c (patch) | |
| tree | 0a3dd30a7bbf787d49e7b17bde3cc8006123393f /plat/xilinx | |
| parent | a6df28766e81341f7e705b1ea047c6fdfe4e6d67 (diff) | |
| parent | fbe4dbeec906038795f72d8f9284a812bd6a852d (diff) | |
| download | arm-trusted-firmware-e5ffd27f9b2c520a17580267929ec403bc28400c.tar.gz | |
Merge "fix(zynqmp): panic w/o handoff structure in !JTAG" into integration
Diffstat (limited to 'plat/xilinx')
| -rw-r--r-- | plat/xilinx/zynqmp/bl31_zynqmp_setup.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/plat/xilinx/zynqmp/bl31_zynqmp_setup.c b/plat/xilinx/zynqmp/bl31_zynqmp_setup.c index 59f729850..6bc571669 100644 --- a/plat/xilinx/zynqmp/bl31_zynqmp_setup.c +++ b/plat/xilinx/zynqmp/bl31_zynqmp_setup.c @@ -1,5 +1,6 @@ /* * Copyright (c) 2013-2021, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2023, Advanced Micro Devices Inc. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -118,9 +119,7 @@ void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1, enum fsbl_handoff ret = fsbl_atf_handover(&bl32_image_ep_info, &bl33_image_ep_info, atf_handoff_addr); - if (ret == FSBL_HANDOFF_NO_STRUCT) { - bl31_set_default_config(); - } else if (ret != FSBL_HANDOFF_SUCCESS) { + if (ret != FSBL_HANDOFF_SUCCESS) { panic(); } } |