diff options
| author | SY Chiu <sy.chiu@linaro.org> | 2015-01-20 12:34:22 +0800 |
|---|---|---|
| committer | SY Chiu <sy.chiu@linaro.org> | 2015-01-23 18:11:33 +0800 |
| commit | d9428c3ce5925bb568ebf628bd99c70caaa3a2a6 (patch) | |
| tree | c45b1c08de3dfb96e5e11d296d67bc1b8bb4fb30 /core/arch/arm32 | |
| parent | e4d3a4a68ce893f79ca024530d71c281af16041f (diff) | |
SE API: Change configuration to be prefixed with CFG_*
Signed-off-by: SY Chiu <sy.chiu@linaro.org>
Tested-by: SY Chiu <sy.chiu@linaro.org> (Modified QEMU + jcardsim)
Diffstat (limited to 'core/arch/arm32')
| -rw-r--r-- | core/arch/arm32/kernel/tee_ta_manager.c | 2 | ||||
| -rw-r--r-- | core/arch/arm32/plat-vexpress/conf.mk | 8 | ||||
| -rw-r--r-- | core/arch/arm32/plat-vexpress/core_bootcfg.c | 2 | ||||
| -rw-r--r-- | core/arch/arm32/sta/sub.mk | 4 |
4 files changed, 6 insertions, 10 deletions
diff --git a/core/arch/arm32/kernel/tee_ta_manager.c b/core/arch/arm32/kernel/tee_ta_manager.c index 9fcc5b7..e495585 100644 --- a/core/arch/arm32/kernel/tee_ta_manager.c +++ b/core/arch/arm32/kernel/tee_ta_manager.c @@ -622,7 +622,7 @@ static TEE_Result tee_ta_load(const kta_signed_header_t *signed_ta, TAILQ_INIT(&ctx->objects); TAILQ_INIT(&ctx->storage_enums); ctx->head = sec_head; -#if defined(WITH_SE_API) +#if defined(CFG_SE_API) ctx->se_service = NULL; #endif diff --git a/core/arch/arm32/plat-vexpress/conf.mk b/core/arch/arm32/plat-vexpress/conf.mk index 093bbb2..890d373 100644 --- a/core/arch/arm32/plat-vexpress/conf.mk +++ b/core/arch/arm32/plat-vexpress/conf.mk @@ -32,11 +32,9 @@ endif # SE API is only suppoorted by QEMU Virt platform ifeq ($(PLATFORM_FLAVOR),qemu_virt) -WITH_SE_API := y -WITH_SE_API_SELF_TEST := y -WITH_PCSC_PASSTHRU_READER_DRV := y -platform-cppflags += -DWITH_SE_API=1 -core-platform-cppflags += -DWITH_PCSC_PASSTHRU_READER_DRV=1 +CFG_SE_API := y +CFG_SE_API_SELF_TEST := y +CFG_PCSC_PASSTHRU_READER_DRV := y endif ifeq ($(CFG_CRYPTO_SHA256_ARM32_CE),y) diff --git a/core/arch/arm32/plat-vexpress/core_bootcfg.c b/core/arch/arm32/plat-vexpress/core_bootcfg.c index 1b13e6a..8723d6a 100644 --- a/core/arch/arm32/plat-vexpress/core_bootcfg.c +++ b/core/arch/arm32/plat-vexpress/core_bootcfg.c @@ -172,7 +172,7 @@ static struct map_area bootcfg_memory_map[] = { }, #endif -#ifdef WITH_PCSC_PASSTHRU_READER_DRV +#ifdef CFG_PCSC_PASSTHRU_READER_DRV { /* PCSC passthru reader */ .type = MEM_AREA_IO_SEC, .pa = PCSC_BASE & ~SECTION_MASK, .size = SECTION_SIZE, diff --git a/core/arch/arm32/sta/sub.mk b/core/arch/arm32/sta/sub.mk index 38300aa..7800b4e 100644 --- a/core/arch/arm32/sta/sub.mk +++ b/core/arch/arm32/sta/sub.mk @@ -1,7 +1,5 @@ srcs-y += sta_self_tests.c srcs-y += core_self_tests.c -ifeq ($(WITH_SE_API),y) -srcs-${WITH_SE_API_SELF_TEST} += se_api_self_tests.c +srcs-$(CFG_SE_API_SELF_TEST) += se_api_self_tests.c cppflags-se_api_self_tests.c-y += -Icore/tee/se -endif |