Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Sannum/rpi3 fixups #93

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Sannum/rpi3 fixups #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5805695
elfloader: fixup load from stack on aarch64
sannum Jun 28, 2021
b9a96e9
elfloader: check for dtb on arm binary images
sannum Jun 28, 2021
75e5c70
elfloader: print bootloader_dtb instead of dtb
sannum Jun 28, 2021
cdaefa8
cmake-tool: move rpi3 to binary_list
sannum Jun 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions cmake-tool/helpers/application_settings.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ cmake_minimum_required(VERSION 3.8.2)
include_guard(GLOBAL)

function(ApplyData61ElfLoaderSettings kernel_platform kernel_sel4_arch)
set(binary_list "tx1;hikey;odroidc2;imx8mq-evk;zynqmp;imx8mm-evk;hifive")
set(binary_list "tx1;hikey;odroidc2;imx8mq-evk;zynqmp;imx8mm-evk;hifive;bcm2837")
set(efi_list "tk1;rockpro64")
set(uimage_list "tx2;am335x")
if(
Expand All @@ -19,9 +19,6 @@ function(ApplyData61ElfLoaderSettings kernel_platform kernel_sel4_arch)
set(ElfloaderImage "efi" CACHE STRING "" FORCE)
elseif(${kernel_platform} IN_LIST uimage_list)
set(ElfloaderImage "uimage" CACHE STRING "" FORCE)
#rpi3
elseif(${kernel_platform} STREQUAL "bcm2837" AND ${kernel_sel4_arch} STREQUAL "aarch64")
set(ElfloaderImage "binary" CACHE STRING "" FORCE)
#rpi4
elseif(${kernel_platform} STREQUAL "bcm2711" AND ${kernel_sel4_arch} STREQUAL "aarch64")
set(ElfloaderImage "efi" CACHE STRING "" FORCE)
Expand Down
2 changes: 1 addition & 1 deletion elfloader-tool/src/arch-arm/64/crt0.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ BEGIN_FUNC(_start)
bl fixup_image_base
mov x2, x0
/* restore original arguments for next step */
ldp x0, x1, [sp, #-16]!
ldp x0, x1, [sp], #16
/* fixup_image_base returns 1 if no need to move */
cmp x2, #1
beq 1f
Expand Down
4 changes: 2 additions & 2 deletions elfloader-tool/src/arch-arm/sys_boot.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ void main(UNUSED void *arg)
print_cpuid();
printf(" paddr=[%p..%p]\n", _text, _end - 1);

#if defined(CONFIG_IMAGE_UIMAGE)
#if defined(CONFIG_IMAGE_UIMAGE) || defined(CONFIG_IMAGE_BINARY)

/* U-Boot passes a DTB. Ancient bootloaders may pass atags. When booting via
* bootelf argc is NULL.
Expand All @@ -133,7 +133,7 @@ void main(UNUSED void *arg)
#endif

if (bootloader_dtb) {
printf(" dtb=%p\n", dtb);
printf(" dtb=%p\n", bootloader_dtb);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good catch

} else {
printf("No DTB passed in from boot loader.\n");
}
Expand Down