Commit 37bc75510a77090231b598adf392fa154bc6ade4
Committed by
Ji Luo
Ji Luo
1 parent
fe28fb6482
Exists in
smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga
and in
5 other branches
[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>
Showing 3 changed files with 49 additions and 50 deletions Side-by-side Diff
lib/Makefile
| ... | ... | @@ -18,8 +18,7 @@ |
| 18 | 18 | obj-$(CONFIG_OF_LIVE) += of_live.o |
| 19 | 19 | obj-$(CONFIG_CMD_DHRYSTONE) += dhry/ |
| 20 | 20 | obj-$(CONFIG_ARCH_AT91) += at91/ |
| 21 | -obj-$(CONFIG_IMX_TRUSTY_OS) += trusty/ql-tipc/sysdeps/ | |
| 22 | - | |
| 21 | +obj-$(CONFIG_IMX_TRUSTY_OS) += trusty/ql-tipc/ | |
| 23 | 22 | obj-$(CONFIG_AES) += aes.o |
| 24 | 23 | obj-$(CONFIG_AVB_SUPPORT) += avb/ |
| 25 | 24 | obj-y += charset.o |
lib/trusty/ql-tipc/Makefile
| 1 | +# | |
| 2 | +# Copyright (C) 2016 The Android Open Source Project | |
| 3 | +# | |
| 4 | +# Permission is hereby granted, free of charge, to any person | |
| 5 | +# obtaining a copy of this software and associated documentation | |
| 6 | +# files (the "Software"), to deal in the Software without | |
| 7 | +# restriction, including without limitation the rights to use, copy, | |
| 8 | +# modify, merge, publish, distribute, sublicense, and/or sell copies | |
| 9 | +# of the Software, and to permit persons to whom the Software is | |
| 10 | +# furnished to do so, subject to the following conditions: | |
| 11 | +# | |
| 12 | +# The above copyright notice and this permission notice shall be | |
| 13 | +# included in all copies or substantial portions of the Software. | |
| 14 | +# | |
| 15 | +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | |
| 16 | +# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF | |
| 17 | +# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | |
| 18 | +# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS | |
| 19 | +# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN | |
| 20 | +# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN | |
| 21 | +# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | |
| 22 | +# SOFTWARE. | |
| 23 | +# | |
| 24 | + | |
| 25 | +# Sample Makefile for U-boot | |
| 26 | + | |
| 27 | +#ccflags-y += -DTIPC_ENABLE_DEBUG | |
| 28 | + | |
| 29 | +TRUSTY_DIR = lib/trusty | |
| 30 | +#ccflags-y += -I$(TRUSTY_DIR)/ql-tipc/include | |
| 31 | +ccflags-y += -I$(TRUSTY_DIR)/interface/include | |
| 32 | + | |
| 33 | +QL_TIPC = . | |
| 34 | +obj-y += \ | |
| 35 | + $(QL_TIPC)/avb.o \ | |
| 36 | + $(QL_TIPC)/keymaster.o \ | |
| 37 | + $(QL_TIPC)/keymaster_serializable.o \ | |
| 38 | + $(QL_TIPC)/ipc.o \ | |
| 39 | + $(QL_TIPC)/ipc_dev.o \ | |
| 40 | + $(QL_TIPC)/libtipc.o \ | |
| 41 | + $(QL_TIPC)/rpmb_proxy.o \ | |
| 42 | + $(QL_TIPC)/util.o \ | |
| 43 | + sysdeps/sysdeps_uboot.o \ | |
| 44 | + sysdeps/storage_ops_uboot.o | |
| 45 | + | |
| 46 | +obj-$(CONFIG_ARM) += \ | |
| 47 | + $(QL_TIPC)/arch/arm/trusty_mem.o \ | |
| 48 | + $(QL_TIPC)/arch/arm/trusty_dev.o |
lib/trusty/ql-tipc/sysdeps/Makefile
| 1 | -# | |
| 2 | -# Copyright (C) 2016 The Android Open Source Project | |
| 3 | -# | |
| 4 | -# Permission is hereby granted, free of charge, to any person | |
| 5 | -# obtaining a copy of this software and associated documentation | |
| 6 | -# files (the "Software"), to deal in the Software without | |
| 7 | -# restriction, including without limitation the rights to use, copy, | |
| 8 | -# modify, merge, publish, distribute, sublicense, and/or sell copies | |
| 9 | -# of the Software, and to permit persons to whom the Software is | |
| 10 | -# furnished to do so, subject to the following conditions: | |
| 11 | -# | |
| 12 | -# The above copyright notice and this permission notice shall be | |
| 13 | -# included in all copies or substantial portions of the Software. | |
| 14 | -# | |
| 15 | -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | |
| 16 | -# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF | |
| 17 | -# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | |
| 18 | -# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS | |
| 19 | -# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN | |
| 20 | -# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN | |
| 21 | -# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | |
| 22 | -# SOFTWARE. | |
| 23 | -# | |
| 24 | - | |
| 25 | -# Sample Makefile for U-boot | |
| 26 | - | |
| 27 | -#ccflags-y += -DTIPC_ENABLE_DEBUG | |
| 28 | - | |
| 29 | -TRUSTY_DIR = lib/trusty | |
| 30 | -#ccflags-y += -I$(TRUSTY_DIR)/ql-tipc/include | |
| 31 | -ccflags-y += -I$(TRUSTY_DIR)/interface/include | |
| 32 | - | |
| 33 | -QL_TIPC = .. | |
| 34 | -obj-y += \ | |
| 35 | - $(QL_TIPC)/avb.o \ | |
| 36 | - $(QL_TIPC)/keymaster.o \ | |
| 37 | - $(QL_TIPC)/keymaster_serializable.o \ | |
| 38 | - $(QL_TIPC)/ipc.o \ | |
| 39 | - $(QL_TIPC)/ipc_dev.o \ | |
| 40 | - $(QL_TIPC)/libtipc.o \ | |
| 41 | - $(QL_TIPC)/rpmb_proxy.o \ | |
| 42 | - $(QL_TIPC)/util.o \ | |
| 43 | - sysdeps_uboot.o \ | |
| 44 | - storage_ops_uboot.o | |
| 45 | - | |
| 46 | -obj-$(CONFIG_ARM) += \ | |
| 47 | - $(QL_TIPC)/arch/arm/trusty_mem.o \ | |
| 48 | - $(QL_TIPC)/arch/arm/trusty_dev.o |