Skip to content

Commit

Permalink
cmake-tool: move rpi3 to binary_list in application_settings
Browse files Browse the repository at this point in the history
The Raspberry Pi3 has its own definition for configuring the
setting for binary images builds for aarch64 only, meaning
it cannot be part of the more generic binary_list definition.

The 32-bit aarch32 rpi3 builds can also boot from a binary
image so there is no actual need for this sepcial handling.

Remove it and move the bcm2837/rpi3 match to the binary_list
definition instead.

Signed-off-by: Viktor Sannum <sannum.viktor@gmail.com>
  • Loading branch information
sannum committed Jun 28, 2021
1 parent 71a5aee commit 08bd8d2
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions cmake-tool/helpers/application_settings.cmake
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

0 comments on commit 08bd8d2

Please sign in to comment.