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

Merge changes from topic "xlnx_fix_plat_ocm_base" into integration

Browse source 
* changes:
  fix(xilinx): update dtb when dtb address and tf-a ddr flow is used
  fix(versal): use correct macro name for ocm base address
This commit is contained in:
Joanna Farley 2023-08-31 13:59:20 +02:00 • committed by TrustedFirmware Code Review
commit 9e66ff35e7
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
plat/xilinx/common/plat_fdt.c
View file

@ -12,11 +12,17 @@
#include <plat_fdt.h> #include <plat_fdt.h>
#include <platform_def.h> #include <platform_def.h>
#if (defined(XILINX_OF_BOARD_DTB_ADDR) && !IS_TFA_IN_OCM(BL31_BASE))
void prepare_dtb(void) void prepare_dtb(void)
{ {
void *dtb = (void *)XILINX_OF_BOARD_DTB_ADDR; void *dtb;
int ret; int ret;
#if !defined(XILINX_OF_BOARD_DTB_ADDR)
return;
#else
dtb = (void *)XILINX_OF_BOARD_DTB_ADDR;
#endif
if (IS_TFA_IN_OCM(BL31_BASE))
return;
/* Return if no device tree is detected */ /* Return if no device tree is detected */
if (fdt_check_header(dtb) != 0) { if (fdt_check_header(dtb) != 0) {
@ -45,8 +51,3 @@ void prepare_dtb(void)
clean_dcache_range((uintptr_t)dtb, fdt_blob_size(dtb)); clean_dcache_range((uintptr_t)dtb, fdt_blob_size(dtb));
INFO("Changed device tree to advertise PSCI and reserved memories.\n"); INFO("Changed device tree to advertise PSCI and reserved memories.\n");
} }
#else
void prepare_dtb(void)
{
}
#endif

2
plat/xilinx/versal/include/platform_def.h
View file

@ -79,7 +79,7 @@
#define XILINX_OF_BOARD_DTB_MAX_SIZE U(0x200000) #define XILINX_OF_BOARD_DTB_MAX_SIZE U(0x200000)
#define PLAT_OCM_BSE U(0xFFFE0000) #define PLAT_OCM_BASE U(0xFFFE0000)
#define PLAT_OCM_LIMIT U(0xFFFFFFFF) #define PLAT_OCM_LIMIT U(0xFFFFFFFF)
#define IS_TFA_IN_OCM(x) ((x >= PLAT_OCM_BASE) && (x < PLAT_OCM_LIMIT)) #define IS_TFA_IN_OCM(x) ((x >= PLAT_OCM_BASE) && (x < PLAT_OCM_LIMIT))