update makefile for test, use ARCH=xxx compile 32 or 64 bit

Change-Id: I2474e7d1adb310d8648b1162d05d5e80518f37e8

7 files changed, 62 insertions, 119 deletions

diff --git a/demos/crypto/Makefile b/demos/crypto/Makefile
index ee9912f..eaea2e7 100644
--- a/demos/crypto/Makefile
+++ b/demos/crypto/Makefile
@@ -1,32 +1,18 @@
 export V?=0
-CA_MODE64 = 64
-CA_MODE32 = 32
 cur_dir=$(CURDIR)
 
-export CA_CROSS_COMPILE_64=aarch64-linux-gnu-
-export CA_CROSS_COMPILE_32=arm-none-linux-gnueabi-
+export ARCH?=arm
+export CROSS_COMPILE?=arm-linux-gnueabihf-
 export TA_CROSS_COMPILE=arm-linux-gnueabihf-
 
 export TDK_DIR=$(cur_dir)/../..
 
-.PHONY: all
-all: ca 
-	#ta
+OUTPUT_DIR_CA = ../out/ca
 
-.PHONY: ca
-ca: tee_crypto_64 tee_crypto_32
-tee_crypto_64:
-	make -C ca CROSS_COMPILE=$(CA_CROSS_COMPILE_64) MODE=$(CA_MODE64)
-	make -C ca clean-objs
-tee_crypto_32:
-	make -C ca CROSS_COMPILE=$(CA_CROSS_COMPILE_32) MODE=$(CA_MODE32)
-	make -C ca clean-objs
-#
-#.PHONY: ta
-#ta:
-#	make -C ta CROSS_COMPILE=$(TA_CROSS_COMPILE)
+.PHONY: all
+all:
+	$(MAKE) -C ca O=$(OUTPUT_DIR_CA)
 
 .PHONY: clean
 clean:
-	make -C ca clean
-#	make -C ta clean
+	$(MAKE) -C ca clean
diff --git a/demos/crypto/ca/Makefile b/demos/crypto/ca/Makefile
index 668ce5a..bc9fe0f 100644
--- a/demos/crypto/ca/Makefile
+++ b/demos/crypto/ca/Makefile
@@ -8,29 +8,30 @@ READELF = $(CROSS_COMPILE)readelf
 
 OBJS = crypto.o
 
-TA_DEV_KIT_DIR=$(TDK_DIR)/ta_export
-
-ifeq ($(MODE), 64)
+ifeq ($(ARCH), arm64)
 TEEC_EXPORT=$(TDK_DIR)/ca_export_arm64
 endif
 
-ifeq ($(MODE), 32)
+ifeq ($(ARCH), arm)
 TEEC_EXPORT=$(TDK_DIR)/ca_export_arm
 endif
 
-CFLAGS += -Wall -I../../optee_test/ta/crypt/include/ -I$(TEEC_EXPORT)/include
+TA_DEV_KIT_DIR=$(TDK_DIR)/ta_export
+CFLAGS += -Wall -I../ta/include -I$(TEEC_EXPORT)/include -I./include
 CFLAGS += -I$(TA_DEV_KIT_DIR)/host_include
+CFLAGS += -I../../optee_test/ta/crypt/include/
+#Add/link other required libraries here
 LDADD += -lteec -L$(TEEC_EXPORT)/lib
 
+BINARY=tee_crypto
+
 .PHONY: all
-all: tee_crypto_$(MODE)
+all: $(BINARY)
 
-tee_crypto_$(MODE): $(OBJS)
-	$(CC) $(LDADD) -o $@ $<
+$(BINARY): $(OBJS)
+	mkdir -p $(O)
+	$(CC) $(LDADD) -o $(O)/$@ $<
 
-.PHONY: clean clean-objs
-clean-objs:
-	rm -f $(OBJS)
+.PHONY: clean
 clean:
