Index: RTC.c
===================================================================
diff -u -rcd1dbf44ebce97f61ad4a757d47449562ec366f0 -ra6005795af5d50ce9248d2801673e16a2fad0001
--- RTC.c	(.../RTC.c)	(revision cd1dbf44ebce97f61ad4a757d47449562ec366f0)
+++ RTC.c	(.../RTC.c)	(revision a6005795af5d50ce9248d2801673e16a2fad0001)
@@ -310,32 +310,26 @@
     switch ( RTCSelfTestState )
     {
         case RTC_SELF_TEST_STATE_START:
-
             RTCSelfTestState = handleSelfTestStart();
             break;
 
         case RTC_SELF_TEST_STATE_CHECK_CTRL_REGS:
-
             RTCSelfTestState = handleSelfTestCheckCtrlRegs();
             break;
 
         case RTC_SELF_TEST_STATE_WAIT_FOR_FIRST_SECOND:
-
             RTCSelfTestState = handleSelfTestWaitForFirstSecond();
             break;
 
         case RTC_SELF_TEST_STATE_WAIT_FOR_SECOND_SECOND:
-
             RTCSelfTestState = handleSelfTestWaitForSecondSecond();
             break;
 
         case RTC_SELF_TEST_STATE_CHECK_ACCURACY:
-
             RTCSelfTestState = handleSelfTestCheckAccuracy();
             break;
 
         case RTC_SELF_TEST_STATE_COMPLETE:
-
             // Done with POST regardless of the results
             break;
 
@@ -366,37 +360,30 @@
     switch ( RTCExecState )
     {
         case RTC_EXEC_STATE_WAIT_FOR_POST:
-
             RTCExecState = handleExecWaitForPostState();
             break;
 
         case RTC_EXEC_STATE_IDLE:
-
             RTCExecState = handleExecIdleState();
             break;
 
         case RTC_EXEC_STATE_PREP_RAM:
-
             RTCExecState = handleExecPrepRAMState();
             break;
 
         case RTC_EXEC_STATE_WRITE_TO_RAM:
-
             RTCExecState = handleExecWriteToRAMState();
             break;
 
         case RTC_EXEC_STATE_READ_FROM_RAM:
-
             RTCExecState = handleExecReadFromRAMState();
             break;
 
         case RTC_EXEC_STATE_WRITE:
-
             RTCExecState = handleExecWriteState();
             break;
 
         case RTC_EXEC_STATE_READ:
-
             RTCExecState = handleExecReadState();
             break;
 
@@ -954,10 +941,14 @@
 {
     RTC_EXEC_STATE_T result = RTC_EXEC_STATE_WAIT_FOR_POST;
 
+#ifndef DONT_SKIP_NV_POST
     if ( RTCSelfTestState == RTC_SELF_TEST_STATE_COMPLETE )
     {
         result = RTC_EXEC_STATE_IDLE;
     }
+#else
+    result = RTC_EXEC_STATE_IDLE;
+#endif
 
     return result;
 }