From 0590e00e66e07e5ed539360958f81603668a7cf9 Mon Sep 17 00:00:00 2001 From: Martin Stein Date: Thu, 5 Jan 2017 15:49:07 +0100 Subject: [PATCH] tz_vmm: use library instead of REQUIRES Ref #2223 --- repos/os/lib/mk/spec/imx53/tz_vmm.inc | 6 ++++++ repos/os/lib/mk/spec/imx53_qsb/tz_vmm.mk | 4 ++++ repos/os/lib/mk/spec/usb_armory/tz_vmm.mk | 4 ++++ repos/os/src/server/tz_vmm/empty.cc | 3 +++ repos/os/src/server/tz_vmm/spec/imx53/target.inc | 14 -------------- .../os/src/server/tz_vmm/spec/imx53_qsb/target.mk | 3 --- .../os/src/server/tz_vmm/spec/usb_armory/target.mk | 3 --- repos/os/src/server/tz_vmm/target.mk | 3 +++ 8 files changed, 20 insertions(+), 20 deletions(-) create mode 100644 repos/os/lib/mk/spec/imx53/tz_vmm.inc create mode 100644 repos/os/lib/mk/spec/imx53_qsb/tz_vmm.mk create mode 100644 repos/os/lib/mk/spec/usb_armory/tz_vmm.mk create mode 100644 repos/os/src/server/tz_vmm/empty.cc delete mode 100644 repos/os/src/server/tz_vmm/spec/imx53/target.inc delete mode 100644 repos/os/src/server/tz_vmm/spec/imx53_qsb/target.mk delete mode 100644 repos/os/src/server/tz_vmm/spec/usb_armory/target.mk create mode 100644 repos/os/src/server/tz_vmm/target.mk diff --git a/repos/os/lib/mk/spec/imx53/tz_vmm.inc b/repos/os/lib/mk/spec/imx53/tz_vmm.inc new file mode 100644 index 000000000..2620ec269 --- /dev/null +++ b/repos/os/lib/mk/spec/imx53/tz_vmm.inc @@ -0,0 +1,6 @@ +LIBS += base config +SRC_CC += serial.cc block.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 diff --git a/repos/os/lib/mk/spec/imx53_qsb/tz_vmm.mk b/repos/os/lib/mk/spec/imx53_qsb/tz_vmm.mk new file mode 100644 index 000000000..ade453b72 --- /dev/null +++ b/repos/os/lib/mk/spec/imx53_qsb/tz_vmm.mk @@ -0,0 +1,4 @@ +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 diff --git a/repos/os/lib/mk/spec/usb_armory/tz_vmm.mk b/repos/os/lib/mk/spec/usb_armory/tz_vmm.mk new file mode 100644 index 000000000..2b26db61b --- /dev/null +++ b/repos/os/lib/mk/spec/usb_armory/tz_vmm.mk @@ -0,0 +1,4 @@ +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 diff --git a/repos/os/src/server/tz_vmm/empty.cc b/repos/os/src/server/tz_vmm/empty.cc new file mode 100644 index 000000000..066c1bf82 --- /dev/null +++ b/repos/os/src/server/tz_vmm/empty.cc @@ -0,0 +1,3 @@ +/* + * Dummy compilation unit needed to link a valid target. + */ diff --git a/repos/os/src/server/tz_vmm/spec/imx53/target.inc b/repos/os/src/server/tz_vmm/spec/imx53/target.inc deleted file mode 100644 index 8db672a32..000000000 --- a/repos/os/src/server/tz_vmm/spec/imx53/target.inc +++ /dev/null @@ -1,14 +0,0 @@ -TARGET = tz_vmm -REQUIRES += trustzone imx53 -LIBS += base -LIBS += config -SRC_CC += vm.cc -SRC_CC += main.cc -SRC_CC += serial.cc -SRC_CC += block.cc -INC_DIR += $(PRG_DIR) -INC_DIR += $(PRG_DIR)/../../include -INC_DIR += $(PRG_DIR)/../imx53 - -vpath main.cc $(PRG_DIR)/../imx53 -vpath % $(PRG_DIR)/../.. diff --git a/repos/os/src/server/tz_vmm/spec/imx53_qsb/target.mk b/repos/os/src/server/tz_vmm/spec/imx53_qsb/target.mk deleted file mode 100644 index 90b397239..000000000 --- a/repos/os/src/server/tz_vmm/spec/imx53_qsb/target.mk +++ /dev/null @@ -1,3 +0,0 @@ -REQUIRES = hw_imx53_qsb - -include $(PRG_DIR)/../imx53/target.inc diff --git a/repos/os/src/server/tz_vmm/spec/usb_armory/target.mk b/repos/os/src/server/tz_vmm/spec/usb_armory/target.mk deleted file mode 100644 index 8af994fda..000000000 --- a/repos/os/src/server/tz_vmm/spec/usb_armory/target.mk +++ /dev/null @@ -1,3 +0,0 @@ -REQUIRES = hw_usb_armory - -include $(PRG_DIR)/../imx53/target.inc diff --git a/repos/os/src/server/tz_vmm/target.mk b/repos/os/src/server/tz_vmm/target.mk new file mode 100644 index 000000000..2a8d141c6 --- /dev/null +++ b/repos/os/src/server/tz_vmm/target.mk @@ -0,0 +1,3 @@ +TARGET = tz_vmm +LIBS += tz_vmm +SRC_CC += empty.cc