Merge patch-axel-17

Hensoldt-Cyber · Apr 3, 2023 · d0d7856 · d0d7856
2 parents d4189c7 + 4468076
commit d0d7856
Show file tree

Hide file tree

Showing 4 changed files with 185 additions and 140 deletions.
diff --git a/arm_vm_helpers.cmake b/arm_vm_helpers.cmake
@@ -40,15 +40,21 @@ function(DeclareCAmkESARMVM init_component)
         ""
         "EXTRA_SOURCES;EXTRA_INCLUDES;EXTRA_LIBS;EXTRA_C_FLAGS;EXTRA_LD_FLAGS"
     )
-    file(
-        GLOB
-            vm_src
-            ${ARM_VM_PROJECT_DIR}/components/VM_Arm/src/main.c
-            ${ARM_VM_PROJECT_DIR}/components/VM_Arm/src/fdt_manipulation.c
-            ${ARM_VM_PROJECT_DIR}/components/VM_Arm/src/crossvm.c
+
+    set(
+        vm_src
+        ${ARM_VM_PROJECT_DIR}/components/VM_Arm/src/main.c
+        ${ARM_VM_PROJECT_DIR}/components/VM_Arm/src/fdt_manipulation.c
+        ${ARM_VM_PROJECT_DIR}/components/VM_Arm/src/modules/map_frame_hack.c
     )
 
-    list(APPEND vm_src ${ARM_VM_PROJECT_DIR}/components/VM_Arm/src/modules/map_frame_hack.c)
+    if(VmPCISupport)
+        list(
+            APPEND
+                vm_src ${ARM_VM_PROJECT_DIR}/components/VM_Arm/src/modules/vpci.c
+                ${ARM_VM_PROJECT_DIR}/components/VM_Arm/src/crossvm.c
+        )
+    endif()
 
     if(VmVirtUart)
         list(APPEND vm_src ${ARM_VM_PROJECT_DIR}/components/VM_Arm/src/modules/vuart_init.c)

diff --git a/components/VM_Arm/include/vmlinux.h b/components/VM_Arm/include/vmlinux.h
@@ -17,6 +17,9 @@
 
 #define FREE_IOPORT_START    0x1000
 
+extern char gen_dtb_buf[];
+extern void *fdt_ori;
+
 irq_callback_fn_t get_custom_irq_handler(ps_irq_t irq) WEAK;
 
 /* Struct type that's passed into the IRQ callback functions for