Imagelibrary/seL4
1
0
Fork 1
mirror of https://github.com/seL4/seL4.git synced 2026-03-27 10:29:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

CMake: cleanup KernelSel4ArchArmHyp

Browse Source 
Don't create CONFIG_ARCH_AARCH32 on every platform and architecture.
Remove KernelSel4ArmHypAarch32.

Signed-off-by: Axel Heider <axel.heider@hensoldt-cyber.de>
This commit is contained in:
Axel Heider
2021-05-27 18:39:35 +02:00
committed by Kent McLeod
parent 9a4d3ae51d
commit e1e26c7ef8
2 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
configs/seL4Config.cmake
View File

@@ -34,25 +34,24 @@ macro(declare_seL4_arch sel4_arch)
"ia32;KernelSel4ArchIA32;ARCH_IA32"
)
if(KernelSel4ArchArmHyp)
# arm-hyp is basically aarch32. This should be cleaned up and aligned
# with other architectures, where hypervisor support is an additional
# flag. The main blocker here is updating the verification flow.
config_set(KernelSel4ArchAarch32 ARCH_AARCH32 ON)
endif()
config_choice(
KernelArch
ARCH
"Architecture to use when building the kernel"
"arm;KernelArchARM;ARCH_ARM;KernelSel4ArchAarch32 OR KernelSel4ArchAarch64 OR KernelSel4ArchArmHyp"
"arm;KernelArchARM;ARCH_ARM;KernelSel4ArchAarch32 OR KernelSel4ArchAarch64"
"riscv;KernelArchRiscV;ARCH_RISCV;KernelSel4ArchRiscV32 OR KernelSel4ArchRiscV64"
"x86;KernelArchX86;ARCH_X86;KernelSel4ArchX86_64 OR KernelSel4ArchIA32"
)
# arm-hyp masquerades as an aarch32 build
if(KernelSel4ArchArmHyp)
config_set(KernelSel4ArmHypAarch32 ARCH_AARCH32 ON)
set(KernelSel4ArchAarch32 ON CACHE INTERNAL "" FORCE)
else()
config_set(KernelSel4ArmHypAarch32 ARCH_AARCH32 OFF)
endif()
# Set kernel mode options
if(KernelSel4ArchAarch32 OR KernelSel4ArchArmHyp OR KernelSel4ArchRiscV32 OR KernelSel4ArchIA32)
if(KernelSel4ArchAarch32 OR KernelSel4ArchRiscV32 OR KernelSel4ArchIA32)
config_set(KernelWordSize WORD_SIZE 32)
set(Kernel64 OFF CACHE INTERNAL "")
set(Kernel32 ON CACHE INTERNAL "")