Include OP-TEE OS's conf.h when compiling the client application (xtest)
Instead of manually adding a macro definition to the xtest C flags for
each variable we need from conf.mk, let all C files include the OP-TEE
OS configuration file unconditionally.
Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>
Suggested-by: Jens Wiklander <jens.wiklander@linaro.org>
Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>
Reviewed-by: Joakim Bech <joakim.bech@linaro.org>
diff --git a/host/xtest/Makefile b/host/xtest/Makefile
index 2bd5ea2..6badf4c 100644
--- a/host/xtest/Makefile
+++ b/host/xtest/Makefile
@@ -111,15 +111,8 @@
# FIXME: Check if and why we need this flag?
CFLAGS += -DUSER_SPACE
-ifeq ($(CFG_ENC_FS),y)
-CFLAGS += -DCFG_ENC_FS
-endif
-ifeq ($(CFG_REE_FS),y)
-CFLAGS += -DCFG_REE_FS
-endif
-ifeq ($(CFG_RPMB_FS),y)
-CFLAGS += -DCFG_RPMB_FS
-endif
+# Include configuration file generated by OP-TEE OS (CFG_* macros)
+CFLAGS += -include conf.h
ifndef CFG_GP_PACKAGE_PATH
CFLAGS += -Wall -Wcast-align -Werror \