simplify use of TEE fs related configs

CFG_TEE_DATA_PATH confuses users because it's only used as a prefix for
CFG_TEE_LOGS_PATH and not the actual root path for the TEE data dir as
described. The actual root path is $(TEE_FS_PARENT_PATH)/tee as can be
seen under tee_supp_fs_init() in tee-supplicant/src/tee_supp_fs.c, so
just get rid of CFG_TEE_DATA_PATH.

Next, we move "/tee" from tee_supp_fs_init() to CFG_TEE_FS_PARENT_PATH,
because otherwise, we have the beginning part of the path in a makefile
(config.mk) and the ending in code (tee_supp_fs_init()), which seems
messy to manage and error prone. E.g. CFG_TEE_LOGS_PATH (or any of its
subsequently derived configs) depends on the actual full path of the TEE
fs, so we can just set
CFG_TEE_LOGS_PATH ?= $(CFG_TEE_FS_PARENT_PATH)/logs
rather than
CFG_TEE_LOGS_PATH ?= $(CFG_TEE_FS_PARENT_PATH)/tee/logs
where the "tee" here has to match the "tee" in code.
With this change, the "/tee" subdirectory path is expected from the
CFG_TEE_FS_PARENT_PATH value, but this change does not modify legacy
default path of embedded files.

Signed-off-by: Victor Chong <victor.chong@linaro.org>
Tested-by: Victor Chong <victor.chong@linaro.org> (QEMU v8)
Acked-by: Etienne Carriere <etienne.carriere@linaro.org>
4 files changed
tree: 1747f487863b60e5913c2ea7accb0da172d02eec
  1. libteec/
  2. public/
  3. tee-supplicant/
  4. .gitignore
  5. .travis.yml
  6. Android.mk
  7. android_flags.mk
  8. CMakeLists.txt
  9. CMakeToolchain.txt
  10. config.mk
  11. flags.mk
  12. LICENSE
  13. Makefile
  14. README.md
README.md

OP-TEE Client API

This git contains source code for the non-secure side implementation of the OP-TEE project making up the client library and tee-supplicant.

All official OP-TEE documentation has moved to http://optee.readthedocs.io. The information that used to be here in this git can be found under optee_client.

// OP-TEE core maintainers