This is an automated email from the ASF dual-hosted git repository. yuanz pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/incubator-teaclave-trustzone-sdk.git
commit 9e3a61552ec0cc82d3a7af7a2434d7b26ed4697a Author: Yuan Zhuang <[email protected]> AuthorDate: Tue Jul 9 02:50:54 2024 +0000 Unify env variables TA and host reads the TARGET_* and CROSS_COMPILE_* correspondingly, which can be set by `source environment` (recommended), if not set, the Makefile takes default values. --- examples/acipher-rs/Makefile | 8 ++++---- examples/acipher-rs/host/Makefile | 6 +++--- examples/acipher-rs/ta/Makefile | 4 ++-- examples/aes-rs/Makefile | 8 ++++---- examples/aes-rs/host/Makefile | 2 +- examples/aes-rs/ta/Makefile | 4 +++- examples/authentication-rs/Makefile | 8 ++++---- examples/authentication-rs/host/Makefile | 2 +- examples/authentication-rs/ta/Makefile | 4 +++- examples/big_int-rs/Makefile | 8 ++++---- examples/big_int-rs/host/Makefile | 2 +- examples/big_int-rs/ta/Makefile | 4 +++- examples/diffie_hellman-rs/Makefile | 8 ++++---- examples/diffie_hellman-rs/host/Makefile | 2 +- examples/diffie_hellman-rs/ta/Makefile | 4 ++-- examples/digest-rs/Makefile | 8 ++++---- examples/digest-rs/host/Makefile | 2 +- examples/digest-rs/ta/Makefile | 4 ++-- examples/error_handling-rs/Makefile | 8 ++++---- examples/error_handling-rs/host/Makefile | 2 +- examples/error_handling-rs/ta/Makefile | 4 +++- examples/hello_world-rs/Makefile | 8 ++++---- examples/hello_world-rs/host/Makefile | 2 +- examples/hello_world-rs/ta/Makefile | 4 ++-- examples/hotp-rs/Makefile | 8 ++++---- examples/hotp-rs/host/Makefile | 2 +- examples/hotp-rs/ta/Makefile | 4 ++-- examples/random-rs/Makefile | 8 ++++---- examples/random-rs/host/Makefile | 2 +- examples/random-rs/ta/Makefile | 4 ++-- examples/secure_storage-rs/Makefile | 8 ++++---- examples/secure_storage-rs/host/Makefile | 2 +- examples/secure_storage-rs/ta/Makefile | 4 ++-- examples/signature_verification-rs/Makefile | 8 ++++---- examples/signature_verification-rs/host/Makefile | 2 +- examples/signature_verification-rs/ta/Makefile | 4 +++- examples/supp_plugin-rs/host/Makefile | 2 +- examples/supp_plugin-rs/ta/Makefile | 4 ++-- examples/time-rs/Makefile | 8 ++++---- examples/time-rs/host/Makefile | 2 +- examples/time-rs/ta/Makefile | 4 ++-- 41 files changed, 101 insertions(+), 91 deletions(-) diff --git a/examples/acipher-rs/Makefile b/examples/acipher-rs/Makefile index db4e5bb..c99ac26 100644 --- a/examples/acipher-rs/Makefile +++ b/examples/acipher-rs/Makefile @@ -26,10 +26,10 @@ TARGET_HOST ?= $(TARGET) TARGET_TA ?= $(TARGET) all: - $(q)make -C host TARGET=$(TARGET_HOST) \ - CROSS_COMPILE=$(CROSS_COMPILE_HOST) - $(q)make -C ta TARGET=$(TARGET_TA) \ - CROSS_COMPILE=$(CROSS_COMPILE_TA) + $(q)make -C host TARGET_HOST=$(TARGET_HOST) \ + CROSS_COMPILE_HOST=$(CROSS_COMPILE_HOST) + $(q)make -C ta TARGET_TA=$(TARGET_TA) \ + CROSS_COMPILE_TA=$(CROSS_COMPILE_TA) clean: $(q)make -C host clean diff --git a/examples/acipher-rs/host/Makefile b/examples/acipher-rs/host/Makefile index 05bde6a..5c47225 100644 --- a/examples/acipher-rs/host/Makefile +++ b/examples/acipher-rs/host/Makefile @@ -17,10 +17,10 @@ NAME := acipher-rs -TARGET ?= aarch64-unknown-linux-gnu +TARGET_HOST ?= aarch64-unknown-linux-gnu CROSS_COMPILE_HOST ?= aarch64-linux-gnu- OBJCOPY := $(CROSS_COMPILE_HOST)objcopy -LINKER_CFG := target.$(TARGET).linker=\"$(CROSS_COMPILE_HOST)gcc\" +LINKER_CFG := target.$(TARGET_HOST).linker=\"$(CROSS_COMPILE_HOST)gcc\" OUT_DIR := $(CURDIR)/target/$(TARGET_HOST)/release @@ -28,7 +28,7 @@ OUT_DIR := $(CURDIR)/target/$(TARGET_HOST)/release all: host strip host: - @cargo build --target $(TARGET) --release --config $(LINKER_CFG) + @cargo build --target $(TARGET_HOST) --release --config $(LINKER_CFG) strip: host @$(OBJCOPY) --strip-unneeded $(OUT_DIR)/$(NAME) $(OUT_DIR)/$(NAME) diff --git a/examples/acipher-rs/ta/Makefile b/examples/acipher-rs/ta/Makefile index e86893f..1c6a277 100644 --- a/examples/acipher-rs/ta/Makefile +++ b/examples/acipher-rs/ta/Makefile @@ -17,10 +17,10 @@ UUID ?= $(shell cat "../uuid.txt") -TARGET_TA ?= $(TARGET) +TARGET_TA ?= aarch64-unknown-linux-gnu CROSS_COMPILE_TA ?= aarch64-linux-gnu- OBJCOPY := $(CROSS_COMPILE_TA)objcopy -LINKER_CFG := target.$(TARGET).linker=\"$(CROSS_COMPILE_TA)ld.bfd\" +LINKER_CFG := target.$(TARGET_TA).linker=\"$(CROSS_COMPILE_TA)ld.bfd\" TA_SIGN_KEY ?= $(TA_DEV_KIT_DIR)/keys/default_ta.pem SIGN := $(TA_DEV_KIT_DIR)/scripts/sign_encrypt.py diff --git a/examples/aes-rs/Makefile b/examples/aes-rs/Makefile index db4e5bb..c99ac26 100644 --- a/examples/aes-rs/Makefile +++ b/examples/aes-rs/Makefile @@ -26,10 +26,10 @@ TARGET_HOST ?= $(TARGET) TARGET_TA ?= $(TARGET) all: - $(q)make -C host TARGET=$(TARGET_HOST) \ - CROSS_COMPILE=$(CROSS_COMPILE_HOST) - $(q)make -C ta TARGET=$(TARGET_TA) \ - CROSS_COMPILE=$(CROSS_COMPILE_TA) + $(q)make -C host TARGET_HOST=$(TARGET_HOST) \ + CROSS_COMPILE_HOST=$(CROSS_COMPILE_HOST) + $(q)make -C ta TARGET_TA=$(TARGET_TA) \ + CROSS_COMPILE_TA=$(CROSS_COMPILE_TA) clean: $(q)make -C host clean diff --git a/examples/aes-rs/host/Makefile b/examples/aes-rs/host/Makefile index 510b25f..2d69124 100644 --- a/examples/aes-rs/host/Makefile +++ b/examples/aes-rs/host/Makefile @@ -20,7 +20,7 @@ NAME := aes-rs TARGET_HOST ?= aarch64-unknown-linux-gnu CROSS_COMPILE_HOST ?= aarch64-linux-gnu- OBJCOPY := $(CROSS_COMPILE_HOST)objcopy -LINKER_CFG := target.$(TARGET).linker=\"$(CROSS_COMPILE_HOST)gcc\" +LINKER_CFG := target.$(TARGET_HOST).linker=\"$(CROSS_COMPILE_HOST)gcc\" OUT_DIR := $(CURDIR)/target/$(TARGET_HOST)/release diff --git a/examples/aes-rs/ta/Makefile b/examples/aes-rs/ta/Makefile index dff366c..a1c3406 100644 --- a/examples/aes-rs/ta/Makefile +++ b/examples/aes-rs/ta/Makefile @@ -17,9 +17,11 @@ UUID ?= $(shell cat "../uuid.txt") +CROSS_COMPILE_TA ?= aarch64-linux-gnu- +TARGET_TA ?= aarch64-unknown-linux-gnu CROSS_COMPILE_TA ?= aarch64-linux-gnu- OBJCOPY := $(CROSS_COMPILE_TA)objcopy -LINKER_CFG := target.$(TARGET).linker=\"$(CROSS_COMPILE_TA)ld.bfd\" +LINKER_CFG := target.$(TARGET_TA).linker=\"$(CROSS_COMPILE_TA)ld.bfd\" TA_SIGN_KEY ?= $(TA_DEV_KIT_DIR)/keys/default_ta.pem SIGN := $(TA_DEV_KIT_DIR)/scripts/sign_encrypt.py diff --git a/examples/authentication-rs/Makefile b/examples/authentication-rs/Makefile index db4e5bb..c99ac26 100644 --- a/examples/authentication-rs/Makefile +++ b/examples/authentication-rs/Makefile @@ -26,10 +26,10 @@ TARGET_HOST ?= $(TARGET) TARGET_TA ?= $(TARGET) all: - $(q)make -C host TARGET=$(TARGET_HOST) \ - CROSS_COMPILE=$(CROSS_COMPILE_HOST) - $(q)make -C ta TARGET=$(TARGET_TA) \ - CROSS_COMPILE=$(CROSS_COMPILE_TA) + $(q)make -C host TARGET_HOST=$(TARGET_HOST) \ + CROSS_COMPILE_HOST=$(CROSS_COMPILE_HOST) + $(q)make -C ta TARGET_TA=$(TARGET_TA) \ + CROSS_COMPILE_TA=$(CROSS_COMPILE_TA) clean: $(q)make -C host clean diff --git a/examples/authentication-rs/host/Makefile b/examples/authentication-rs/host/Makefile index 387f1b0..ba4e9da 100644 --- a/examples/authentication-rs/host/Makefile +++ b/examples/authentication-rs/host/Makefile @@ -20,7 +20,7 @@ NAME := authentication-rs TARGET_HOST ?= aarch64-unknown-linux-gnu CROSS_COMPILE_HOST ?= aarch64-linux-gnu- OBJCOPY := $(CROSS_COMPILE_HOST)objcopy -LINKER_CFG := target.$(TARGET).linker=\"$(CROSS_COMPILE_HOST)gcc\" +LINKER_CFG := target.$(TARGET_HOST).linker=\"$(CROSS_COMPILE_HOST)gcc\" OUT_DIR := $(CURDIR)/target/$(TARGET_HOST)/release diff --git a/examples/authentication-rs/ta/Makefile b/examples/authentication-rs/ta/Makefile index dff366c..a1c3406 100644 --- a/examples/authentication-rs/ta/Makefile +++ b/examples/authentication-rs/ta/Makefile @@ -17,9 +17,11 @@ UUID ?= $(shell cat "../uuid.txt") +CROSS_COMPILE_TA ?= aarch64-linux-gnu- +TARGET_TA ?= aarch64-unknown-linux-gnu CROSS_COMPILE_TA ?= aarch64-linux-gnu- OBJCOPY := $(CROSS_COMPILE_TA)objcopy -LINKER_CFG := target.$(TARGET).linker=\"$(CROSS_COMPILE_TA)ld.bfd\" +LINKER_CFG := target.$(TARGET_TA).linker=\"$(CROSS_COMPILE_TA)ld.bfd\" TA_SIGN_KEY ?= $(TA_DEV_KIT_DIR)/keys/default_ta.pem SIGN := $(TA_DEV_KIT_DIR)/scripts/sign_encrypt.py diff --git a/examples/big_int-rs/Makefile b/examples/big_int-rs/Makefile index db4e5bb..c99ac26 100644 --- a/examples/big_int-rs/Makefile +++ b/examples/big_int-rs/Makefile @@ -26,10 +26,10 @@ TARGET_HOST ?= $(TARGET) TARGET_TA ?= $(TARGET) all: - $(q)make -C host TARGET=$(TARGET_HOST) \ - CROSS_COMPILE=$(CROSS_COMPILE_HOST) - $(q)make -C ta TARGET=$(TARGET_TA) \ - CROSS_COMPILE=$(CROSS_COMPILE_TA) + $(q)make -C host TARGET_HOST=$(TARGET_HOST) \ + CROSS_COMPILE_HOST=$(CROSS_COMPILE_HOST) + $(q)make -C ta TARGET_TA=$(TARGET_TA) \ + CROSS_COMPILE_TA=$(CROSS_COMPILE_TA) clean: $(q)make -C host clean diff --git a/examples/big_int-rs/host/Makefile b/examples/big_int-rs/host/Makefile index 09ea0e8..8b29964 100644 --- a/examples/big_int-rs/host/Makefile +++ b/examples/big_int-rs/host/Makefile @@ -20,7 +20,7 @@ NAME := big_int-rs TARGET_HOST ?= aarch64-unknown-linux-gnu CROSS_COMPILE_HOST ?= aarch64-linux-gnu- OBJCOPY := $(CROSS_COMPILE_HOST)objcopy -LINKER_CFG := target.$(TARGET).linker=\"$(CROSS_COMPILE_HOST)gcc\" +LINKER_CFG := target.$(TARGET_HOST).linker=\"$(CROSS_COMPILE_HOST)gcc\" OUT_DIR := $(CURDIR)/target/$(TARGET_HOST)/release diff --git a/examples/big_int-rs/ta/Makefile b/examples/big_int-rs/ta/Makefile index dff366c..a1c3406 100644 --- a/examples/big_int-rs/ta/Makefile +++ b/examples/big_int-rs/ta/Makefile @@ -17,9 +17,11 @@ UUID ?= $(shell cat "../uuid.txt") +CROSS_COMPILE_TA ?= aarch64-linux-gnu- +TARGET_TA ?= aarch64-unknown-linux-gnu CROSS_COMPILE_TA ?= aarch64-linux-gnu- OBJCOPY := $(CROSS_COMPILE_TA)objcopy -LINKER_CFG := target.$(TARGET).linker=\"$(CROSS_COMPILE_TA)ld.bfd\" +LINKER_CFG := target.$(TARGET_TA).linker=\"$(CROSS_COMPILE_TA)ld.bfd\" TA_SIGN_KEY ?= $(TA_DEV_KIT_DIR)/keys/default_ta.pem SIGN := $(TA_DEV_KIT_DIR)/scripts/sign_encrypt.py diff --git a/examples/diffie_hellman-rs/Makefile b/examples/diffie_hellman-rs/Makefile index db4e5bb..c99ac26 100644 --- a/examples/diffie_hellman-rs/Makefile +++ b/examples/diffie_hellman-rs/Makefile @@ -26,10 +26,10 @@ TARGET_HOST ?= $(TARGET) TARGET_TA ?= $(TARGET) all: - $(q)make -C host TARGET=$(TARGET_HOST) \ - CROSS_COMPILE=$(CROSS_COMPILE_HOST) - $(q)make -C ta TARGET=$(TARGET_TA) \ - CROSS_COMPILE=$(CROSS_COMPILE_TA) + $(q)make -C host TARGET_HOST=$(TARGET_HOST) \ + CROSS_COMPILE_HOST=$(CROSS_COMPILE_HOST) + $(q)make -C ta TARGET_TA=$(TARGET_TA) \ + CROSS_COMPILE_TA=$(CROSS_COMPILE_TA) clean: $(q)make -C host clean diff --git a/examples/diffie_hellman-rs/host/Makefile b/examples/diffie_hellman-rs/host/Makefile index 4ef55cb..54b7c39 100644 --- a/examples/diffie_hellman-rs/host/Makefile +++ b/examples/diffie_hellman-rs/host/Makefile @@ -20,7 +20,7 @@ NAME := diffie_hellman-rs TARGET_HOST ?= aarch64-unknown-linux-gnu CROSS_COMPILE_HOST ?= aarch64-linux-gnu- OBJCOPY := $(CROSS_COMPILE_HOST)objcopy -LINKER_CFG := target.$(TARGET).linker=\"$(CROSS_COMPILE_HOST)gcc\" +LINKER_CFG := target.$(TARGET_HOST).linker=\"$(CROSS_COMPILE_HOST)gcc\" OUT_DIR := $(CURDIR)/target/$(TARGET_HOST)/release diff --git a/examples/diffie_hellman-rs/ta/Makefile b/examples/diffie_hellman-rs/ta/Makefile index e86893f..1c6a277 100644 --- a/examples/diffie_hellman-rs/ta/Makefile +++ b/examples/diffie_hellman-rs/ta/Makefile @@ -17,10 +17,10 @@ UUID ?= $(shell cat "../uuid.txt") -TARGET_TA ?= $(TARGET) +TARGET_TA ?= aarch64-unknown-linux-gnu CROSS_COMPILE_TA ?= aarch64-linux-gnu- OBJCOPY := $(CROSS_COMPILE_TA)objcopy -LINKER_CFG := target.$(TARGET).linker=\"$(CROSS_COMPILE_TA)ld.bfd\" +LINKER_CFG := target.$(TARGET_TA).linker=\"$(CROSS_COMPILE_TA)ld.bfd\" TA_SIGN_KEY ?= $(TA_DEV_KIT_DIR)/keys/default_ta.pem SIGN := $(TA_DEV_KIT_DIR)/scripts/sign_encrypt.py diff --git a/examples/digest-rs/Makefile b/examples/digest-rs/Makefile index db4e5bb..c99ac26 100644 --- a/examples/digest-rs/Makefile +++ b/examples/digest-rs/Makefile @@ -26,10 +26,10 @@ TARGET_HOST ?= $(TARGET) TARGET_TA ?= $(TARGET) all: - $(q)make -C host TARGET=$(TARGET_HOST) \ - CROSS_COMPILE=$(CROSS_COMPILE_HOST) - $(q)make -C ta TARGET=$(TARGET_TA) \ - CROSS_COMPILE=$(CROSS_COMPILE_TA) + $(q)make -C host TARGET_HOST=$(TARGET_HOST) \ + CROSS_COMPILE_HOST=$(CROSS_COMPILE_HOST) + $(q)make -C ta TARGET_TA=$(TARGET_TA) \ + CROSS_COMPILE_TA=$(CROSS_COMPILE_TA) clean: $(q)make -C host clean diff --git a/examples/digest-rs/host/Makefile b/examples/digest-rs/host/Makefile index 2255b2b..2133e3c 100644 --- a/examples/digest-rs/host/Makefile +++ b/examples/digest-rs/host/Makefile @@ -20,7 +20,7 @@ NAME := digest-rs TARGET_HOST ?= aarch64-unknown-linux-gnu CROSS_COMPILE_HOST ?= aarch64-linux-gnu- OBJCOPY := $(CROSS_COMPILE_HOST)objcopy -LINKER_CFG := target.$(TARGET).linker=\"$(CROSS_COMPILE_HOST)gcc\" +LINKER_CFG := target.$(TARGET_HOST).linker=\"$(CROSS_COMPILE_HOST)gcc\" OUT_DIR := $(CURDIR)/target/$(TARGET_HOST)/release diff --git a/examples/digest-rs/ta/Makefile b/examples/digest-rs/ta/Makefile index e86893f..1c6a277 100644 --- a/examples/digest-rs/ta/Makefile +++ b/examples/digest-rs/ta/Makefile @@ -17,10 +17,10 @@ UUID ?= $(shell cat "../uuid.txt") -TARGET_TA ?= $(TARGET) +TARGET_TA ?= aarch64-unknown-linux-gnu CROSS_COMPILE_TA ?= aarch64-linux-gnu- OBJCOPY := $(CROSS_COMPILE_TA)objcopy -LINKER_CFG := target.$(TARGET).linker=\"$(CROSS_COMPILE_TA)ld.bfd\" +LINKER_CFG := target.$(TARGET_TA).linker=\"$(CROSS_COMPILE_TA)ld.bfd\" TA_SIGN_KEY ?= $(TA_DEV_KIT_DIR)/keys/default_ta.pem SIGN := $(TA_DEV_KIT_DIR)/scripts/sign_encrypt.py diff --git a/examples/error_handling-rs/Makefile b/examples/error_handling-rs/Makefile index db4e5bb..c99ac26 100644 --- a/examples/error_handling-rs/Makefile +++ b/examples/error_handling-rs/Makefile @@ -26,10 +26,10 @@ TARGET_HOST ?= $(TARGET) TARGET_TA ?= $(TARGET) all: - $(q)make -C host TARGET=$(TARGET_HOST) \ - CROSS_COMPILE=$(CROSS_COMPILE_HOST) - $(q)make -C ta TARGET=$(TARGET_TA) \ - CROSS_COMPILE=$(CROSS_COMPILE_TA) + $(q)make -C host TARGET_HOST=$(TARGET_HOST) \ + CROSS_COMPILE_HOST=$(CROSS_COMPILE_HOST) + $(q)make -C ta TARGET_TA=$(TARGET_TA) \ + CROSS_COMPILE_TA=$(CROSS_COMPILE_TA) clean: $(q)make -C host clean diff --git a/examples/error_handling-rs/host/Makefile b/examples/error_handling-rs/host/Makefile index d8e9285..0a24cda 100644 --- a/examples/error_handling-rs/host/Makefile +++ b/examples/error_handling-rs/host/Makefile @@ -20,7 +20,7 @@ NAME := error_handling-rs TARGET_HOST ?= aarch64-unknown-linux-gnu CROSS_COMPILE_HOST ?= aarch64-linux-gnu- OBJCOPY := $(CROSS_COMPILE_HOST)objcopy -LINKER_CFG := target.$(TARGET).linker=\"$(CROSS_COMPILE_HOST)gcc\" +LINKER_CFG := target.$(TARGET_HOST).linker=\"$(CROSS_COMPILE_HOST)gcc\" OUT_DIR := $(CURDIR)/target/$(TARGET_HOST)/release diff --git a/examples/error_handling-rs/ta/Makefile b/examples/error_handling-rs/ta/Makefile index dff366c..a1c3406 100644 --- a/examples/error_handling-rs/ta/Makefile +++ b/examples/error_handling-rs/ta/Makefile @@ -17,9 +17,11 @@ UUID ?= $(shell cat "../uuid.txt") +CROSS_COMPILE_TA ?= aarch64-linux-gnu- +TARGET_TA ?= aarch64-unknown-linux-gnu CROSS_COMPILE_TA ?= aarch64-linux-gnu- OBJCOPY := $(CROSS_COMPILE_TA)objcopy -LINKER_CFG := target.$(TARGET).linker=\"$(CROSS_COMPILE_TA)ld.bfd\" +LINKER_CFG := target.$(TARGET_TA).linker=\"$(CROSS_COMPILE_TA)ld.bfd\" TA_SIGN_KEY ?= $(TA_DEV_KIT_DIR)/keys/default_ta.pem SIGN := $(TA_DEV_KIT_DIR)/scripts/sign_encrypt.py diff --git a/examples/hello_world-rs/Makefile b/examples/hello_world-rs/Makefile index db4e5bb..c99ac26 100644 --- a/examples/hello_world-rs/Makefile +++ b/examples/hello_world-rs/Makefile @@ -26,10 +26,10 @@ TARGET_HOST ?= $(TARGET) TARGET_TA ?= $(TARGET) all: - $(q)make -C host TARGET=$(TARGET_HOST) \ - CROSS_COMPILE=$(CROSS_COMPILE_HOST) - $(q)make -C ta TARGET=$(TARGET_TA) \ - CROSS_COMPILE=$(CROSS_COMPILE_TA) + $(q)make -C host TARGET_HOST=$(TARGET_HOST) \ + CROSS_COMPILE_HOST=$(CROSS_COMPILE_HOST) + $(q)make -C ta TARGET_TA=$(TARGET_TA) \ + CROSS_COMPILE_TA=$(CROSS_COMPILE_TA) clean: $(q)make -C host clean diff --git a/examples/hello_world-rs/host/Makefile b/examples/hello_world-rs/host/Makefile index ba1f573..1579bb7 100644 --- a/examples/hello_world-rs/host/Makefile +++ b/examples/hello_world-rs/host/Makefile @@ -20,7 +20,7 @@ NAME := hello_world-rs TARGET_HOST ?= aarch64-unknown-linux-gnu CROSS_COMPILE_HOST ?= aarch64-linux-gnu- OBJCOPY := $(CROSS_COMPILE_HOST)objcopy -LINKER_CFG := target.$(TARGET).linker=\"$(CROSS_COMPILE_HOST)gcc\" +LINKER_CFG := target.$(TARGET_HOST).linker=\"$(CROSS_COMPILE_HOST)gcc\" OUT_DIR := $(CURDIR)/target/$(TARGET_HOST)/release diff --git a/examples/hello_world-rs/ta/Makefile b/examples/hello_world-rs/ta/Makefile index e86893f..1c6a277 100644 --- a/examples/hello_world-rs/ta/Makefile +++ b/examples/hello_world-rs/ta/Makefile @@ -17,10 +17,10 @@ UUID ?= $(shell cat "../uuid.txt") -TARGET_TA ?= $(TARGET) +TARGET_TA ?= aarch64-unknown-linux-gnu CROSS_COMPILE_TA ?= aarch64-linux-gnu- OBJCOPY := $(CROSS_COMPILE_TA)objcopy -LINKER_CFG := target.$(TARGET).linker=\"$(CROSS_COMPILE_TA)ld.bfd\" +LINKER_CFG := target.$(TARGET_TA).linker=\"$(CROSS_COMPILE_TA)ld.bfd\" TA_SIGN_KEY ?= $(TA_DEV_KIT_DIR)/keys/default_ta.pem SIGN := $(TA_DEV_KIT_DIR)/scripts/sign_encrypt.py diff --git a/examples/hotp-rs/Makefile b/examples/hotp-rs/Makefile index db4e5bb..c99ac26 100644 --- a/examples/hotp-rs/Makefile +++ b/examples/hotp-rs/Makefile @@ -26,10 +26,10 @@ TARGET_HOST ?= $(TARGET) TARGET_TA ?= $(TARGET) all: - $(q)make -C host TARGET=$(TARGET_HOST) \ - CROSS_COMPILE=$(CROSS_COMPILE_HOST) - $(q)make -C ta TARGET=$(TARGET_TA) \ - CROSS_COMPILE=$(CROSS_COMPILE_TA) + $(q)make -C host TARGET_HOST=$(TARGET_HOST) \ + CROSS_COMPILE_HOST=$(CROSS_COMPILE_HOST) + $(q)make -C ta TARGET_TA=$(TARGET_TA) \ + CROSS_COMPILE_TA=$(CROSS_COMPILE_TA) clean: $(q)make -C host clean diff --git a/examples/hotp-rs/host/Makefile b/examples/hotp-rs/host/Makefile index b4646f1..5c38d4d 100644 --- a/examples/hotp-rs/host/Makefile +++ b/examples/hotp-rs/host/Makefile @@ -20,7 +20,7 @@ NAME := hotp-rs TARGET_HOST ?= aarch64-unknown-linux-gnu CROSS_COMPILE_HOST ?= aarch64-linux-gnu- OBJCOPY := $(CROSS_COMPILE_HOST)objcopy -LINKER_CFG := target.$(TARGET).linker=\"$(CROSS_COMPILE_HOST)gcc\" +LINKER_CFG := target.$(TARGET_HOST).linker=\"$(CROSS_COMPILE_HOST)gcc\" OUT_DIR := $(CURDIR)/target/$(TARGET_HOST)/release diff --git a/examples/hotp-rs/ta/Makefile b/examples/hotp-rs/ta/Makefile index e86893f..1c6a277 100644 --- a/examples/hotp-rs/ta/Makefile +++ b/examples/hotp-rs/ta/Makefile @@ -17,10 +17,10 @@ UUID ?= $(shell cat "../uuid.txt") -TARGET_TA ?= $(TARGET) +TARGET_TA ?= aarch64-unknown-linux-gnu CROSS_COMPILE_TA ?= aarch64-linux-gnu- OBJCOPY := $(CROSS_COMPILE_TA)objcopy -LINKER_CFG := target.$(TARGET).linker=\"$(CROSS_COMPILE_TA)ld.bfd\" +LINKER_CFG := target.$(TARGET_TA).linker=\"$(CROSS_COMPILE_TA)ld.bfd\" TA_SIGN_KEY ?= $(TA_DEV_KIT_DIR)/keys/default_ta.pem SIGN := $(TA_DEV_KIT_DIR)/scripts/sign_encrypt.py diff --git a/examples/random-rs/Makefile b/examples/random-rs/Makefile index db4e5bb..c99ac26 100644 --- a/examples/random-rs/Makefile +++ b/examples/random-rs/Makefile @@ -26,10 +26,10 @@ TARGET_HOST ?= $(TARGET) TARGET_TA ?= $(TARGET) all: - $(q)make -C host TARGET=$(TARGET_HOST) \ - CROSS_COMPILE=$(CROSS_COMPILE_HOST) - $(q)make -C ta TARGET=$(TARGET_TA) \ - CROSS_COMPILE=$(CROSS_COMPILE_TA) + $(q)make -C host TARGET_HOST=$(TARGET_HOST) \ + CROSS_COMPILE_HOST=$(CROSS_COMPILE_HOST) + $(q)make -C ta TARGET_TA=$(TARGET_TA) \ + CROSS_COMPILE_TA=$(CROSS_COMPILE_TA) clean: $(q)make -C host clean diff --git a/examples/random-rs/host/Makefile b/examples/random-rs/host/Makefile index 132dc8e..50176bb 100644 --- a/examples/random-rs/host/Makefile +++ b/examples/random-rs/host/Makefile @@ -20,7 +20,7 @@ NAME := random-rs TARGET_HOST ?= aarch64-unknown-linux-gnu CROSS_COMPILE_HOST ?= aarch64-linux-gnu- OBJCOPY := $(CROSS_COMPILE_HOST)objcopy -LINKER_CFG := target.$(TARGET).linker=\"$(CROSS_COMPILE_HOST)gcc\" +LINKER_CFG := target.$(TARGET_HOST).linker=\"$(CROSS_COMPILE_HOST)gcc\" OUT_DIR := $(CURDIR)/target/$(TARGET_HOST)/release diff --git a/examples/random-rs/ta/Makefile b/examples/random-rs/ta/Makefile index e86893f..1c6a277 100644 --- a/examples/random-rs/ta/Makefile +++ b/examples/random-rs/ta/Makefile @@ -17,10 +17,10 @@ UUID ?= $(shell cat "../uuid.txt") -TARGET_TA ?= $(TARGET) +TARGET_TA ?= aarch64-unknown-linux-gnu CROSS_COMPILE_TA ?= aarch64-linux-gnu- OBJCOPY := $(CROSS_COMPILE_TA)objcopy -LINKER_CFG := target.$(TARGET).linker=\"$(CROSS_COMPILE_TA)ld.bfd\" +LINKER_CFG := target.$(TARGET_TA).linker=\"$(CROSS_COMPILE_TA)ld.bfd\" TA_SIGN_KEY ?= $(TA_DEV_KIT_DIR)/keys/default_ta.pem SIGN := $(TA_DEV_KIT_DIR)/scripts/sign_encrypt.py diff --git a/examples/secure_storage-rs/Makefile b/examples/secure_storage-rs/Makefile index db4e5bb..c99ac26 100644 --- a/examples/secure_storage-rs/Makefile +++ b/examples/secure_storage-rs/Makefile @@ -26,10 +26,10 @@ TARGET_HOST ?= $(TARGET) TARGET_TA ?= $(TARGET) all: - $(q)make -C host TARGET=$(TARGET_HOST) \ - CROSS_COMPILE=$(CROSS_COMPILE_HOST) - $(q)make -C ta TARGET=$(TARGET_TA) \ - CROSS_COMPILE=$(CROSS_COMPILE_TA) + $(q)make -C host TARGET_HOST=$(TARGET_HOST) \ + CROSS_COMPILE_HOST=$(CROSS_COMPILE_HOST) + $(q)make -C ta TARGET_TA=$(TARGET_TA) \ + CROSS_COMPILE_TA=$(CROSS_COMPILE_TA) clean: $(q)make -C host clean diff --git a/examples/secure_storage-rs/host/Makefile b/examples/secure_storage-rs/host/Makefile index e20763f..40dadad 100644 --- a/examples/secure_storage-rs/host/Makefile +++ b/examples/secure_storage-rs/host/Makefile @@ -20,7 +20,7 @@ NAME := secure_storage-rs TARGET_HOST ?= aarch64-unknown-linux-gnu CROSS_COMPILE_HOST ?= aarch64-linux-gnu- OBJCOPY := $(CROSS_COMPILE_HOST)objcopy -LINKER_CFG := target.$(TARGET).linker=\"$(CROSS_COMPILE_HOST)gcc\" +LINKER_CFG := target.$(TARGET_HOST).linker=\"$(CROSS_COMPILE_HOST)gcc\" OUT_DIR := $(CURDIR)/target/$(TARGET_HOST)/release diff --git a/examples/secure_storage-rs/ta/Makefile b/examples/secure_storage-rs/ta/Makefile index e86893f..1c6a277 100644 --- a/examples/secure_storage-rs/ta/Makefile +++ b/examples/secure_storage-rs/ta/Makefile @@ -17,10 +17,10 @@ UUID ?= $(shell cat "../uuid.txt") -TARGET_TA ?= $(TARGET) +TARGET_TA ?= aarch64-unknown-linux-gnu CROSS_COMPILE_TA ?= aarch64-linux-gnu- OBJCOPY := $(CROSS_COMPILE_TA)objcopy -LINKER_CFG := target.$(TARGET).linker=\"$(CROSS_COMPILE_TA)ld.bfd\" +LINKER_CFG := target.$(TARGET_TA).linker=\"$(CROSS_COMPILE_TA)ld.bfd\" TA_SIGN_KEY ?= $(TA_DEV_KIT_DIR)/keys/default_ta.pem SIGN := $(TA_DEV_KIT_DIR)/scripts/sign_encrypt.py diff --git a/examples/signature_verification-rs/Makefile b/examples/signature_verification-rs/Makefile index db4e5bb..c99ac26 100644 --- a/examples/signature_verification-rs/Makefile +++ b/examples/signature_verification-rs/Makefile @@ -26,10 +26,10 @@ TARGET_HOST ?= $(TARGET) TARGET_TA ?= $(TARGET) all: - $(q)make -C host TARGET=$(TARGET_HOST) \ - CROSS_COMPILE=$(CROSS_COMPILE_HOST) - $(q)make -C ta TARGET=$(TARGET_TA) \ - CROSS_COMPILE=$(CROSS_COMPILE_TA) + $(q)make -C host TARGET_HOST=$(TARGET_HOST) \ + CROSS_COMPILE_HOST=$(CROSS_COMPILE_HOST) + $(q)make -C ta TARGET_TA=$(TARGET_TA) \ + CROSS_COMPILE_TA=$(CROSS_COMPILE_TA) clean: $(q)make -C host clean diff --git a/examples/signature_verification-rs/host/Makefile b/examples/signature_verification-rs/host/Makefile index d49e8a2..ef5203c 100644 --- a/examples/signature_verification-rs/host/Makefile +++ b/examples/signature_verification-rs/host/Makefile @@ -20,7 +20,7 @@ NAME := signature_verification-rs TARGET_HOST ?= aarch64-unknown-linux-gnu CROSS_COMPILE_HOST ?= aarch64-linux-gnu- OBJCOPY := $(CROSS_COMPILE_HOST)objcopy -LINKER_CFG := target.$(TARGET).linker=\"$(CROSS_COMPILE_HOST)gcc\" +LINKER_CFG := target.$(TARGET_HOST).linker=\"$(CROSS_COMPILE_HOST)gcc\" OUT_DIR := $(CURDIR)/target/$(TARGET_HOST)/release diff --git a/examples/signature_verification-rs/ta/Makefile b/examples/signature_verification-rs/ta/Makefile index dff366c..a1c3406 100644 --- a/examples/signature_verification-rs/ta/Makefile +++ b/examples/signature_verification-rs/ta/Makefile @@ -17,9 +17,11 @@ UUID ?= $(shell cat "../uuid.txt") +CROSS_COMPILE_TA ?= aarch64-linux-gnu- +TARGET_TA ?= aarch64-unknown-linux-gnu CROSS_COMPILE_TA ?= aarch64-linux-gnu- OBJCOPY := $(CROSS_COMPILE_TA)objcopy -LINKER_CFG := target.$(TARGET).linker=\"$(CROSS_COMPILE_TA)ld.bfd\" +LINKER_CFG := target.$(TARGET_TA).linker=\"$(CROSS_COMPILE_TA)ld.bfd\" TA_SIGN_KEY ?= $(TA_DEV_KIT_DIR)/keys/default_ta.pem SIGN := $(TA_DEV_KIT_DIR)/scripts/sign_encrypt.py diff --git a/examples/supp_plugin-rs/host/Makefile b/examples/supp_plugin-rs/host/Makefile index a587762..7043659 100644 --- a/examples/supp_plugin-rs/host/Makefile +++ b/examples/supp_plugin-rs/host/Makefile @@ -20,7 +20,7 @@ NAME := supp_plugin-rs TARGET_HOST ?= aarch64-unknown-linux-gnu CROSS_COMPILE_HOST ?= aarch64-linux-gnu- OBJCOPY := $(CROSS_COMPILE_HOST)objcopy -LINKER_CFG := target.$(TARGET).linker=\"$(CROSS_COMPILE_HOST)gcc\" +LINKER_CFG := target.$(TARGET_HOST).linker=\"$(CROSS_COMPILE_HOST)gcc\" OUT_DIR := $(CURDIR)/target/$(TARGET_HOST)/release diff --git a/examples/supp_plugin-rs/ta/Makefile b/examples/supp_plugin-rs/ta/Makefile index 57edb95..92b3fa7 100644 --- a/examples/supp_plugin-rs/ta/Makefile +++ b/examples/supp_plugin-rs/ta/Makefile @@ -17,10 +17,10 @@ UUID ?= $(shell cat "../ta_uuid.txt") -TARGET_TA ?= $(TARGET) +TARGET_TA ?= aarch64-unknown-linux-gnu CROSS_COMPILE_TA ?= aarch64-linux-gnu- OBJCOPY := $(CROSS_COMPILE_TA)objcopy -LINKER_CFG := target.$(TARGET).linker=\"$(CROSS_COMPILE_TA)ld.bfd\" +LINKER_CFG := target.$(TARGET_TA).linker=\"$(CROSS_COMPILE_TA)ld.bfd\" TA_SIGN_KEY ?= $(TA_DEV_KIT_DIR)/keys/default_ta.pem SIGN := $(TA_DEV_KIT_DIR)/scripts/sign_encrypt.py diff --git a/examples/time-rs/Makefile b/examples/time-rs/Makefile index db4e5bb..c99ac26 100644 --- a/examples/time-rs/Makefile +++ b/examples/time-rs/Makefile @@ -26,10 +26,10 @@ TARGET_HOST ?= $(TARGET) TARGET_TA ?= $(TARGET) all: - $(q)make -C host TARGET=$(TARGET_HOST) \ - CROSS_COMPILE=$(CROSS_COMPILE_HOST) - $(q)make -C ta TARGET=$(TARGET_TA) \ - CROSS_COMPILE=$(CROSS_COMPILE_TA) + $(q)make -C host TARGET_HOST=$(TARGET_HOST) \ + CROSS_COMPILE_HOST=$(CROSS_COMPILE_HOST) + $(q)make -C ta TARGET_TA=$(TARGET_TA) \ + CROSS_COMPILE_TA=$(CROSS_COMPILE_TA) clean: $(q)make -C host clean diff --git a/examples/time-rs/host/Makefile b/examples/time-rs/host/Makefile index 9d98a2e..1b91df8 100644 --- a/examples/time-rs/host/Makefile +++ b/examples/time-rs/host/Makefile @@ -20,7 +20,7 @@ NAME := time-rs TARGET_HOST ?= aarch64-unknown-linux-gnu CROSS_COMPILE_HOST ?= aarch64-linux-gnu- OBJCOPY := $(CROSS_COMPILE_HOST)objcopy -LINKER_CFG := target.$(TARGET).linker=\"$(CROSS_COMPILE_HOST)gcc\" +LINKER_CFG := target.$(TARGET_HOST).linker=\"$(CROSS_COMPILE_HOST)gcc\" OUT_DIR := $(CURDIR)/target/$(TARGET_HOST)/release diff --git a/examples/time-rs/ta/Makefile b/examples/time-rs/ta/Makefile index e86893f..1c6a277 100644 --- a/examples/time-rs/ta/Makefile +++ b/examples/time-rs/ta/Makefile @@ -17,10 +17,10 @@ UUID ?= $(shell cat "../uuid.txt") -TARGET_TA ?= $(TARGET) +TARGET_TA ?= aarch64-unknown-linux-gnu CROSS_COMPILE_TA ?= aarch64-linux-gnu- OBJCOPY := $(CROSS_COMPILE_TA)objcopy -LINKER_CFG := target.$(TARGET).linker=\"$(CROSS_COMPILE_TA)ld.bfd\" +LINKER_CFG := target.$(TARGET_TA).linker=\"$(CROSS_COMPILE_TA)ld.bfd\" TA_SIGN_KEY ?= $(TA_DEV_KIT_DIR)/keys/default_ta.pem SIGN := $(TA_DEV_KIT_DIR)/scripts/sign_encrypt.py --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
