Index: RTC.c
===================================================================
diff -u -r80c8a962fd974dd0d8dec86139171f93878304ac -r275af898eca92aafd2d8b0c8d3d02fa9abb7de40
--- RTC.c	(.../RTC.c)	(revision 80c8a962fd974dd0d8dec86139171f93878304ac)
+++ RTC.c	(.../RTC.c)	(revision 275af898eca92aafd2d8b0c8d3d02fa9abb7de40)
@@ -718,7 +718,6 @@
     alarm = ALARM_ID_HD_RTC_CONFIG_ERROR;
 #endif
 
-#ifndef DISABLE_RTC_CONFIG
     U16 controlReg1 = rxBuffer[ RTC_REG_1_INDEX ];
     U16 controlReg2 = rxBuffer[ RTC_REG_2_INDEX ];
     U16 controlReg3 = rxBuffer[ RTC_REG_3_INDEX ];
@@ -769,7 +768,7 @@
 #endif
         hasTestPassed = FALSE;
     }
-#endif
+
     return hasTestPassed;
 }
 
@@ -899,6 +898,7 @@
     U32 secs        = oneHrEpoch - ( mins * SEC_PER_MIN );
     dtTime.years    = EPOCH_BASE_YEAR + wholeYears;
     dtTime.months   = 0;
+
     dayCnt = 0;
     daysInMonth[ LEAP_YEAR_MONTH ] = ( TRUE == leapYear ? 29 : 28 );
     for ( i = 0; i < MONTHS_IN_YEAR; i++ )
@@ -1396,6 +1396,8 @@
 static RTC_SELF_TEST_STATE_T handleSelfTestCheckAccuracy( void )
 {
     RTC_SELF_TEST_STATE_T result = RTC_SELF_TEST_STATE_CHECK_ACCURACY;
+
+#ifndef BOARD_WITH_NO_HARDWARE
     BOOL isStatusOk = serviceRTC( txBuffer, rxBuffer, RTC_GENERAL_BUFFER_LENGTH );
 
     if ( ( TRUE == isStatusOk ) && ( rxBuffer[ RTC_SECONDS_INDEX ] != RTCPreviousSecond ) )
@@ -1426,11 +1428,27 @@
             SET_ALARM_WITH_2_U32_DATA( alarm, (U32)elapsedFPGATime, (U32)elapsedTime );
         }
     }
+#else
+    result            = RTC_SELF_TEST_STATE_COMPLETE;
+    RTCSelfTestResult = SELF_TEST_STATUS_PASSED;
+#endif
 
     return result;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The resetRTCPostState function resets the RTC self test state
+ * @details Inputs: none
+ * @details Outputs : RTCSelfTestState
+ * @return none
+ *************************************************************************/
+void resetRTCPostState( void )
+{
+    RTCSelfTestState = RTC_SELF_TEST_STATE_START;
+}
 
+
 /*************************************************************************
  *                       TEST SUPPORT FUNCTIONS
  *************************************************************************/