diff --git a/src/mainboard/amd/parmer/OptionsIds.h b/src/mainboard/amd/parmer/OptionsIds.h
index 130d8525ab..d109d2f95d 100644
--- a/src/mainboard/amd/parmer/OptionsIds.h
+++ b/src/mainboard/amd/parmer/OptionsIds.h
@@ -23,7 +23,6 @@
  *    IDSOPT_CONTROL_ENABLED
  *    IDSOPT_TRACING_ENABLED
  *    IDSOPT_PERF_ANALYSIS
- *    IDSOPT_ASSERT_ENABLED
  *    IDSOPT_CAR_CORRUPTION_CHECK_ENABLED
  *
  **/
@@ -33,6 +32,5 @@
 //#define IDSOPT_TRACING_ENABLED TRUE
 #define IDSOPT_TRACING_CONSOLE_SERIALPORT TRUE
 //#define IDSOPT_PERF_ANALYSIS   TRUE
-#define IDSOPT_ASSERT_ENABLED  TRUE
 
 #endif
diff --git a/src/mainboard/amd/thatcher/OptionsIds.h b/src/mainboard/amd/thatcher/OptionsIds.h
index 130d8525ab..d109d2f95d 100644
--- a/src/mainboard/amd/thatcher/OptionsIds.h
+++ b/src/mainboard/amd/thatcher/OptionsIds.h
@@ -23,7 +23,6 @@
  *    IDSOPT_CONTROL_ENABLED
  *    IDSOPT_TRACING_ENABLED
  *    IDSOPT_PERF_ANALYSIS
- *    IDSOPT_ASSERT_ENABLED
  *    IDSOPT_CAR_CORRUPTION_CHECK_ENABLED
  *
  **/
@@ -33,6 +32,5 @@
 //#define IDSOPT_TRACING_ENABLED TRUE
 #define IDSOPT_TRACING_CONSOLE_SERIALPORT TRUE
 //#define IDSOPT_PERF_ANALYSIS   TRUE
-#define IDSOPT_ASSERT_ENABLED  TRUE
 
 #endif
diff --git a/src/mainboard/asus/a88xm-e/OptionsIds.h b/src/mainboard/asus/a88xm-e/OptionsIds.h
index 33b0232a06..77b239db50 100644
--- a/src/mainboard/asus/a88xm-e/OptionsIds.h
+++ b/src/mainboard/asus/a88xm-e/OptionsIds.h
@@ -21,7 +21,6 @@
  *    IDSOPT_CONTROL_ENABLED
  *    IDSOPT_TRACING_ENABLED
  *    IDSOPT_PERF_ANALYSIS
- *    IDSOPT_ASSERT_ENABLED
  *    IDSOPT_CAR_CORRUPTION_CHECK_ENABLED
  **/
 
@@ -30,6 +29,5 @@
 //#define IDSOPT_TRACING_ENABLED TRUE
 #define IDSOPT_TRACING_CONSOLE_SERIALPORT TRUE
 //#define IDSOPT_PERF_ANALYSIS   TRUE
-#define IDSOPT_ASSERT_ENABLED  TRUE
 
 #endif
diff --git a/src/mainboard/asus/f2a85-m/OptionsIds.h b/src/mainboard/asus/f2a85-m/OptionsIds.h
index 130d8525ab..d109d2f95d 100644
--- a/src/mainboard/asus/f2a85-m/OptionsIds.h
+++ b/src/mainboard/asus/f2a85-m/OptionsIds.h
@@ -23,7 +23,6 @@
  *    IDSOPT_CONTROL_ENABLED
  *    IDSOPT_TRACING_ENABLED
  *    IDSOPT_PERF_ANALYSIS
- *    IDSOPT_ASSERT_ENABLED
  *    IDSOPT_CAR_CORRUPTION_CHECK_ENABLED
  *
  **/
@@ -33,6 +32,5 @@
 //#define IDSOPT_TRACING_ENABLED TRUE
 #define IDSOPT_TRACING_CONSOLE_SERIALPORT TRUE
 //#define IDSOPT_PERF_ANALYSIS   TRUE
-#define IDSOPT_ASSERT_ENABLED  TRUE
 
 #endif
diff --git a/src/mainboard/hp/pavilion_m6_1035dx/OptionsIds.h b/src/mainboard/hp/pavilion_m6_1035dx/OptionsIds.h
index 130d8525ab..d109d2f95d 100644
--- a/src/mainboard/hp/pavilion_m6_1035dx/OptionsIds.h
+++ b/src/mainboard/hp/pavilion_m6_1035dx/OptionsIds.h
@@ -23,7 +23,6 @@
  *    IDSOPT_CONTROL_ENABLED
  *    IDSOPT_TRACING_ENABLED
  *    IDSOPT_PERF_ANALYSIS
