From 3460444d848e1da3f30872ebc79b72e2e4771998 Mon Sep 17 00:00:00 2001 From: Stefan Kalkowski Date: Tue, 14 May 2019 16:14:15 +0200 Subject: [PATCH] os: name tz_vmm unambigously (ref #2190) Moreover, express current requirement to hw API, which was missing until now. Originally, in the board-specific build directory of imx53_qsb the "KERNEL" variable was preset with "hw". Therefore, it was not perceived that this dependency is required. Ref #3316 --- repos/os/run/tz_vmm.run | 10 +++++++++- repos/os/src/server/tz_vmm/empty.cc | 3 --- .../server/tz_vmm/spec/imx53/target.inc} | 3 +++ .../server/tz_vmm/spec/imx53_qsb/target.mk} | 5 ++--- .../server/tz_vmm/spec/usb_armory/target.mk} | 5 ++--- repos/os/src/server/tz_vmm/target.mk | 3 --- 6 files changed, 16 insertions(+), 13 deletions(-) delete mode 100644 repos/os/src/server/tz_vmm/empty.cc rename repos/os/{lib/mk/spec/imx53/tz_vmm.inc => src/server/tz_vmm/spec/imx53/target.inc} (84%) rename repos/os/{lib/mk/spec/imx53_qsb/tz_vmm.mk => src/server/tz_vmm/spec/imx53_qsb/target.mk} (50%) rename repos/os/{lib/mk/spec/usb_armory/tz_vmm.mk => src/server/tz_vmm/spec/usb_armory/target.mk} (50%) delete mode 100644 repos/os/src/server/tz_vmm/target.mk diff --git a/repos/os/run/tz_vmm.run b/repos/os/run/tz_vmm.run index 3690e9212..d31f176cf 100644 --- a/repos/os/run/tz_vmm.run +++ b/repos/os/run/tz_vmm.run @@ -99,6 +99,12 @@ set dtb $inversepath_linux set targets { core init server/tz_vmm } +proc tz_vmm_binary {} { + if {[have_spec usb_armory]} { return usb_armory_tz_vmm } + if {[have_spec imx53_qsb]} { return imx53_qsb_tz_vmm } + return no_tz_vmm_binary +} + if { $mmc_rootfs } { # choose interrupt for paravirtualized block @@ -173,6 +179,7 @@ append_if $mmc_rootfs config { append config { + } if { $mmc_rootfs } { @@ -209,7 +216,8 @@ if {![file exists linux]} { exec >& /dev/null wget -O linux.md5 $linux_uri.md5 exec md5sum -c linux.md5 -set boot_modules { core ld.lib.so init tz_vmm linux } +set boot_modules { core ld.lib.so init linux } +lappend boot_modules [tz_vmm_binary] if { $dtb } { diff --git a/repos/os/src/server/tz_vmm/empty.cc b/repos/os/src/server/tz_vmm/empty.cc deleted file mode 100644 index 066c1bf82..000000000 --- a/repos/os/src/server/tz_vmm/empty.cc +++ /dev/null @@ -1,3 +0,0 @@ -/* - * Dummy compilation unit needed to link a valid target. - */ diff --git a/repos/os/lib/mk/spec/imx53/tz_vmm.inc b/repos/os/src/server/tz_vmm/spec/imx53/target.inc similarity index 84% rename from repos/os/lib/mk/spec/imx53/tz_vmm.inc rename to repos/os/src/server/tz_vmm/spec/imx53/target.inc index 6cc27ca48..1de0277a7 100644 --- a/repos/os/lib/mk/spec/imx53/tz_vmm.inc +++ b/repos/os/src/server/tz_vmm/spec/imx53/target.inc @@ -1,6 +1,9 @@ +REQUIRES = hw arm_v7 LIBS += base SRC_CC += serial_driver.cc block_driver.cc vm_base.cc spec/imx53/main.cc INC_DIR += $(REP_DIR)/src/server/tz_vmm/spec/imx53 INC_DIR += $(REP_DIR)/src/server/tz_vmm/include vpath % $(REP_DIR)/src/server/tz_vmm + +CC_CXX_WARN_STRICT = diff --git a/repos/os/lib/mk/spec/imx53_qsb/tz_vmm.mk b/repos/os/src/server/tz_vmm/spec/imx53_qsb/target.mk similarity index 50% rename from repos/os/lib/mk/spec/imx53_qsb/tz_vmm.mk rename to repos/os/src/server/tz_vmm/spec/imx53_qsb/target.mk index ca1d93410..479a23d1b 100644 --- a/repos/os/lib/mk/spec/imx53_qsb/tz_vmm.mk +++ b/repos/os/src/server/tz_vmm/spec/imx53_qsb/target.mk @@ -1,6 +1,5 @@ +TARGET = imx53_qsb_tz_vmm INC_DIR += $(REP_DIR)/src/server/tz_vmm/spec/imx53_qsb SRC_CC += spec/imx53_qsb/vm.cc -include $(REP_DIR)/lib/mk/spec/imx53/tz_vmm.inc - -CC_CXX_WARN_STRICT = +include $(REP_DIR)/src/server/tz_vmm/spec/imx53/target.inc diff --git a/repos/os/lib/mk/spec/usb_armory/tz_vmm.mk b/repos/os/src/server/tz_vmm/spec/usb_armory/target.mk similarity index 50% rename from repos/os/lib/mk/spec/usb_armory/tz_vmm.mk rename to repos/os/src/server/tz_vmm/spec/usb_armory/target.mk index 3f8849ce8..428442926 100644 --- a/repos/os/lib/mk/spec/usb_armory/tz_vmm.mk +++ b/repos/os/src/server/tz_vmm/spec/usb_armory/target.mk @@ -1,6 +1,5 @@ +TARGET = usb_armory_tz_vmm INC_DIR += $(REP_DIR)/src/server/tz_vmm/spec/usb_armory SRC_CC += spec/usb_armory/vm.cc -include $(REP_DIR)/lib/mk/spec/imx53/tz_vmm.inc - -CC_CXX_WARN_STRICT = +include $(REP_DIR)/src/server/tz_vmm/spec/imx53/target.inc diff --git a/repos/os/src/server/tz_vmm/target.mk b/repos/os/src/server/tz_vmm/target.mk deleted file mode 100644 index 2a8d141c6..000000000 --- a/repos/os/src/server/tz_vmm/target.mk +++ /dev/null @@ -1,3 +0,0 @@ -TARGET = tz_vmm -LIBS += tz_vmm -SRC_CC += empty.cc