andrius
/
arm-trusted-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge changes from topic "arm_fpga_resmem" into integration 

* changes:
  fix(arm_fpga): reserve BL31 memory
  fix(arm_fpga): limit BL31 memory usage
This commit is contained in:
Madhukar Pappireddy 2021-10-05 22:55:13 +02:00 committed by TrustedFirmware Code Review
parent d7fe4cb036 13e16fee86
commit e2e0444443
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plat/arm/board/arm_fpga/fpga_bl31_setup.c
View File

@ -144,6 +144,12 @@ static void fpga_prepare_dtb(void)
panic();
}
/* Reserve memory used by Trusted Firmware. */
if (fdt_add_reserved_memory(fdt, "tf-a@80000000", BL31_BASE,
BL31_LIMIT - BL31_BASE)) {
WARN("Failed to add reserved memory node to DT\n");
}
/* Check for the command line signature. */
if (!strncmp(cmdline, "CMD:", 4)) {
int chosen;

2
plat/arm/board/arm_fpga/include/platform_def.h
View File

@ -30,7 +30,7 @@
#if !ENABLE_PIE
#define BL31_BASE UL(0x80000000)
#define BL31_LIMIT UL(0x80100000)
#define BL31_LIMIT UL(0x80070000)
#else
#define BL31_BASE UL(0x0)
#define BL31_LIMIT UL(0x01000000)