benchmark: drop support for benchmark framework
Drop Benchmark Framework as current implementation is
non-function and obsolete, and it's not supported anymore.
Acked-by: Jens Wiklander <jens.wiklander@linaro.org>
Acked-by: Etienne Carriere <etienne.carriere@foss.st.com>
Signed-off-by: Igor Opaniuk <igor.opaniuk@foundries.io>
diff --git a/br-ext/Config.in b/br-ext/Config.in
index 4f41742..a1b2d89 100644
--- a/br-ext/Config.in
+++ b/br-ext/Config.in
@@ -3,7 +3,6 @@
source "$BR2_EXTERNAL_OPTEE_PATH/package/optee_test_ext/Config.in"
source "$BR2_EXTERNAL_OPTEE_PATH/package/optee_examples_ext/Config.in"
source "$BR2_EXTERNAL_OPTEE_PATH/package/optee_rust_examples_ext/Config.in"
-source "$BR2_EXTERNAL_OPTEE_PATH/package/optee_benchmark_ext/Config.in"
source "$BR2_EXTERNAL_OPTEE_PATH/package/ftpm_optee_ext/Config.in"
source "$BR2_EXTERNAL_OPTEE_PATH/package/linux_ftpm_mod_ext/Config.in"
source "$BR2_EXTERNAL_OPTEE_PATH/package/xen_ext/Config.in"
diff --git a/br-ext/package/optee_benchmark_ext/Config.in b/br-ext/package/optee_benchmark_ext/Config.in
deleted file mode 100644
index e6638ab..0000000
--- a/br-ext/package/optee_benchmark_ext/Config.in
+++ /dev/null
@@ -1,11 +0,0 @@
-config BR2_PACKAGE_OPTEE_BENCHMARK_EXT
- bool "optee_benchmark"
- select BR2_PACKAGE_LIBYAML
- help
- http://github.org/OP-TEE/optee_benchmark
-
-config BR2_PACKAGE_OPTEE_BENCHMARK_EXT_SITE
- string "OP-TEE benchmark path"
- default ""
- help
- The path to the source directory of OP-TEE benchmark
diff --git a/br-ext/package/optee_benchmark_ext/optee_benchmark_ext.mk b/br-ext/package/optee_benchmark_ext/optee_benchmark_ext.mk
deleted file mode 100644
index f55500e..0000000
--- a/br-ext/package/optee_benchmark_ext/optee_benchmark_ext.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-OPTEE_BENCHMARK_EXT_VERSION = 1.0
-OPTEE_BENCHMARK_EXT_SOURCE = local
-OPTEE_BENCHMARK_EXT_SITE = $(BR2_PACKAGE_OPTEE_BENCHMARK_EXT_SITE)
-OPTEE_BENCHMARK_EXT_SITE_METHOD = local
-OPTEE_BENCHMARK_EXT_INSTALL_STAGING = YES
-OPTEE_BENCHMARK_EXT_DEPENDENCIES = optee_client_ext libyaml
-
-$(eval $(cmake-package))
diff --git a/common.mk b/common.mk
index 40b2b3b..2bec957 100644
--- a/common.mk
+++ b/common.mk
@@ -32,7 +32,6 @@
BUILD_PATH ?= $(ROOT)/build
LINUX_PATH ?= $(ROOT)/linux
UBOOT_PATH ?= $(ROOT)/u-boot
-BENCHMARK_APP_PATH ?= $(ROOT)/optee_benchmark
OPTEE_OS_PATH ?= $(ROOT)/optee_os
OPTEE_CLIENT_PATH ?= $(ROOT)/optee_client
OPTEE_TEST_PATH ?= $(ROOT)/optee_test
@@ -43,9 +42,6 @@
# default high verbosity. slow uarts shall specify lower if prefered
CFG_TEE_CORE_LOG_LEVEL ?= 3
-# default disable latency benchmarks (over all OP-TEE layers)
-CFG_TEE_BENCHMARK ?= n
-
# optee_test
WITH_TLS_TESTS ?= y
ifneq ($(COMPILER),clang)
@@ -277,8 +273,6 @@
BR2_PACKAGE_LIBOPENSSL ?= y
BR2_PACKAGE_MMC_UTILS ?= y
BR2_PACKAGE_OPENSSL ?= y
-BR2_PACKAGE_OPTEE_BENCHMARK_EXT ?= $(CFG_TEE_BENCHMARK)
-BR2_PACKAGE_OPTEE_BENCHMARK_EXT_SITE ?= $(BENCHMARK_APP_PATH)
BR2_PACKAGE_OPTEE_CLIENT_EXT_SITE ?= $(OPTEE_CLIENT_PATH)
BR2_PACKAGE_OPTEE_EXAMPLES_EXT ?= y
BR2_PACKAGE_OPTEE_EXAMPLES_EXT_CROSS_COMPILE ?= $(CROSS_COMPILE_S_USER)
@@ -368,10 +362,6 @@
################################################################################
# Linux
################################################################################
-ifeq ($(CFG_TEE_BENCHMARK),y)
-LINUX_DEFCONFIG_BENCH ?= $(CURDIR)/kconfigs/tee_bench.conf
-endif
-
LINUX_COMMON_FLAGS ?= LOCALVERSION= CROSS_COMPILE=$(CROSS_COMPILE_NS_KERNEL)
.PHONY: linux-common
@@ -382,8 +372,7 @@
cd $(LINUX_PATH) && \
ARCH=$(LINUX_DEFCONFIG_COMMON_ARCH) \
CROSS_COMPILE=$(CROSS_COMPILE_NS_KERNEL) \
- scripts/kconfig/merge_config.sh $(LINUX_DEFCONFIG_COMMON_FILES) \
- $(LINUX_DEFCONFIG_BENCH)
+ scripts/kconfig/merge_config.sh $(LINUX_DEFCONFIG_COMMON_FILES)
.PHONY: linux-defconfig-clean-common
linux-defconfig-clean-common:
@@ -552,7 +541,6 @@
$(OPTEE_OS_TA_CROSS_COMPILE_FLAGS) \
CFG_TEE_CORE_LOG_LEVEL=$(CFG_TEE_CORE_LOG_LEVEL) \
DEBUG=$(DEBUG) \
- CFG_TEE_BENCHMARK=$(CFG_TEE_BENCHMARK) \
CFG_IN_TREE_EARLY_TAS="$(CFG_IN_TREE_EARLY_TAS)"
.PHONY: optee-os-common
diff --git a/kconfigs/tee_bench.conf b/kconfigs/tee_bench.conf
deleted file mode 100644
index cf6cba9..0000000
--- a/kconfigs/tee_bench.conf
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_OPTEE_BENCHMARK=y