Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
adam.huang
Arm Trusted Firmware
Commits
023bc019
Unverified
Commit
023bc019
authored
6 years ago
by
Antonio Niño Díaz
Committed by
GitHub
6 years ago
Browse files
Options
Download
Plain Diff
Merge pull request #1760 from igoropaniuk/rpi3_preloaded_dtb_fix
rpi3: fix RPI3_PRELOADED_DTB_BASE usage
parents
aea05550
eabbdafe
master
v2.5
v2.5-rc1
v2.5-rc0
v2.4
v2.4-rc2
v2.4-rc1
v2.4-rc0
v2.3
v2.3-rc2
v2.3-rc1
v2.3-rc0
v2.2
v2.2-rc2
v2.2-rc1
v2.2-rc0
v2.1
v2.1-rc1
v2.1-rc0
arm_cca_v0.2
arm_cca_v0.1
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
plat/rpi3/platform.mk
+2
-0
plat/rpi3/platform.mk
plat/rpi3/rpi3_bl31_setup.c
+2
-0
plat/rpi3/rpi3_bl31_setup.c
with
4 additions
and
0 deletions
+4
-0
plat/rpi3/platform.mk
View file @
023bc019
...
...
@@ -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))
...
...
This diff is collapsed.
Click to expand it.
plat/rpi3/rpi3_bl31_setup.c
View file @
023bc019
...
...
@@ -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
)
{
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help