From 0fb23ea5ea2f7053aca8b55c983ee6fd9228da45 Mon Sep 17 00:00:00 2001 From: Sylvain Pelissier <sylvain.pelissier@gmail.com> Date: Wed, 11 Jan 2017 10:48:53 +0100 Subject: [PATCH] HiKey: remove targets aes-perf and sha-perf aes-perf and sha-perf are replaced by xtest --aes-perf and xtest --sha-perf, respectively. Signed-off-by: Sylvain <sylvain.pelissier@gmail.com> Reviewed-by: Igor Opaniuk <igor.opaniuk@linaro.org> [Update commit message] Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org> Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org> --- hikey.mk | 28 +--------------------------- hikey_debian.mk | 28 +--------------------------- 2 files changed, 2 insertions(+), 54 deletions(-) diff --git a/hikey.mk b/hikey.mk index 6677822..7bae4ba 100644 --- a/hikey.mk +++ b/hikey.mk @@ -53,15 +53,13 @@ NVME_IMG ?=$(ROOT)/out/nvme.img OUT_PATH ?=$(ROOT)/out GRUB_PATH ?=$(ROOT)/grub PATCHES_PATH ?=$(ROOT)/patches_hikey -AESPERF_PATH ?=$(ROOT)/aes-perf -SHAPERF_PATH ?=$(ROOT)/sha-perf ################################################################################ # Targets ################################################################################ all: prepare arm-tf boot-img lloader nvme strace -clean: arm-tf-clean busybox-clean edk2-clean linux-clean optee-os-clean optee-client-clean xtest-clean helloworld-clean strace-clean update_rootfs-clean boot-img-clean lloader-clean aes-perf-clean sha-perf-clean grub-clean +clean: arm-tf-clean busybox-clean edk2-clean linux-clean optee-os-clean optee-client-clean xtest-clean helloworld-clean strace-clean update_rootfs-clean boot-img-clean lloader-clean grub-clean cleaner: clean prepare-cleaner busybox-cleaner linux-cleaner strace-cleaner nvme-cleaner grub-cleaner @@ -221,30 +219,6 @@ helloworld: helloworld-common helloworld-clean: helloworld-clean-common -################################################################################ -# aes-pef -################################################################################ -PERF_FLAGS := CROSS_COMPILE_HOST=$(CROSS_COMPILE_NS_USER) \ - CROSS_COMPILE_TA=$(CROSS_COMPILE_S_USER) \ - TA_DEV_KIT_DIR=$(OPTEE_OS_TA_DEV_KIT_DIR) - -aes-perf: optee-os optee-client - $(MAKE) -C $(AESPERF_PATH) $(PERF_FLAGS) - -.PHONY: aes-perf-clean -aes-perf-clean: - rm -rf $(AESPERF_PATH)/out - -################################################################################ -# sha-perf -################################################################################ -sha-perf: optee-os optee-client - $(MAKE) -C $(SHAPERF_PATH) $(PERF_FLAGS) - -.PHONY: sha-perf-clean -sha-perf-clean: - rm -rf $(SHAPERF_PATH)/out - ################################################################################ # strace ################################################################################ diff --git a/hikey_debian.mk b/hikey_debian.mk index 832e3a0..8ae7eb5 100644 --- a/hikey_debian.mk +++ b/hikey_debian.mk @@ -68,8 +68,6 @@ SYSTEM_IMG ?= $(OUT_PATH)/debian_system.img ROOTFS_PATH ?= $(OUT_PATH)/rootfs LLOADER_PATH ?= $(ROOT)/l-loader PATCHES_PATH ?= $(ROOT)/patches_hikey -AESPERF_PATH ?= $(ROOT)/aes-perf -SHAPERF_PATH ?= $(ROOT)/sha-perf DEBPKG_PATH ?= $(OUT_PATH)/optee_$(OPTEE_PKG_VERSION) DEBPKG_BIN_PATH ?= $(DEBPKG_PATH)/usr/bin DEBPKG_LIB_PATH ?= $(DEBPKG_PATH)/usr/lib/$(MULTIARCH) @@ -81,7 +79,7 @@ DEBPKG_CONTROL_PATH ?= $(DEBPKG_PATH)/DEBIAN ################################################################################ all: prepare arm-tf linux boot-img lloader system-img nvme deb -clean: arm-tf-clean edk2-clean linux-clean optee-os-clean optee-client-clean xtest-clean helloworld-clean boot-img-clean lloader-clean aes-perf-clean sha-perf-clean +clean: arm-tf-clean edk2-clean linux-clean optee-os-clean optee-client-clean xtest-clean helloworld-clean boot-img-clean lloader-clean cleaner: clean prepare-cleaner linux-cleaner nvme-cleaner system-img-cleaner @@ -218,30 +216,6 @@ helloworld: helloworld-common helloworld-clean: helloworld-clean-common -################################################################################ -# aes-pef -################################################################################ -PERF_FLAGS := CROSS_COMPILE_HOST=$(CROSS_COMPILE_NS_USER) \ - CROSS_COMPILE_TA=$(CROSS_COMPILE_S_USER) \ - TA_DEV_KIT_DIR=$(OPTEE_OS_TA_DEV_KIT_DIR) - -aes-perf: optee-os optee-client - $(MAKE) -C -j$(NPROC) $(AESPERF_PATH) $(PERF_FLAGS) - -.PHONY: aes-perf-clean -aes-perf-clean: - rm -rf $(AESPERF_PATH)/out - -################################################################################ -# sha-perf -################################################################################ -sha-perf: optee-os optee-client - $(MAKE) -C -j$(NPROC) $(SHAPERF_PATH) $(PERF_FLAGS) - -.PHONY: sha-perf-clean -sha-perf-clean: - rm -rf $(SHAPERF_PATH)/out - ################################################################################ # Boot Image ################################################################################ -- GitLab