-	rm -f tee_crypto_64
-	rm -f tee_crypto_32
+	rm -f $(OBJS) $(BINARY)
diff --git a/demos/crypto_perf/Makefile b/demos/crypto_perf/Makefile
index 7e7e8f0..eaea2e7 100644
--- a/demos/crypto_perf/Makefile
+++ b/demos/crypto_perf/Makefile
@@ -1,32 +1,18 @@
 export V?=0
-CA_MODE64 = 64
-CA_MODE32 = 32
 cur_dir=$(CURDIR)
 
-export CA_CROSS_COMPILE_64=aarch64-linux-gnu-
-export CA_CROSS_COMPILE_32=arm-none-linux-gnueabi-
+export ARCH?=arm
+export CROSS_COMPILE?=arm-linux-gnueabihf-
 export TA_CROSS_COMPILE=arm-linux-gnueabihf-
 
 export TDK_DIR=$(cur_dir)/../..
 
-.PHONY: all
-all: ca
-	#ta
+OUTPUT_DIR_CA = ../out/ca
 
-.PHONY: ca
-ca: tee_cryptotee_crypto_time_64 tee_crypto_time_32
-tee_crypto_time_64:
-	make -C ca CROSS_COMPILE=$(CA_CROSS_COMPILE_64) MODE=$(CA_MODE64)
-	make -C ca clean-objs
-tee_crypto_time_32:
-	make -C ca CROSS_COMPILE=$(CA_CROSS_COMPILE_32) MODE=$(CA_MODE32)
-	make -C ca clean-objs
-#
-#.PHONY: ta
-#ta:
-#	make -C ta CROSS_COMPILE=$(TA_CROSS_COMPILE)
+.PHONY: all
+all:
+	$(MAKE) -C ca O=$(OUTPUT_DIR_CA)
 
 .PHONY: clean
 clean:
-	make -C ca clean
-#	make -C ta clean
+	$(MAKE) -C ca clean
diff --git a/demos/crypto_perf/ca/Makefile b/demos/crypto_perf/ca/Makefile
index 8ff02c5..86f193a 100644
--- a/demos/crypto_perf/ca/Makefile
+++ b/demos/crypto_perf/ca/Makefile
@@ -7,31 +7,31 @@ OBJDUMP = $(CROSS_COMPILE)objdump
 READELF = $(CROSS_COMPILE)readelf
 
 OBJS = crypto_perf.o crypto_cmd.o
-tee_crypto_perf_64:
 
-TA_DEV_KIT_DIR=$(TDK_DIR)/ta_export
-
-ifeq ($(MODE), 64)
+ifeq ($(ARCH), arm64)
 TEEC_EXPORT=$(TDK_DIR)/ca_export_arm64
 endif
 
-ifeq ($(MODE), 32)
+ifeq ($(ARCH), arm)
 TEEC_EXPORT=$(TDK_DIR)/ca_export_arm
 endif
 
-CFLAGS += -Wall -I../../optee_test/ta/crypt/include/ -I$(TEEC_EXPORT)/include
+TA_DEV_KIT_DIR=$(TDK_DIR)/ta_export
+CFLAGS += -Wall -I../ta/include -I$(TEEC_EXPORT)/include -I./include
 CFLAGS += -I$(TA_DEV_KIT_DIR)/host_include
+CFLAGS += -I../../optee_test/ta/crypt/include/
+#Add/link other required libraries here
 LDADD += -lteec -L$(TEEC_EXPORT)/lib
 
+BINARY=tee_crypto_perf
+
 .PHONY: all
-all: tee_crypto_perf_$(MODE)
+all: $(BINARY)
 
-tee_crypto_perf_$(MODE): $(OBJS)
-	$(CC) $(LDADD) -o $@ $<
+$(BINARY): $(OBJS)
+	mkdir -p $(O)
+	$(CC) $(LDADD) -o $(O)/$@ $+
 
