ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-04-07 11:27:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

os: name tz_vmm unambigously (ref #2190)

Browse Source 
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
This commit is contained in:
Stefan Kalkowski 2019-05-14 16:14:15 +02:00 committed by Christian Helmuth
parent faee97dd1e
commit 3460444d84
6 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
repos/os/run/tz_vmm.run
View File

@ -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 } {

3
repos/os/src/server/tz_vmm/empty.cc
View File

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

3
repos/os/lib/mk/spec/imx53/tz_vmm.inc → repos/os/src/server/tz_vmm/spec/imx53/target.inc
View File

@ -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 =

5
repos/os/lib/mk/spec/imx53_qsb/tz_vmm.mk → repos/os/src/server/tz_vmm/spec/imx53_qsb/target.mk
View File

@ -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

5
repos/os/lib/mk/spec/usb_armory/tz_vmm.mk → repos/os/src/server/tz_vmm/spec/usb_armory/target.mk
View File

@ -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

3
repos/os/src/server/tz_vmm/target.mk
View File

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