diff --git a/include/mbedtls/check_config.h b/include/mbedtls/check_config.h
index 9f1ca2bc7d..26732293ee 100644
--- a/include/mbedtls/check_config.h
+++ b/include/mbedtls/check_config.h
@@ -730,8 +730,8 @@
 #if !defined(MBEDTLS_SHA512_C)
 #error "MBEDTLS_SHA512_USE_A64_CRYPTO_* defined without MBEDTLS_SHA512_C"
 #endif
-#if defined(MBEDTLS_SHA512_ALT) || defined(MBEDTLS_SHA512_PROCESS_ALT)
-#error "MBEDTLS_SHA512_*ALT can't be used with MBEDTLS_SHA512_USE_A64_CRYPTO_*"
+#if defined(MBEDTLS_SHA512_PROCESS_ALT)
+#error "MBEDTLS_SHA512_PROCESS_ALT can't be used with MBEDTLS_SHA512_USE_A64_CRYPTO_*"
 #endif
 
 #endif /* MBEDTLS_SHA512_USE_A64_CRYPTO_IF_PRESENT || MBEDTLS_SHA512_USE_A64_CRYPTO_ONLY */
diff --git a/include/mbedtls/mbedtls_config.h b/include/mbedtls/mbedtls_config.h
index 762ca8b6f4..3afc99b485 100644
--- a/include/mbedtls/mbedtls_config.h
+++ b/include/mbedtls/mbedtls_config.h
@@ -350,8 +350,6 @@
  */
 //#define MBEDTLS_TIMING_ALT
 
-//#define MBEDTLS_SHA512_ALT
-
 /**
  * \def MBEDTLS_SHA256_PROCESS_ALT
  *
diff --git a/tests/include/alt-dummy/sha512_alt.h b/tests/include/alt-dummy/sha512_alt.h
deleted file mode 100644
index 857bc916aa..0000000000
--- a/tests/include/alt-dummy/sha512_alt.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/* sha512_alt.h with dummy types for MBEDTLS_SHA512_ALT */
-/*
- *  Copyright The Mbed TLS Contributors
- *  SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
- */
-
-#ifndef SHA512_ALT_H
-#define SHA512_ALT_H
-
-typedef struct mbedtls_sha512_context {
-    int dummy;
-}
-mbedtls_sha512_context;
-
-
-#endif /* sha512_alt.h */
diff --git a/tf-psa-crypto/drivers/builtin/include/mbedtls/sha512.h b/tf-psa-crypto/drivers/builtin/include/mbedtls/sha512.h
index 1c20e4c228..002fe9d935 100644
--- a/tf-psa-crypto/drivers/builtin/include/mbedtls/sha512.h
+++ b/tf-psa-crypto/drivers/builtin/include/mbedtls/sha512.h
@@ -25,10 +25,6 @@
 extern "C" {
 #endif
 
-#if !defined(MBEDTLS_SHA512_ALT)
-// Regular implementation
-//
-
 /**
  * \brief          The SHA-512 context structure.
  *
@@ -47,10 +43,6 @@ typedef struct mbedtls_sha512_context {
 }
 mbedtls_sha512_context;
 
-#else  /* MBEDTLS_SHA512_ALT */
-#include "sha512_alt.h"
-#endif /* MBEDTLS_SHA512_ALT */
-
 /**
  * \brief          This function initializes a SHA-512 context.
  *
diff --git a/tf-psa-crypto/drivers/builtin/src/sha512.c b/tf-psa-crypto/drivers/builtin/src/sha512.c
index 6dcea8da5d..e7575ea776 100644
--- a/tf-psa-crypto/drivers/builtin/src/sha512.c
+++ b/tf-psa-crypto/drivers/builtin/src/sha512.c
@@ -205,8 +205,6 @@ static int mbedtls_a64_crypto_sha512_determine_support(void)
 
 #endif  /* MBEDTLS_SHA512_USE_A64_CRYPTO_IF_PRESENT */
 
-#if !defined(MBEDTLS_SHA512_ALT)
-
 #define SHA512_BLOCK_SIZE 128
 
 #if defined(MBEDTLS_SHA512_SMALLER)
@@ -879,8 +877,6 @@ exit:
     return ret;
 }
 
-#endif /* !MBEDTLS_SHA512_ALT */
-
 /*
  * output = SHA-512( input buffer )
  */