Merge "Update projects for new source tree layout"
diff --git a/project/imx7d-inc.mk b/project/imx7d-inc.mk
index a40170f..da8e6d5 100644
--- a/project/imx7d-inc.mk
+++ b/project/imx7d-inc.mk
@@ -55,9 +55,9 @@
# Modules to be compiled into lk.bin
#
MODULES += \
- lib/sm \
- lib/trusty \
- lib/memlog \
+ trusty/kernel/lib/sm \
+ trusty/kernel/lib/trusty \
+ trusty/kernel/lib/memlog \
TRUSTY_USER_ARCH := arm
@@ -70,11 +70,11 @@
# compiled from source
TRUSTY_ALL_USER_TASKS := \
- app/avb \
- app/hwcrypto \
- keymaster \
- gatekeeper \
- storage \
+ trusty/user/app/avb \
+ trusty/hardware/nxp/app/hwcrypto \
+ trusty/user/app/keymaster \
+ trusty/user/app/gatekeeper \
+ trusty/user/app/storage \
# This project requires trusty IPC
WITH_TRUSTY_IPC := true
diff --git a/project/imx7d-test-inc.mk b/project/imx7d-test-inc.mk
index fe4dd67..445c18c 100644
--- a/project/imx7d-test-inc.mk
+++ b/project/imx7d-test-inc.mk
@@ -16,5 +16,5 @@
include project/imx7d-inc.mk
TRUSTY_ALL_USER_TASKS += \
- sample/ipc-unittest/main \
- sample/ipc-unittest/srv \
+ trusty/user/app/sample/ipc-unittest/main \
+ trusty/user/app/sample/ipc-unittest/srv \
