From cdaefa89c7450edde0cb353382f42a98b74f81de Mon Sep 17 00:00:00 2001 From: Viktor Sannum Date: Mon, 28 Jun 2021 18:27:28 +0200 Subject: [PATCH] cmake-tool: move rpi3 to binary_list 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 --- cmake-tool/helpers/application_settings.cmake | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/cmake-tool/helpers/application_settings.cmake b/cmake-tool/helpers/application_settings.cmake index 6205c40b..4b808817 100644 --- a/cmake-tool/helpers/application_settings.cmake +++ b/cmake-tool/helpers/application_settings.cmake @@ -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( @@ -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)