diff options
| author | Michael Ryleev <gmar@google.com> | 2018-07-27 09:26:32 -0700 |
|---|---|---|
| committer | Michael Ryleev <gmar@google.com> | 2018-07-27 09:26:32 -0700 |
| commit | 650fcfa9119b55820c74a1fa81316f5836e50b80 (patch) | |
| tree | e2f04b4f0ee851341a3a331f370792c5ae5d5af7 | |
| parent | 67fc62390fa2d9bd6605afc0fb64035e59894519 (diff) | |
| download | imx7d-650fcfa9119b55820c74a1fa81316f5836e50b80.tar.gz | |
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: Ic54b88d90d57fb3ccf1b1ffd675cc863f2fa9238
| -rw-r--r-- | project/imx7d-inc.mk | 16 | ||||
| -rw-r--r-- | project/imx7d-test-inc.mk | 4 |
2 files changed, 10 insertions, 10 deletions
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 @@ GLOBAL_DEFINES += \ # 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 @@ TRUSTY_PREBUILT_USER_TASKS := # 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 \ |