ehmry/genode
ehmry
/
genode
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

hw: move arm virtualization to generic place 

Ref #3553
This commit is contained in:
Stefan Kalkowski 2019-07-15 13:11:28 +02:00 committed by Norman Feske
parent 065b9fdb46
commit 02d68fdb97
6 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
repos/base-hw/lib/mk/spec/arm_v7/core-hw-arndale.mk
View File

@ -6,15 +6,15 @@
# add include paths
INC_DIR += $(REP_DIR)/src/core/spec/arndale
INC_DIR += $(REP_DIR)/src/core/spec/arm_v7/virtualization
INC_DIR += $(REP_DIR)/src/core/spec/arm/virtualization
# add C++ sources
SRC_CC += kernel/vm_thread_on.cc
SRC_CC += spec/arm/gicv2.cc
SRC_CC += spec/arm_v7/virtualization/kernel/vm.cc
SRC_CC += spec/arm_v7/virtualization/platform_services.cc
SRC_CC += spec/arm_v7/virtualization/vm_session_component.cc
SRC_CC += spec/arm_v7/vm_session_component.cc
SRC_CC += spec/arm/virtualization/platform_services.cc
SRC_CC += spec/arm/virtualization/vm_session_component.cc
SRC_CC += spec/arm/vm_session_component.cc
SRC_CC += vm_session_common.cc
# add assembly sources

8
repos/base-hw/lib/mk/spec/arm_v7/core-hw-imx7d_sabre.mk
View File

@ -6,16 +6,16 @@
# add include paths
INC_DIR += $(REP_DIR)/src/core/spec/imx7d_sabre
INC_DIR += $(REP_DIR)/src/core/spec/arm_v7/virtualization
INC_DIR += $(REP_DIR)/src/core/spec/arm/virtualization
# add C++ sources
SRC_CC += kernel/vm_thread_on.cc
SRC_CC += spec/arm/generic_timer.cc
SRC_CC += spec/arm/gicv2.cc
SRC_CC += spec/arm_v7/virtualization/kernel/vm.cc
SRC_CC += spec/arm_v7/virtualization/platform_services.cc
SRC_CC += spec/arm_v7/virtualization/vm_session_component.cc
SRC_CC += spec/arm_v7/vm_session_component.cc
SRC_CC += spec/arm/virtualization/platform_services.cc
SRC_CC += spec/arm/virtualization/vm_session_component.cc
SRC_CC += spec/arm/vm_session_component.cc
SRC_CC += vm_session_common.cc
# add assembly sources

0
repos/base-hw/src/core/spec/arm_v7/virtualization/platform_services.cc → repos/base-hw/src/core/spec/arm/virtualization/platform_services.cc
View File

2
repos/base-hw/src/core/spec/arm_v7/virtualization/vm_session_component.cc → repos/base-hw/src/core/spec/arm/virtualization/vm_session_component.cc
View File

@ -16,7 +16,7 @@
/* core includes */
#include <kernel/core_interface.h>
#include <vm_session_component.h>
#include <spec/arm/virtualization/vm_session_component.h>
#include <platform.h>
#include <core_env.h>

5
repos/base-hw/src/core/spec/arm_v7/virtualization/vm_session_component.h → repos/base-hw/src/core/spec/arm/virtualization/vm_session_component.h
View File

@ -27,6 +27,7 @@
#include <region_map_component.h>
#include <translation_table.h>
#include <kernel/vm.h>
#include <cpu/vm_state_virtualization.h>
#include <trace/source_registry.h>
@ -60,13 +61,13 @@ class Genode::Vm_session_component
Avl_region _map { &_sliced_heap };
Region_map &_region_map;
Ram_dataspace_capability _ds_cap { };
Region_map::Local_addr _ds_addr { 0 };
Region_map::Local_addr _ds_addr { nullptr };
Table &_table;
Array &_table_array;
Kernel_object<Kernel::Vm> _kobj {};
static size_t _ds_size() {
return align_addr(sizeof(Cpu_state_modes),
return align_addr(sizeof(Vm_state),
get_page_size_log2()); }
addr_t _alloc_ds();

0
repos/base-hw/src/core/spec/arm_v7/vm_session_component.cc → repos/base-hw/src/core/spec/arm/vm_session_component.cc
View File