xtest 6xxx: test multiple storage IDs as supported by OP-TEE
Update xtest 6xxx to test the OP-TEE specific storage IDs
(TEE_STORAGE_PRIVATE_REE, TEE_STORAGE_PRIVATE_RPMB) in addition to the
default, GP-defined value: TEE_STORAGE_PRIVATE. Which values are
enabled is determined at compile time based on whether CFG_REE_FS and
CFG_RPMB_FS are 'y' or 'n' (these values are exported by optee_os and
may be overriden).
Among all the tests in the 6xxx series, 6010 and 6011 are not updated
(i.e., they test only TEE_STORAGE_PRIVATE) because they are GP tests.
xtest_20000.c is updated accordingly, due to the change in the
interface between xtest and the secure storage TA.
Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>
Tested-by: David Brown <david.brown@linaro.org>
Reviewed-by: David Brown <david.brown@linaro.org>
diff --git a/Android.mk b/Android.mk
index 7b2ee64..e23c777 100644
--- a/Android.mk
+++ b/Android.mk
@@ -60,6 +60,9 @@
ifeq ($(CFG_REE_FS),y)
LOCAL_CFLAGS += -DCFG_REE_FS
endif
+ifeq ($(CFG_RPMB_FS),y)
+LOCAL_CFLAGS += -DCFG_RPMB_FS
+endif
LOCAL_CFLAGS += -DUSER_SPACE
LOCAL_CFLAGS += -DTA_DIR=\"/system/lib/optee_armtz\"