portugalfuturista/seL4
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

zynqmp/ultra96: make build work again

Browse source 
define KernelPlatformZCU102 and KernelPlatformUltra96 that both
use KernelPlatformZynqmp then.

Signed-off-by: Oliver Scott <Oliver.Scott@data61.csiro.au>
This commit is contained in:
Axel Heider 2020-09-29 04:27:37 +02:00 committed by Oliver Scott
parent 6b12a7d16c
commit 40fc2bba43
2 changed files with 27 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libsel4/sel4_plat_include/zynqmp/sel4/plat/api/constants.h
View file

@ -8,6 +8,10 @@
#include <autoconf.h>
#if !defined(CONFIG_PLAT_ZYNQMP) && !defined(PLAT_ZYNQMP_ZCU102)
#error "unknown platform"
#endif
/* Cortex A57 manual, section 10.6.1 */
#define seL4_NumHWBreakpoints (10)
#define seL4_NumExclusiveBreakpoints (6)

31
src/plat/zynqmp/config.cmake
View file

@ -6,14 +6,14 @@
cmake_minimum_required(VERSION 3.7.2)
declare_platform(ultra96 KernelPlatformUltra96 PLAT_ZYNQMP_ULTRA96 KernelArchARM)
declare_platform(zynqmp KernelPlatformZynqmp PLAT_ZYNQMP KernelArchARM)
if(KernelPlatformUltra96)
# Ultra96 is is basically Zynqmp
list(APPEND KernelDTSList "tools/dts/ultra96.dts")
config_set(KernelPlatformZynqmp PLAT_ZYNQMP ON)
endif()
set(c_configs PLAT_ZYNQMP_ZCU102 PLAT_ZYNQMP_ULTRA96)
set(cmake_configs KernelPlatformZynqmpZcu102 KernelPlatformZynqmpUltra96)
set(plat_lists zcu102 ultra96)
foreach(config IN LISTS cmake_configs)
unset(${config} CACHE)
endforeach()
if(KernelPlatformZynqmp)
set(KernelHardwareDebugAPIUnsupported ON CACHE INTERNAL "")
@ -27,13 +27,28 @@ if(KernelPlatformZynqmp)
fallback_declare_seL4_arch_default(aarch64)
endif()
check_platform_and_fallback_to_default(KernelARMPlatform "zcu102")
list(FIND plat_lists ${KernelARMPlatform} index)
if("${index}" STREQUAL "-1")
message(FATAL_ERROR "Which zynqmp platform not specified")
endif()
list(GET c_configs ${index} c_config)
list(GET cmake_configs ${index} cmake_config)
config_set(KernelARMPlatform ARM_PLAT ${KernelARMPlatform})
config_set(${cmake_config} ${c_config} ON)
set(KernelArmCortexA53 ON)
set(KernelArchArmV8a ON)
config_set(KernelARMPlatform ARM_PLAT zynqmp)
config_set(KernelArmMach MACH "zynq")
if(NOT KernelPlatformUltra96)
if(KernelPlatformZynqmpUltra96)
list(APPEND KernelDTSList "tools/dts/ultra96.dts")
elseif(KernelPlatformZynqmpZcu102)
list(APPEND KernelDTSList "tools/dts/zynqmp.dts")
else()
message(FATAL_ERROR "unknown platform")
endif()
if(KernelSel4ArchAarch32)