Update projects for new source tree layout In makefiles, all trusty kernel modules should be referenced as trusty/kernel/XXXX and all trusty apps should be referenced as trusty/user/app/XXXX. Bug: 111521896 Change-Id: Ib27f1245695cbe3911a5742013ad81a007c87d33
diff --git a/project/imx6ul-inc.mk b/project/imx6ul-inc.mk index 26a181b..9629742 100644 --- a/project/imx6ul-inc.mk +++ b/project/imx6ul-inc.mk
@@ -53,9 +53,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 @@ -68,11 +68,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