Browse Source
Merge pull request #1760 from igoropaniuk/rpi3_preloaded_dtb_fix
rpi3: fix RPI3_PRELOADED_DTB_BASE usage
pull/1769/head
Antonio Niño Díaz
6 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
4 additions and
0 deletions
-
plat/rpi3/platform.mk
-
plat/rpi3/rpi3_bl31_setup.c
|
|
@ -130,7 +130,9 @@ endif |
|
|
$(eval $(call add_define,RPI3_BL32_RAM_LOCATION_ID)) |
|
|
$(eval $(call add_define,RPI3_BL32_RAM_LOCATION_ID)) |
|
|
$(eval $(call add_define,RPI3_BL33_IN_AARCH32)) |
|
|
$(eval $(call add_define,RPI3_BL33_IN_AARCH32)) |
|
|
$(eval $(call add_define,RPI3_DIRECT_LINUX_BOOT)) |
|
|
$(eval $(call add_define,RPI3_DIRECT_LINUX_BOOT)) |
|
|
|
|
|
ifdef RPI3_PRELOADED_DTB_BASE |
|
|
$(eval $(call add_define,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_RUNTIME_UART)) |
|
|
$(eval $(call add_define,RPI3_USE_UEFI_MAP)) |
|
|
$(eval $(call add_define,RPI3_USE_UEFI_MAP)) |
|
|
|
|
|
|
|
|
|
|
|
@ -141,6 +141,7 @@ void bl31_plat_arch_setup(void) |
|
|
enable_mmu_el3(0); |
|
|
enable_mmu_el3(0); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
#ifdef RPI3_PRELOADED_DTB_BASE |
|
|
/*
|
|
|
/*
|
|
|
* Add information to the device tree (if any) about the reserved DRAM used by |
|
|
* Add information to the device tree (if any) about the reserved DRAM used by |
|
|
* the Trusted Firmware. |
|
|
* 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, |
|
|
INFO("rpi3: Reserved 0x%llx - 0x%llx in DTB\n", SEC_SRAM_BASE, |
|
|
SEC_SRAM_BASE + SEC_SRAM_SIZE); |
|
|
SEC_SRAM_BASE + SEC_SRAM_SIZE); |
|
|
} |
|
|
} |
|
|
|
|
|
#endif |
|
|
|
|
|
|
|
|
void bl31_platform_setup(void) |
|
|
void bl31_platform_setup(void) |
|
|
{ |
|
|
{ |
|
|
|
