diff --git a/include/plat/nuvoton/common/npcm845x_arm_def.h b/include/plat/nuvoton/common/npcm845x_arm_def.h index faddb88c2..5a44907f6 100644 --- a/include/plat/nuvoton/common/npcm845x_arm_def.h +++ b/include/plat/nuvoton/common/npcm845x_arm_def.h @@ -149,16 +149,7 @@ ARM_AP_TZC_DRAM1_SIZE - 1U) /* Define the Access permissions for Secure peripherals to NS_DRAM */ -#if ARM_CRYPTOCELL_INTEG -/* - * Allow Secure peripheral to read NS DRAM when integrated with CryptoCell. - * This is required by CryptoCell to authenticate BL33 which is loaded - * into the Non Secure DDR. - */ -#define ARM_TZC_NS_DRAM_S_ACCESS TZC_REGION_S_RD -#else #define ARM_TZC_NS_DRAM_S_ACCESS TZC_REGION_S_NONE -#endif /* ARM_CRYPTOCELL_INTEG */ #ifdef SPD_opteed /* diff --git a/plat/nuvoton/npcm845x/platform.mk b/plat/nuvoton/npcm845x/platform.mk index cb5a55352..92c7e2fec 100644 --- a/plat/nuvoton/npcm845x/platform.mk +++ b/plat/nuvoton/npcm845x/platform.mk @@ -140,25 +140,11 @@ $(error For SEPARATE_NOBITS_REGION, RECLAIM_INIT_CODE cannot be supported) endif endif -# Disable ARM Cryptocell by default -ARM_CRYPTOCELL_INTEG := 0 -$(eval $(call assert_boolean,ARM_CRYPTOCELL_INTEG)) -$(eval $(call add_define,ARM_CRYPTOCELL_INTEG)) - # Enable PIE support for RESET_TO_BL31 case ifeq (${RESET_TO_BL31},1) ENABLE_PIE := 1 endif -# CryptoCell integration relies on coherent buffers for passing data from -# the AP CPU to the CryptoCell - -ifeq (${ARM_CRYPTOCELL_INTEG},1) -ifeq (${USE_COHERENT_MEM},0) -$(error "ARM_CRYPTOCELL_INTEG needs USE_COHERENT_MEM to be set.") -endif -endif - PLAT_INCLUDES := -Iinclude/plat/nuvoton/npcm845x \ -Iinclude/plat/nuvoton/common \ -Iinclude/drivers/nuvoton/npcm845x \ @@ -339,11 +325,7 @@ BL2_SOURCES += ${AUTH_SOURCES} \ $(eval $(call TOOL_ADD_IMG,ns_bl2u,--fwu,FWU_)) # We expect to locate the *.mk files under the directories specified below -ifeq (${ARM_CRYPTOCELL_INTEG},0) CRYPTO_LIB_MK := drivers/auth/mbedtls/mbedtls_crypto.mk -else -CRYPTO_LIB_MK := drivers/auth/cryptocell/cryptocell_crypto.mk -endif IMG_PARSER_LIB_MK := drivers/auth/mbedtls/mbedtls_x509.mk