Commit 5f2849b6 authored by Sandrine Bailleux's avatar Sandrine Bailleux Committed by TrustedFirmware Code Review
Browse files

Merge changes from topic "qemu_sbsa" into integration

* changes:
  qemu: Simplify the image size calculation
  qemu: introducing sub-platforms to qemu platform
parents ed01e0c4 9a006ad1
/* /*
* Copyright (c) 2017, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2017-2019, ARM Limited and Contributors. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
...@@ -139,8 +139,7 @@ static bl_mem_params_node_t bl2_mem_params_descs[] = { ...@@ -139,8 +139,7 @@ static bl_mem_params_node_t bl2_mem_params_descs[] = {
SET_STATIC_PARAM_HEAD(image_info, PARAM_EP, VERSION_2, image_info_t, SET_STATIC_PARAM_HEAD(image_info, PARAM_EP, VERSION_2, image_info_t,
0), 0),
.image_info.image_base = NS_IMAGE_OFFSET, .image_info.image_base = NS_IMAGE_OFFSET,
.image_info.image_max_size = NS_DRAM0_BASE + NS_DRAM0_SIZE - .image_info.image_max_size = NS_IMAGE_MAX_SIZE,
NS_IMAGE_OFFSET,
# endif /* !PRELOADED_BL33_BASE */ # endif /* !PRELOADED_BL33_BASE */
.next_handoff_image_id = INVALID_IMAGE_ID, .next_handoff_image_id = INVALID_IMAGE_ID,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment