diff --git a/include/target.mk b/include/target.mk
index 427808ad07..be7d8644ed 100644
--- a/include/target.mk
+++ b/include/target.mk
@@ -247,9 +247,6 @@ ifeq ($(DUMP),1)
   endif
   ifeq ($(ARCH),aarch64)
     CPU_TYPE ?= generic
-    ifneq ($(filter $(FEATURES),fpu),)
-      CPU_CFLAGS += -march=armv8-a+crypto
-    endif
     CPU_CFLAGS_generic = -mcpu=generic
     CPU_CFLAGS_cortex-a53 = -mcpu=cortex-a53
   endif
diff --git a/package/libs/mbedtls/Makefile b/package/libs/mbedtls/Makefile
index 74ec2a0836..2512b35ac4 100644
--- a/package/libs/mbedtls/Makefile
+++ b/package/libs/mbedtls/Makefile
@@ -122,6 +122,9 @@ PKG_INSTALL:=1
 
 TARGET_CFLAGS += -ffunction-sections -fdata-sections
 TARGET_CFLAGS := $(filter-out -O%,$(TARGET_CFLAGS))
+ifneq ($(CONFIG_LIBMBEDTILS_HAVE_ARMV8CE_AES),)
+  TARGET_CFLAGS := $(filter-out -march=%,$(TARGET_CFLAGS)) -march=armv8-a+crypto
+endif
 
 CMAKE_OPTIONS += \
 	-DUSE_SHARED_MBEDTLS_LIBRARY:Bool=ON \