summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorHaoran.Wang <elven.wang@nxp.com>2018-03-28 02:36:47 +0800
committerJi Luo <ji.luo@nxp.com>2018-08-20 21:25:42 +0800
commit37bc75510a77090231b598adf392fa154bc6ade4 (patch)
treeff085edabc2157e929126855beee54af13902eee /lib
parentfe28fb64829c18ed6006977e4297704990f6589d (diff)
[iot] Refine ql-tipc Makefile to pass build
Refine ql-tipc Makefile to pass the u-boot build which use uboot.mk. Change-Id: I678eebdd8b5e5702a59b20b9580592dbaa78aa90 Signed-off-by: Haoran.Wang <elven.wang@nxp.com>
Diffstat (limited to 'lib')
-rw-r--r--lib/Makefile3
-rw-r--r--lib/trusty/ql-tipc/Makefile (renamed from lib/trusty/ql-tipc/sysdeps/Makefile)6
2 files changed, 4 insertions, 5 deletions
diff --git a/lib/Makefile b/lib/Makefile
index 8529d4f2e1..8038041193 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -18,8 +18,7 @@ obj-$(CONFIG_FIT) += libfdt/
obj-$(CONFIG_OF_LIVE) += of_live.o
obj-$(CONFIG_CMD_DHRYSTONE) += dhry/
obj-$(CONFIG_ARCH_AT91) += at91/
-obj-$(CONFIG_IMX_TRUSTY_OS) += trusty/ql-tipc/sysdeps/
-
+obj-$(CONFIG_IMX_TRUSTY_OS) += trusty/ql-tipc/
obj-$(CONFIG_AES) += aes.o
obj-$(CONFIG_AVB_SUPPORT) += avb/
obj-y += charset.o
diff --git a/lib/trusty/ql-tipc/sysdeps/Makefile b/lib/trusty/ql-tipc/Makefile
index 454510e604..df68cc625f 100644
--- a/lib/trusty/ql-tipc/sysdeps/Makefile
+++ b/lib/trusty/ql-tipc/Makefile
@@ -30,7 +30,7 @@ TRUSTY_DIR = lib/trusty
#ccflags-y += -I$(TRUSTY_DIR)/ql-tipc/include
ccflags-y += -I$(TRUSTY_DIR)/interface/include
-QL_TIPC = ..
+QL_TIPC = .
obj-y += \
$(QL_TIPC)/avb.o \
$(QL_TIPC)/keymaster.o \
@@ -40,8 +40,8 @@ obj-y += \
$(QL_TIPC)/libtipc.o \
$(QL_TIPC)/rpmb_proxy.o \
$(QL_TIPC)/util.o \
- sysdeps_uboot.o \
- storage_ops_uboot.o
+ sysdeps/sysdeps_uboot.o \
+ sysdeps/storage_ops_uboot.o
obj-$(CONFIG_ARM) += \
$(QL_TIPC)/arch/arm/trusty_mem.o \