diff --git a/package/wolfssl/Config.in b/package/wolfssl/Config.in
index 3a97125e8d..c41bdb6888 100644
--- a/package/wolfssl/Config.in
+++ b/package/wolfssl/Config.in
@@ -1,3 +1,15 @@
+config BR2_PACKAGE_WOLFSSL_ASM_SUPPORTS
+	bool
+	default y if BR2_aarch64
+	default y if BR2_arm || BR2_armeb
+	default y if BR2_powerpc
+	default y if BR2_powerpc64 || BR2_powerpc64le
+	default y if BR2_mips64 && !BR2_MIPS_CPU_MIPS32R6
+	default y if BR2_mips64el && !BR2_MIPS_CPU_MIPS32R6
+	default y if BR2_mips || BR2_mipsel
+	default y if BR2_riscv && BR2_RISCV_ISA_RVM
+	default y if BR2_s390x
+
 config BR2_PACKAGE_WOLFSSL
 	bool "wolfssl"
 	depends on BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/wolfssl/wolfssl.mk b/package/wolfssl/wolfssl.mk
index 8f6cba56ec..9f06bb1b4b 100644
--- a/package/wolfssl/wolfssl.mk
+++ b/package/wolfssl/wolfssl.mk
@@ -32,6 +32,12 @@ else
 WOLFSSL_CONF_OPTS += --disable-sslv3
 endif
 
+ifeq ($(BR2_PACKAGE_WOLFSSL_ASM_SUPPORTS),y)
+WOLFSSL_CONF_OPTS += --enable-asm
+else
+WOLFSSL_CONF_OPTS += --disable-asm
+endif
+
 # enable ARMv8 hardware acceleration
 ifeq ($(BR2_aarch64),y)
 WOLFSSL_CONF_OPTS += --enable-armasm