diff --git a/linuxkm/Kbuild b/linuxkm/Kbuild
index 29e8092ab..701c3ad0a 100644
--- a/linuxkm/Kbuild
+++ b/linuxkm/Kbuild
@@ -114,6 +114,16 @@ $(obj)/wolfcrypt/src/aes_xts_asm.o: asflags-y = $(WOLFSSL_ASFLAGS) $(ASFLAGS_FPU
 $(obj)/wolfcrypt/src/aes_xts_asm.o: OBJECT_FILES_NON_STANDARD := y
 $(obj)/wolfcrypt/src/sp_x86_64_asm.o: asflags-y = $(WOLFSSL_ASFLAGS) $(ASFLAGS_FPU_DISABLE_SIMD_ENABLE)
 $(obj)/wolfcrypt/src/sp_x86_64_asm.o: OBJECT_FILES_NON_STANDARD := y
+$(obj)/wolfcrypt/src/sha256_asm.o: asflags-y = $(WOLFSSL_ASFLAGS) $(ASFLAGS_FPU_DISABLE_SIMD_ENABLE)
+$(obj)/wolfcrypt/src/sha256_asm.o: OBJECT_FILES_NON_STANDARD := y
+$(obj)/wolfcrypt/src/sha512_asm.o: asflags-y = $(WOLFSSL_ASFLAGS) $(ASFLAGS_FPU_DISABLE_SIMD_ENABLE)
+$(obj)/wolfcrypt/src/sha512_asm.o: OBJECT_FILES_NON_STANDARD := y
+$(obj)/wolfcrypt/src/sha3_asm.o: asflags-y = $(WOLFSSL_ASFLAGS) $(ASFLAGS_FPU_DISABLE_SIMD_ENABLE)
+$(obj)/wolfcrypt/src/sha3_asm.o: OBJECT_FILES_NON_STANDARD := y
+$(obj)/wolfcrypt/src/chacha_asm.o: asflags-y = $(WOLFSSL_ASFLAGS) $(ASFLAGS_FPU_DISABLE_SIMD_ENABLE)
+$(obj)/wolfcrypt/src/chacha_asm.o: OBJECT_FILES_NON_STANDARD := y
+$(obj)/wolfcrypt/src/poly1305_asm.o: asflags-y = $(WOLFSSL_ASFLAGS) $(ASFLAGS_FPU_DISABLE_SIMD_ENABLE)
+$(obj)/wolfcrypt/src/poly1305_asm.o: OBJECT_FILES_NON_STANDARD := y
 
 ifeq "$(ENABLED_LINUXKM_PIE)" "yes"
 
diff --git a/wolfcrypt/src/ed25519.c b/wolfcrypt/src/ed25519.c
index fe005f580..7a708ce62 100644
--- a/wolfcrypt/src/ed25519.c
+++ b/wolfcrypt/src/ed25519.c
@@ -231,7 +231,7 @@ static int ed25519_pairwise_consistency_test(ed25519_key* key, WC_RNG* rng)
     if (err == 0) {
         /* Sign digest without context. */
         err = wc_ed25519_sign_msg_ex(digest, digestLen, sig, &sigLen, key,
-            Ed25519, NULL, 0);
+            (byte)Ed25519, NULL, 0);
         if (err != 0) {
             /* Any sign failure means test failed. */
             err = ECC_PCT_E;
@@ -240,7 +240,7 @@ static int ed25519_pairwise_consistency_test(ed25519_key* key, WC_RNG* rng)
     if (err == 0) {
         /* Verify digest without context. */
         err = wc_ed25519_verify_msg_ex(sig, sigLen, digest, digestLen, &res,
-            key, Ed25519, NULL, 0);
+            key, (byte)Ed25519, NULL, 0);
         if (err != 0) {
             /* Any verification operation failure means test failed. */
             err = ECC_PCT_E;