Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-19 02:54:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat(qemu): update for renamed struct memory_bank

Browse source 
The struct ns_dram_bank has been renamed to struct memory_bank, so
update plat/qemu accordingly.

Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
Change-Id: If5ed92edd132c977009a7371ec53eca0ee35ef00
This commit is contained in:
Jens Wiklander 2025-02-07 07:51:07 +01:00 • committed by Jean-Philippe Brucker
parent aeec55c876
commit 991f5360b6
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
plat/qemu/common/qemu_common.c
View file

@ -233,7 +233,7 @@ static uint32_t plat_get_num_memnodes(void)
return 1; return 1;
} }
static void plat_get_memory_node(int index, struct ns_dram_bank *bank_ptr) static void plat_get_memory_node(int index, struct memory_bank *bank_ptr)
{ {
(void) index; (void) index;
bank_ptr->base = NS_DRAM0_BASE; bank_ptr->base = NS_DRAM0_BASE;
@ -245,7 +245,7 @@ static uint32_t plat_get_num_memnodes(void)
return sbsa_platform_num_memnodes(); return sbsa_platform_num_memnodes();
} }
static void plat_get_memory_node(int index, struct ns_dram_bank *bank_ptr) static void plat_get_memory_node(int index, struct memory_bank *bank_ptr)
{ {
struct platform_memory_data data = {0, 0, 0}; struct platform_memory_data data = {0, 0, 0};
@ -281,7 +281,7 @@ int plat_rmmd_load_manifest(struct rmm_manifest *manifest)
uint64_t checksum; uint64_t checksum;
size_t num_banks = plat_get_num_memnodes(); size_t num_banks = plat_get_num_memnodes();
size_t num_consoles = 1; size_t num_consoles = 1;
struct ns_dram_bank *bank_ptr; struct memory_bank *bank_ptr;
struct console_info *console_ptr; struct console_info *console_ptr;
assert(manifest != NULL); assert(manifest != NULL);
@ -333,7 +333,7 @@ int plat_rmmd_load_manifest(struct rmm_manifest *manifest)
* | 120 | flags | | * | 120 | flags | |
* +----------+--------------+--------------+ * +----------+--------------+--------------+
*/ */
bank_ptr = (struct ns_dram_bank *) bank_ptr = (struct memory_bank *)
(((uintptr_t)manifest) + sizeof(*manifest)); (((uintptr_t)manifest) + sizeof(*manifest));
console_ptr = (struct console_info *) console_ptr = (struct console_info *)
@ -345,7 +345,7 @@ int plat_rmmd_load_manifest(struct rmm_manifest *manifest)
/* Ensure the manifest is not larger than the shared buffer */ /* Ensure the manifest is not larger than the shared buffer */
assert((sizeof(struct rmm_manifest) + assert((sizeof(struct rmm_manifest) +
(sizeof(struct console_info) * num_consoles) + (sizeof(struct console_info) * num_consoles) +
(sizeof(struct ns_dram_bank) * num_banks)) <= RMM_SHARED_SIZE); (sizeof(struct memory_bank) * num_banks)) <= RMM_SHARED_SIZE);
/* Calculate checksum of plat_dram structure */ /* Calculate checksum of plat_dram structure */
checksum = num_banks + (uint64_t)bank_ptr; checksum = num_banks + (uint64_t)bank_ptr;