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

@@ -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 {
 	<start name="tz_vmm">
+		<binary name="} [tz_vmm_binary] {"/>
 		<resource name="RAM" quantum="10M"/> }
 
 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 } {
 

repos/os/src/server/tz_vmm/empty.cc

@@ -1,3 +0,0 @@
-/*
- * Dummy compilation unit needed to link a valid target.
- */

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 =

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

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

repos/os/src/server/tz_vmm/target.mk

@@ -1,3 +0,0 @@
-TARGET  = tz_vmm
-LIBS   += tz_vmm
-SRC_CC += empty.cc