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>
Change-Id: Ibbf39d3f36e39181431bcfe9af04c3b2def0b169

apps/sel4test-tests/CMakeLists.txt

diff --git a/apps/sel4test-tests/CMakeLists.txt b/apps/sel4test-tests/CMakeLists.txt
index 21629ad..0f35da4 100644
--- a/apps/sel4test-tests/CMakeLists.txt
+++ b/apps/sel4test-tests/CMakeLists.txt
@@ -28,9 +28,15 @@
 )
 
 add_executable(sel4test-tests EXCLUDE_FROM_ALL ${deps})
+# special handling for "arm_hyp", it's really "aarch32"
+set(_inc_folder_KernelSel4Arch "${KernelSel4Arch}")
+if("${KernelSel4Arch}" STREQUAL "arm_hyp")
+    set(_inc_folder_KernelSel4Arch "aarch32")
+endif()
+
 target_include_directories(
     sel4test-tests
-    PRIVATE include arch/${KernelArch} sel4_arch/${KernelSel4Arch}
+    PRIVATE include arch/${KernelArch} sel4_arch/${_inc_folder_KernelSel4Arch}
 )
 
 target_link_libraries(

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

diff --git a/apps/sel4test-tests/sel4_arch/arm_hyp/arch_frame_type.h b/apps/sel4test-tests/sel4_arch/arm_hyp/arch_frame_type.h
deleted file mode 100644
index d664ab7..0000000
--- a/apps/sel4test-tests/sel4_arch/arm_hyp/arch_frame_type.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright 2017, Data61, CSIRO (ABN 41 687 119 230)
- *
- * SPDX-License-Identifier: BSD-2-Clause
- */
-
-#pragma once
-
-#include <stdint.h>
-#include <sel4/types.h>
-#include <sel4/sel4.h>
-
-/* This list must be ordered by size - highest first */
-static const frame_type_t frame_types[] = {
-    { seL4_ARM_SuperSectionObject, 0, seL4_SuperSectionBits, },
-    { seL4_ARM_SectionObject, BIT(seL4_SuperSectionBits), seL4_SectionBits, },
-    { seL4_ARM_LargePageObject, BIT(seL4_SuperSectionBits) + BIT(seL4_SectionBits), seL4_LargePageBits, },
-    { seL4_ARM_SmallPageObject, BIT(seL4_SuperSectionBits) + BIT(seL4_SectionBits) + BIT(seL4_LargePageBits), seL4_PageBits, },
-};
-