diff options
| author | Antonio Niño Díaz <antonio.ninodiaz@arm.com> | 2019-01-17 11:05:40 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-17 11:05:40 +0000 |
| commit | 023bc019e95ca98687f015074c938941a0546eb7 (patch) | |
| tree | 8a7922d4d533314e26efea93eddbe12c06a41c02 | |
| parent | aea055504d2ab28b2dcb743f7cb99905f264a313 (diff) | |
| parent | eabbdafe9106f3f91caa160c9f10754c3cad7973 (diff) | |
Merge pull request #1760 from igoropaniuk/rpi3_preloaded_dtb_fix
rpi3: fix RPI3_PRELOADED_DTB_BASE usage
| -rw-r--r-- | plat/rpi3/platform.mk | 2 | ||||
| -rw-r--r-- | plat/rpi3/rpi3_bl31_setup.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/plat/rpi3/platform.mk b/plat/rpi3/platform.mk index 559f3163..5e76345a 100644 --- a/plat/rpi3/platform.mk +++ b/plat/rpi3/platform.mk @@ -130,7 +130,9 @@ endif $(eval $(call add_define,RPI3_BL32_RAM_LOCATION_ID)) $(eval $(call add_define,RPI3_BL33_IN_AARCH32)) $(eval $(call add_define,RPI3_DIRECT_LINUX_BOOT)) +ifdef RPI3_PRELOADED_DTB_BASE $(eval $(call add_define,RPI3_PRELOADED_DTB_BASE)) +endif $(eval $(call add_define,RPI3_RUNTIME_UART)) $(eval $(call add_define,RPI3_USE_UEFI_MAP)) diff --git a/plat/rpi3/rpi3_bl31_setup.c b/plat/rpi3/rpi3_bl31_setup.c index af7f806c..d5c691e1 100644 --- a/plat/rpi3/rpi3_bl31_setup.c +++ b/plat/rpi3/rpi3_bl31_setup.c @@ -141,6 +141,7 @@ void bl31_plat_arch_setup(void) enable_mmu_el3(0); } +#ifdef RPI3_PRELOADED_DTB_BASE /* * Add information to the device tree (if any) about the reserved DRAM used by * the Trusted Firmware. @@ -204,6 +205,7 @@ static void rpi3_dtb_add_mem_rsv(void) INFO("rpi3: Reserved 0x%llx - 0x%llx in DTB\n", SEC_SRAM_BASE, SEC_SRAM_BASE + SEC_SRAM_SIZE); } +#endif void bl31_platform_setup(void) { |