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

Merge pull request #1760 from igoropaniuk/rpi3_preloaded_dtb_fix 

rpi3: fix RPI3_PRELOADED_DTB_BASE usage
This commit is contained in:
Antonio Niño Díaz 2019-01-17 11:05:40 +00:00 committed by GitHub
parent aea055504d eabbdafe91
commit 023bc019e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plat/rpi3/platform.mk
View File

@ -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))

2
plat/rpi3/rpi3_bl31_setup.c
View File

@ -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)
{