-.PHONY: clean clean-objs
-clean-objs:
-	rm -f $(OBJS)
+.PHONY: clean
 clean:
-	rm -f tee_crypto_perf_64
-	rm -f tee_crypto_perf_32
+	rm -f $(OBJS) $(BINARY)
diff --git a/demos/crypto_perf/ca/crypto_perf.c b/demos/crypto_perf/ca/crypto_perf.c
index fe8256d..eb505f2 100644
--- a/demos/crypto_perf/ca/crypto_perf.c
+++ b/demos/crypto_perf/ca/crypto_perf.c
@@ -12,11 +12,11 @@
  * more details.
  *
  */
-#include "crypto_cmd.h"
-#include "crypto_perf.h"
 #include <malloc.h>
 #include <string.h>
 #include <sys/time.h>
+#include "crypto_cmd.h"
+#include "crypto_perf.h"
 #include <ta_crypt.h>
 
 #define MAX_SHARED_MEM_SIZE (256*1024)
@@ -69,7 +69,6 @@ static int32_t crypto_speed_message_digest(uint32_t algo, uint8_t *buf_in,
 					   struct timeval *time_value,
 					   TEEC_Session *session)
 {
-	uint32_t ret_orig, res;
 	uint32_t i = 0;
 	TEE_OperationHandle op;
 	uint8_t digest[64];
@@ -358,8 +357,6 @@ void crypto_speed_hash_digest(TEEC_Session *session)
 	uint8_t *buf_in;
 	TEEC_Result res;
 	struct _hash_speed_tbl *phash_tbl;
-	char *tbl_name = NULL;
-	uint8_t *plaintext;
 
 	phash_tbl = malloc(sizeof(struct _hash_speed_tbl));
 
@@ -481,7 +478,6 @@ static void sym_ciphers(uint32_t algo,
 	TEE_OperationHandle op;
 	TEE_ObjectHandle key1_handle = TEE_HANDLE_NULL;
 	size_t out_size = MAX_SHARED_MEM_SIZE;
-	uint32_t ret_orig;
 	TEE_Attribute key_attr;
 	size_t key_size;
 	uint8_t *plaintext = NULL;
@@ -743,7 +739,6 @@ static void sym_ciphers_data_test(int i, st_cipher_param_type *sym_param,
 				  struct timeval *tval, TEEC_Session *session)
 {
 	uint32_t j;
-	uint32_t k;
 
 	if ((cipher_aes_algo[i] == TEE_ALG_AES_CBC_NOPAD)
 	    || (cipher_aes_algo[i] == TEE_ALG_AES_CTR)) {
@@ -779,19 +774,7 @@ static void sym_ciphers_data_test(int i, st_cipher_param_type *sym_param,
 		printf("mode = 0x%x\n", sym_param->mode);
 		printf("key_type = 0x%x\n", sym_param->key_type);
 		printf("key_len = %d\n", sym_param->key_len);
-#if 0
-		printf("KEY:");
-		for (k = 0; k < sym_param->key_len; k++)
-			printf("%x,", sym_param->key[k]);
-		printf("\n");
-#endif
 		printf("iv_len = %d\n", sym_param->iv_len);
-#if 0
-		printf("IV:");
-		for (k = 0; k < sym_param->iv_len; k++)
-			printf("%x,", sym_param->iv[k]);
-		printf("\n");
-#endif
 		printf("pin_len = %d\n", pin_len);
 		printf("pout_len = %d\n", pout_len);
 #endif
@@ -822,7 +805,7 @@ static void sym_ciphers_data_test(int i, st_cipher_param_type *sym_param,
 
 void sym_ciphers_print(uint32_t mode, uint32_t key_len, TEEC_Session *session)
 {
-	uint32_t i, j;
+	uint32_t i;
 	st_cipher_param_type sym_param = { 0 };
 	struct timeval tval = { 0 };
 
diff --git a/demos/hello_world/Makefile b/demos/hello_world/Makefile
index 1917aa4..15ad3e9 100644
--- a/demos/hello_world/Makefile
+++ b/demos/hello_world/Makefile
@@ -1,10 +1,8 @@
 export V?=0
-CA_MODE64 = 64
-CA_MODE32 = 32
 cur_dir=$(CURDIR)
 
-export CA_CROSS_COMPILE_64=aarch64-linux-gnu-
-export CA_CROSS_COMPILE_32=arm-linux-gnueabihf-
+export ARCH?=arm
+export CROSS_COMPILE?=arm-linux-gnueabihf-
 export TA_CROSS_COMPILE=arm-linux-gnueabihf-
 
 export TDK_DIR=$(cur_dir)/../..
@@ -13,22 +11,11 @@ OUTPUT_DIR_TA = ../out/ta
 OUTPUT_DIR_CA = ../out/ca
 
 .PHONY: all
-all: ca ta
-
-.PHONY: ca
-ca: tee_helloworld64 tee_helloworld32
-tee_helloworld64:
-	make -C ca O=$(OUTPUT_DIR_CA) CROSS_COMPILE=$(CA_CROSS_COMPILE_64) MODE=$(CA_MODE64)
-	make -C ca O=$(OUTPUT_DIR_CA) clean-objs
-tee_helloworld32:
-	make -C ca O=$(OUTPUT_DIR_CA) CROSS_COMPILE=$(CA_CROSS_COMPILE_32) MODE=$(CA_MODE32)
-	make -C ca O=$(OUTPUT_DIR_CA) clean-objs
-
-.PHONY: ta
-ta:
-	make -C ta O=$(OUTPUT_DIR_TA) CROSS_COMPILE=$(TA_CROSS_COMPILE)
+all:
+	$(MAKE) -C ca O=$(OUTPUT_DIR_CA)
+	$(MAKE) -C ta O=$(OUTPUT_DIR_TA) CROSS_COMPILE=$(TA_CROSS_COMPILE)
 
 .PHONY: clean
 clean:
-	make -C ta O=$(OUTPUT_DIR_TA) clean
-	make -C ca O=$(OUTPUT_DIR_CA) clean
+	$(MAKE) -C ca clean
+	$(MAKE) -C ta clean
diff --git a/demos/hello_world/ca/Makefile b/demos/hello_world/ca/Makefile
index 5979a4a..17ff508 100644
--- a/demos/hello_world/ca/Makefile
+++ b/demos/hello_world/ca/Makefile
@@ -8,27 +8,27 @@ READELF = $(CROSS_COMPILE)readelf
 
 OBJS = hello_world.o
 
-ifeq ($(MODE), 64)
+ifeq ($(ARCH), arm64)
 TEEC_EXPORT=$(TDK_DIR)/ca_export_arm64
 endif
 
-ifeq ($(MODE), 32)
+ifeq ($(ARCH), arm)
 TEEC_EXPORT=$(TDK_DIR)/ca_export_arm
 endif
 
-CFLAGS += -Wall -I../ta/include -I$(TEEC_EXPORT)/include
+CFLAGS += -Wall -I../ta/include -I$(TEEC_EXPORT)/include -I./include
+#Add/link other required libraries here
 LDADD += -lteec -L$(TEEC_EXPORT)/lib
 
+BINARY=tee_helloworld
+
 .PHONY: all
-all: tee_helloworld_$(MODE)
+all: $(BINARY)
 
-tee_helloworld_$(MODE): $(OBJS)
+$(BINARY): $(OBJS)
 	mkdir -p $(O)
 	$(CC) $(LDADD) -o $(O)/$@ $<
 
-.PHONY: clean clean-objs
-clean-objs:
-	rm -f $(OBJS)
+.PHONY: clean
 clean:
-	rm -f $(O)/tee_helloworld_64
-	rm -f $(O)/tee_helloworld_32
+	rm -f $(OBJS) $(BINARY)