Index: TestSupport.c
===================================================================
diff -u -rfa7ec431de33859f8c9b0197013e268eea891cda -r655329c72f598e0d60b4ea1bf6b461c6c599b882
--- TestSupport.c	(.../TestSupport.c)	(revision fa7ec431de33859f8c9b0197013e268eea891cda)
+++ TestSupport.c	(.../TestSupport.c)	(revision 655329c72f598e0d60b4ea1bf6b461c6c599b882)
@@ -530,10 +530,21 @@
     {
         testConfig[ config ] = TEST_CONFIG_ENABLE_KEY;
         status               = TRUE;
+#ifdef _DD_
         if ( config == TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW )
         {
-            initFPGAPerHW( TRUE );
+            if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_0_HW ) )
+            {
+                // If beta 2.0 config is enabled by mistake when beta 1.0 config is active
+                SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_FPGA_INVALID_STATE, config )
+            }
+            else
+            {
+                // initialize FPGA registers to Beta 2.0
+                initFPGAPerHW( TRUE );
+            }
         }
+#endif
     }
 
     return status;
@@ -557,10 +568,13 @@
     {
         testConfig[ config ] = TEST_CONFIG_DISABLE_KEY;
         status               = TRUE;
+#ifdef _DD_
         if ( config == TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW )
         {
+            // initialize FPGA registers to Beta 1.9 or below
             initFPGAPerHW( FALSE );
         }
+#endif
     }
 
     return status;