Skip to content

Commit 989759f

Browse files
committed
arm: Alias arm_hyp to aarch32
arm_hyp is the same as aarch32 + hypervisor mode. This prepares when arm_hyp is removed as a valid setting for KernelSel4Arch. Signed-off-by: Kent McLeod <kent@kry10.com>
1 parent 9adad93 commit 989759f

2 files changed

Lines changed: 7 additions & 21 deletions

File tree

apps/sel4test-tests/CMakeLists.txt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,15 @@ file(
2828
)
2929

3030
add_executable(sel4test-tests EXCLUDE_FROM_ALL ${deps})
31+
# special handling for "arm_hyp", it's really "aarch32"
32+
set(_inc_folder_KernelSel4Arch "${KernelSel4Arch}")
33+
if("${KernelSel4Arch}" STREQUAL "arm_hyp")
34+
set(_inc_folder_KernelSel4Arch "aarch32")
35+
endif()
36+
3137
target_include_directories(
3238
sel4test-tests
33-
PRIVATE include arch/${KernelArch} sel4_arch/${KernelSel4Arch}
39+
PRIVATE include arch/${KernelArch} sel4_arch/${_inc_folder_KernelSel4Arch}
3440
)
3541

3642
target_link_libraries(

apps/sel4test-tests/sel4_arch/arm_hyp/arch_frame_type.h

Lines changed: 0 additions & 20 deletions
This file was deleted.

0 commit comments

Comments
 (0)