- *    IDSOPT_ASSERT_ENABLED
  *    IDSOPT_CAR_CORRUPTION_CHECK_ENABLED
  *
  **/
@@ -33,6 +32,5 @@
 //#define IDSOPT_TRACING_ENABLED TRUE
 #define IDSOPT_TRACING_CONSOLE_SERIALPORT TRUE
 //#define IDSOPT_PERF_ANALYSIS   TRUE
-#define IDSOPT_ASSERT_ENABLED  TRUE
 
 #endif
diff --git a/src/mainboard/lenovo/g505s/OptionsIds.h b/src/mainboard/lenovo/g505s/OptionsIds.h
index 130d8525ab..d109d2f95d 100644
--- a/src/mainboard/lenovo/g505s/OptionsIds.h
+++ b/src/mainboard/lenovo/g505s/OptionsIds.h
@@ -23,7 +23,6 @@
  *    IDSOPT_CONTROL_ENABLED
  *    IDSOPT_TRACING_ENABLED
  *    IDSOPT_PERF_ANALYSIS
- *    IDSOPT_ASSERT_ENABLED
  *    IDSOPT_CAR_CORRUPTION_CHECK_ENABLED
  *
  **/
@@ -33,6 +32,5 @@
 //#define IDSOPT_TRACING_ENABLED TRUE
 #define IDSOPT_TRACING_CONSOLE_SERIALPORT TRUE
 //#define IDSOPT_PERF_ANALYSIS   TRUE
-#define IDSOPT_ASSERT_ENABLED  TRUE
 
 #endif
diff --git a/src/mainboard/msi/ms7721/OptionsIds.h b/src/mainboard/msi/ms7721/OptionsIds.h
index 130d8525ab..d109d2f95d 100644
--- a/src/mainboard/msi/ms7721/OptionsIds.h
+++ b/src/mainboard/msi/ms7721/OptionsIds.h
@@ -23,7 +23,6 @@
  *    IDSOPT_CONTROL_ENABLED
  *    IDSOPT_TRACING_ENABLED
  *    IDSOPT_PERF_ANALYSIS
- *    IDSOPT_ASSERT_ENABLED
  *    IDSOPT_CAR_CORRUPTION_CHECK_ENABLED
  *
  **/
@@ -33,6 +32,5 @@
 //#define IDSOPT_TRACING_ENABLED TRUE
 #define IDSOPT_TRACING_CONSOLE_SERIALPORT TRUE
 //#define IDSOPT_PERF_ANALYSIS   TRUE
-#define IDSOPT_ASSERT_ENABLED  TRUE
 
 #endif
