From 39efbafb540016381257e305146a67892b7b86f6 Mon Sep 17 00:00:00 2001 From: Stefan Kalkowski Date: Wed, 27 Nov 2013 11:58:35 +0100 Subject: [PATCH] TrustZone vmm: rename to tz_vmm due to ambiguity --- os/run/{vmm.run => tz_vmm.run} | 8 +++++--- os/src/server/{vmm => tz_vmm}/README | 0 os/src/server/{vmm => tz_vmm}/imx53/m4if.h | 0 os/src/server/{vmm => tz_vmm}/imx53/main.cc | 0 os/src/server/{vmm => tz_vmm}/imx53/target.mk | 2 +- os/src/server/{vmm => tz_vmm}/include/atag.h | 0 os/src/server/{vmm => tz_vmm}/include/mmu.h | 0 os/src/server/{vmm => tz_vmm}/include/ram.h | 0 os/src/server/{vmm => tz_vmm}/include/vm.h | 0 os/src/server/{vmm => tz_vmm}/include/vm_state.h | 0 os/src/server/{vmm => tz_vmm}/vea9x4/bp_147.h | 0 os/src/server/{vmm => tz_vmm}/vea9x4/main.cc | 0 os/src/server/{vmm => tz_vmm}/vea9x4/sp810.h | 0 os/src/server/{vmm => tz_vmm}/vea9x4/sys_reg.h | 0 os/src/server/{vmm => tz_vmm}/vea9x4/target.mk | 2 +- os/src/server/{vmm => tz_vmm}/vea9x4/tsc_380.h | 0 16 files changed, 7 insertions(+), 5 deletions(-) rename os/run/{vmm.run => tz_vmm.run} (84%) rename os/src/server/{vmm => tz_vmm}/README (100%) rename os/src/server/{vmm => tz_vmm}/imx53/m4if.h (100%) rename os/src/server/{vmm => tz_vmm}/imx53/main.cc (100%) rename os/src/server/{vmm => tz_vmm}/imx53/target.mk (86%) rename os/src/server/{vmm => tz_vmm}/include/atag.h (100%) rename os/src/server/{vmm => tz_vmm}/include/mmu.h (100%) rename os/src/server/{vmm => tz_vmm}/include/ram.h (100%) rename os/src/server/{vmm => tz_vmm}/include/vm.h (100%) rename os/src/server/{vmm => tz_vmm}/include/vm_state.h (100%) rename os/src/server/{vmm => tz_vmm}/vea9x4/bp_147.h (100%) rename os/src/server/{vmm => tz_vmm}/vea9x4/main.cc (100%) rename os/src/server/{vmm => tz_vmm}/vea9x4/sp810.h (100%) rename os/src/server/{vmm => tz_vmm}/vea9x4/sys_reg.h (100%) rename os/src/server/{vmm => tz_vmm}/vea9x4/target.mk (86%) rename os/src/server/{vmm => tz_vmm}/vea9x4/tsc_380.h (100%) diff --git a/os/run/vmm.run b/os/run/tz_vmm.run similarity index 84% rename from os/run/vmm.run rename to os/run/tz_vmm.run index 39a1af756..515ed3c5c 100644 --- a/os/run/vmm.run +++ b/os/run/tz_vmm.run @@ -9,7 +9,7 @@ if {![have_spec trustzone]} { exit 0 } -build "core init server/vmm" +build "core init server/tz_vmm" create_boot_directory install_config { @@ -30,10 +30,12 @@ install_config { - + } -build_boot_image "core init vmm linux initrd.gz" +build_boot_image "core init tz_vmm linux initrd.gz" + +run_genode_until forever \ No newline at end of file diff --git a/os/src/server/vmm/README b/os/src/server/tz_vmm/README similarity index 100% rename from os/src/server/vmm/README rename to os/src/server/tz_vmm/README diff --git a/os/src/server/vmm/imx53/m4if.h b/os/src/server/tz_vmm/imx53/m4if.h similarity index 100% rename from os/src/server/vmm/imx53/m4if.h rename to os/src/server/tz_vmm/imx53/m4if.h diff --git a/os/src/server/vmm/imx53/main.cc b/os/src/server/tz_vmm/imx53/main.cc similarity index 100% rename from os/src/server/vmm/imx53/main.cc rename to os/src/server/tz_vmm/imx53/main.cc diff --git a/os/src/server/vmm/imx53/target.mk b/os/src/server/tz_vmm/imx53/target.mk similarity index 86% rename from os/src/server/vmm/imx53/target.mk rename to os/src/server/tz_vmm/imx53/target.mk index 36a5f9f6a..883942c7d 100644 --- a/os/src/server/vmm/imx53/target.mk +++ b/os/src/server/tz_vmm/imx53/target.mk @@ -1,4 +1,4 @@ -TARGET = vmm +TARGET = tz_vmm REQUIRES = trustzone platform_imx53 LIBS = base SRC_CC = main.cc diff --git a/os/src/server/vmm/include/atag.h b/os/src/server/tz_vmm/include/atag.h similarity index 100% rename from os/src/server/vmm/include/atag.h rename to os/src/server/tz_vmm/include/atag.h diff --git a/os/src/server/vmm/include/mmu.h b/os/src/server/tz_vmm/include/mmu.h similarity index 100% rename from os/src/server/vmm/include/mmu.h rename to os/src/server/tz_vmm/include/mmu.h diff --git a/os/src/server/vmm/include/ram.h b/os/src/server/tz_vmm/include/ram.h similarity index 100% rename from os/src/server/vmm/include/ram.h rename to os/src/server/tz_vmm/include/ram.h diff --git a/os/src/server/vmm/include/vm.h b/os/src/server/tz_vmm/include/vm.h similarity index 100% rename from os/src/server/vmm/include/vm.h rename to os/src/server/tz_vmm/include/vm.h diff --git a/os/src/server/vmm/include/vm_state.h b/os/src/server/tz_vmm/include/vm_state.h similarity index 100% rename from os/src/server/vmm/include/vm_state.h rename to os/src/server/tz_vmm/include/vm_state.h diff --git a/os/src/server/vmm/vea9x4/bp_147.h b/os/src/server/tz_vmm/vea9x4/bp_147.h similarity index 100% rename from os/src/server/vmm/vea9x4/bp_147.h rename to os/src/server/tz_vmm/vea9x4/bp_147.h diff --git a/os/src/server/vmm/vea9x4/main.cc b/os/src/server/tz_vmm/vea9x4/main.cc similarity index 100% rename from os/src/server/vmm/vea9x4/main.cc rename to os/src/server/tz_vmm/vea9x4/main.cc diff --git a/os/src/server/vmm/vea9x4/sp810.h b/os/src/server/tz_vmm/vea9x4/sp810.h similarity index 100% rename from os/src/server/vmm/vea9x4/sp810.h rename to os/src/server/tz_vmm/vea9x4/sp810.h diff --git a/os/src/server/vmm/vea9x4/sys_reg.h b/os/src/server/tz_vmm/vea9x4/sys_reg.h similarity index 100% rename from os/src/server/vmm/vea9x4/sys_reg.h rename to os/src/server/tz_vmm/vea9x4/sys_reg.h diff --git a/os/src/server/vmm/vea9x4/target.mk b/os/src/server/tz_vmm/vea9x4/target.mk similarity index 86% rename from os/src/server/vmm/vea9x4/target.mk rename to os/src/server/tz_vmm/vea9x4/target.mk index f01ce8d14..71ea3d341 100644 --- a/os/src/server/vmm/vea9x4/target.mk +++ b/os/src/server/tz_vmm/vea9x4/target.mk @@ -1,4 +1,4 @@ -TARGET = vmm +TARGET = tz_vmm REQUIRES = trustzone platform_vea9x4 LIBS = base SRC_CC = main.cc diff --git a/os/src/server/vmm/vea9x4/tsc_380.h b/os/src/server/tz_vmm/vea9x4/tsc_380.h similarity index 100% rename from os/src/server/vmm/vea9x4/tsc_380.h rename to os/src/server/tz_vmm/vea9x4/tsc_380.h