diff --git a/src/vendorcode/amd/agesa/f15tn/Include/Ids.h b/src/vendorcode/amd/agesa/f15tn/Include/Ids.h
index 95d726dac5..09a23418e4 100644
--- a/src/vendorcode/amd/agesa/f15tn/Include/Ids.h
+++ b/src/vendorcode/amd/agesa/f15tn/Include/Ids.h
@@ -223,10 +223,6 @@ typedef enum {                        //vv- for debug reference only
   #define IDSOPT_HEAP_CHECKING           FALSE
 #endif
 
-#ifndef IDSOPT_ASSERT_ENABLED
-  #define IDSOPT_ASSERT_ENABLED         FALSE
-#endif
-
 #ifndef IDSOPT_ERROR_TRAP_ENABLED
   #define IDSOPT_ERROR_TRAP_ENABLED   FALSE
 #endif
@@ -264,7 +260,6 @@ typedef enum {                        //vv- for debug reference only
   #undef  IDSOPT_TRACING_ENABLED
   #undef  IDSOPT_PERF_ANALYSIS
   #undef  IDSOPT_HEAP_CHECKING
-  #undef  IDSOPT_ASSERT_ENABLED
   #undef  IDSOPT_ERROR_TRAP_ENABLED
   #undef  IDSOPT_CAR_CORRUPTION_CHECK_ENABLED
   #undef  IDSOPT_DEBUG_CODE_ENABLED
@@ -277,7 +272,6 @@ typedef enum {                        //vv- for debug reference only
   #define IDSOPT_TRACING_ENABLED    FALSE
   #define IDSOPT_PERF_ANALYSIS      FALSE
   #define IDSOPT_HEAP_CHECKING      FALSE
-  #define IDSOPT_ASSERT_ENABLED     FALSE
   #define IDSOPT_ERROR_TRAP_ENABLED FALSE
   #define IDSOPT_CAR_CORRUPTION_CHECK_ENABLED FALSE
   #define IDSOPT_DEBUG_CODE_ENABLED FALSE
@@ -345,34 +339,6 @@ typedef enum {                        //vv- for debug reference only
   #define STOP_HERE  STOP_HERE_Needs_To_Be_Removed //"WARNING: Debug code needs to be removed for production builds."
 #endif
 
-/**
- * @def ASSERT
- *  Test an assertion that the given statement is True.
- *
- *  The statement is evaluated to a boolean value. If the statement is True,
- *  then no action is taken (no error). If the statement is False, a error stop
- *  is generated to halt the program. Used for testing for fatal errors that
- *  must be resolved before production. This is used to do parameter checks,
- *  bounds checking, range checks and 'sanity' checks.
- *
- * @param[in]   conditional    Assert that evaluating this conditional results in TRUE.
- *
- **/
-#ifndef ASSERT
-  #if IDSOPT_ASSERT_ENABLED == TRUE
-    #ifdef STOP_CODE
-      #undef STOP_CODE
-    #endif
-    #define STOP_CODE (((UINT32)FILECODE)*0x10000ul + \
-                        ((__LINE__) % 10) + (((__LINE__ / 10) % 10)*0x10) + \
-                        (((__LINE__ / 100) % 10)*0x100) + (((__LINE__ / 1000) % 10)*0x1000))
-
-    #define ASSERT(conditional) ((conditional) ? 0 : IdsAssert (STOP_CODE));
-  #else
-    #define ASSERT(conditional)
-  #endif
-#endif
-
 #if IDSOPT_CAR_CORRUPTION_CHECK_ENABLED == TRUE
   #undef  IDSOPT_ERROR_TRAP_ENABLED
   #define IDSOPT_ERROR_TRAP_ENABLED TRUE
@@ -1250,23 +1216,6 @@ IdsAgesaTestPoint (
   IN OUT   AMD_CONFIG_PARAMS *StdHeader
   );
 
-/**
- *  IDS Backend Function for ASSERT
- *
- * Halt execution with stop code display.  Stop Code is displayed on port 80, with rotation so that
- * it is visible on 8, 16, or 32 bit display.  The stop code is alternated with 0xDEAD on the display,
- * to help distinguish the stop code from a post code loop.
- * Additional features may be available if using simulation.
- *
- * @param[in]     FileCode    File code(define in FILECODE.h) mix with assert Line num.
- *
- * @retval         TRUE     No error
-**/
-BOOLEAN
-IdsAssert (
-  IN      UINT32 FileCode
-  );
-
 /**
  * The engine code for ASSERT MACRO
  *
diff --git a/src/vendorcode/amd/agesa/f15tn/MainPage.h b/src/vendorcode/amd/agesa/f15tn/MainPage.h
index 503aa4afa4..52094c50af 100644
--- a/src/vendorcode/amd/agesa/f15tn/MainPage.h
+++ b/src/vendorcode/amd/agesa/f15tn/MainPage.h
@@ -90,7 +90,6 @@
  * @code
  * #define IDSOPT_IDS_ENABLED TRUE
  * #define IDSOPT_ERROR_TRAP_ENABLED TRUE
- * #define IDSOPT_ASSERT_ENABLED TRUE
  * @endcode
  * <li> Edit and modify the option selections in those two files to meet the needs of the specific platform.
  * <li> Set the environment variable AGESA_ROOT to the root folder of the AGESA code.
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/IDS/Debug/IdsDebug.c b/src/vendorcode/amd/agesa/f15tn/Proc/IDS/Debug/IdsDebug.c
index b5c26aefeb..45b25a4133 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/IDS/Debug/IdsDebug.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/IDS/Debug/IdsDebug.c
@@ -77,34 +77,6 @@ IdsAgesaTestPoint (
   LibAmdIoWrite (AccessWidth8, IDS_DEBUG_PORT, &TestPoint, StdHeader);
 }
 
-/**
- *  IDS Backend Function for ASSERT
- *
- * Halt execution with stop code display.  Stop Code is displayed on port 80, with rotation so that
- * it is visible on 8, 16, or 32 bit display.  The stop code is alternated with 0xDEAD on the display,
- * to help distinguish the stop code from a post code loop.
- * Additional features may be available if using simulation.
- *
- * @param[in]     FileCode    File code(define in FILECODE.h) mix with assert Line num.
- *
- * @retval         TRUE     No error
- **/
-BOOLEAN
-IdsAssert (
-  IN      UINT32 FileCode
-  )
-{
-  UINT32 file;
-  UINT32 line;
-
-  file = (FileCode >> 16);
-  line = (FileCode & 0xFFFF);
-  IDS_HDT_CONSOLE (MAIN_FLOW, "ASSERT on File[%x] Line[%x]\n", (UINTN) file, (UINTN) line);
-  IDS_HDT_CONSOLE_FLUSH_BUFFER (NULL);
-  IDS_HDT_CONSOLE_ASSERT (FileCode);
-  return TRUE;
-}
-
 /**
  *  IDS Backend Function for Memory timeout control
  *