Index: firmware/.cproject
===================================================================
diff -u -rda054e07ed923d897e58f77a14e21d864ac4d5b8 -rcd356a67e07af95b64122fe32e35e51c2190ac5d
--- firmware/.cproject	(.../.cproject)	(revision da054e07ed923d897e58f77a14e21d864ac4d5b8)
+++ firmware/.cproject	(.../.cproject)	(revision cd356a67e07af95b64122fe32e35e51c2190ac5d)
@@ -41,6 +41,7 @@
 								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.12.compilerID.DIAG_WRAP.810761604" name="Wrap diagnostic messages (--diag_wrap)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.12.compilerID.DIAG_WRAP" useByScannerDiscovery="false" value="com.ti.ccstudio.buildDefinitions.TMS470_18.12.compilerID.DIAG_WRAP.off" valueType="enumerated"/>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.ti.ccstudio.buildDefinitions.TMS470_18.12.compilerID.INCLUDE_PATH.1133210616" name="Add dir to #include search path (--include_path, -I)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.12.compilerID.INCLUDE_PATH" valueType="includePath">
 									<listOptionValue builtIn="false" value="${workspace_loc:/${ProjName}/App}"/>
+									<listOptionValue builtIn="false" value="${workspace_loc:/${ProjName}/FWCommon/FlashDriver}"/>
 									<listOptionValue builtIn="false" value="${workspace_loc:/${ProjName}/FWCommon}"/>
 									<listOptionValue builtIn="false" value="${workspace_loc:/${ProjName}/Common}"/>
 									<listOptionValue builtIn="false" value="${workspace_loc:/${ProjName}/App/Tasks}"/>
Index: firmware/.launches/HD.launch
===================================================================
diff -u -rb831c4f803bd92f6a16f854e3d02222fe76a379e -rcd356a67e07af95b64122fe32e35e51c2190ac5d
--- firmware/.launches/HD.launch	(.../HD.launch)	(revision b831c4f803bd92f6a16f854e3d02222fe76a379e)
+++ firmware/.launches/HD.launch	(.../HD.launch)	(revision cd356a67e07af95b64122fe32e35e51c2190ac5d)
@@ -10,7 +10,7 @@
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_DEBUGGER_PROPERTIES./home/fw/workspace_HD/HD/targetConfigs/RM46L852.ccxml.Texas Instruments XDS110 USB Debug Probe/CortexR4" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot; ?&gt;&#10;&lt;PropertyValues&gt;&#10;&#10;  &lt;property id=&quot;ConnectOnStartup&quot;&gt;&#10;    &lt;curValue&gt;1&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;EnableInstalledBreakpoint&quot;&gt;&#10;    &lt;curValue&gt;1&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;IgnoreSoftLaunchFailures&quot;&gt;&#10;    &lt;curValue&gt;0&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;&lt;/PropertyValues&gt;&#10;"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_DEBUGGER_PROPERTIES./home/fw/workspace_Merge/hdfirmware/firmware/targetConfigs/RM46L852.ccxml.Texas Instruments XDS110 USB Debug Probe/CortexR4" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot; ?&gt;&#10;&lt;PropertyValues&gt;&#10;&#10;  &lt;property id=&quot;ConnectOnStartup&quot;&gt;&#10;    &lt;curValue&gt;1&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;EnableInstalledBreakpoint&quot;&gt;&#10;    &lt;curValue&gt;1&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;IgnoreSoftLaunchFailures&quot;&gt;&#10;    &lt;curValue&gt;0&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;&lt;/PropertyValues&gt;&#10;"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_DEBUGGER_PROPERTIES./home/fw/workspace_RTC/hdfirmware/firmware/targetConfigs/RM46L852.ccxml.Texas Instruments XDS110 USB Debug Probe/CortexR4" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot; ?&gt;&#10;&lt;PropertyValues&gt;&#10;&#10;  &lt;property id=&quot;ConnectOnStartup&quot;&gt;&#10;    &lt;curValue&gt;1&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;EnableInstalledBreakpoint&quot;&gt;&#10;    &lt;curValue&gt;1&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;IgnoreSoftLaunchFailures&quot;&gt;&#10;    &lt;curValue&gt;0&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;&lt;/PropertyValues&gt;&#10;"/>
-<stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_DEBUGGER_PROPERTIES./home/fw/workspace_hd/hdfirmware/firmware/targetConfigs/RM46L852.ccxml.Texas Instruments XDS110 USB Debug Probe/CortexR4" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot; ?&gt;&#10;&lt;PropertyValues&gt;&#10;&#10;  &lt;property id=&quot;ConnectOnStartup&quot;&gt;&#10;    &lt;curValue&gt;1&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;EnableInstalledBreakpoint&quot;&gt;&#10;    &lt;curValue&gt;1&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;IgnoreSoftLaunchFailures&quot;&gt;&#10;    &lt;curValue&gt;0&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;&lt;/PropertyValues&gt;&#10;"/>
+<stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_DEBUGGER_PROPERTIES./home/fw/workspace_hd/hdfirmware/firmware/targetConfigs/RM46L852.ccxml.Texas Instruments XDS110 USB Debug Probe/CortexR4" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot; ?&gt;&#10;&lt;PropertyValues&gt;&#10;&#10;  &lt;property id=&quot;ConnectOnStartup&quot;&gt;&#10;    &lt;curValue&gt;1&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;EnableInstalledBreakpoint&quot;&gt;&#10;    &lt;curValue&gt;1&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;IgnoreSoftLaunchFailures&quot;&gt;&#10;    &lt;curValue&gt;0&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;FlashEraseSelection&quot;&gt;&#10;    &lt;curValue&gt;Necessary Sectors Only (for Program Load)&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;&lt;/PropertyValues&gt;&#10;"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_DEBUGGER_PROPERTIES./home/fw/workspace_v9/hdfirmware/firmware/targetConfigs/RM46L852.ccxml.Texas Instruments XDS110 USB Debug Probe/CortexR4" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot; ?&gt;&#10;&lt;PropertyValues&gt;&#10;&#10;  &lt;property id=&quot;ConnectOnStartup&quot;&gt;&#10;    &lt;curValue&gt;1&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;EnableInstalledBreakpoint&quot;&gt;&#10;    &lt;curValue&gt;1&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;IgnoreSoftLaunchFailures&quot;&gt;&#10;    &lt;curValue&gt;0&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;&lt;/PropertyValues&gt;&#10;"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_DEBUGGER_PROPERTIES./home/fw/ws_HD/hdfirmware/firmware/targetConfigs/RM46L852.ccxml.Texas Instruments XDS110 USB Debug Probe/CortexR4" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot; ?&gt;&#10;&lt;PropertyValues&gt;&#10;&#10;  &lt;property id=&quot;ConnectOnStartup&quot;&gt;&#10;    &lt;curValue&gt;1&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;EnableInstalledBreakpoint&quot;&gt;&#10;    &lt;curValue&gt;1&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;IgnoreSoftLaunchFailures&quot;&gt;&#10;    &lt;curValue&gt;0&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;FlashEraseSelection&quot;&gt;&#10;    &lt;curValue&gt;Necessary Sectors Only (for Program Load)&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;&lt;/PropertyValues&gt;&#10;"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_DEBUGGER_PROPERTIES./home/fw/wshd/hdfirmware/firmware/targetConfigs/RM46L852.ccxml.Texas Instruments XDS110 USB Debug Probe/CortexR4" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot; ?&gt;&#10;&lt;PropertyValues&gt;&#10;&#10;  &lt;property id=&quot;ConnectOnStartup&quot;&gt;&#10;    &lt;curValue&gt;1&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;EnableInstalledBreakpoint&quot;&gt;&#10;    &lt;curValue&gt;1&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;IgnoreSoftLaunchFailures&quot;&gt;&#10;    &lt;curValue&gt;0&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;&lt;/PropertyValues&gt;&#10;"/>
Index: firmware/.settings/org.eclipse.core.resources.prefs
===================================================================
diff -u -rda054e07ed923d897e58f77a14e21d864ac4d5b8 -rcd356a67e07af95b64122fe32e35e51c2190ac5d
--- firmware/.settings/org.eclipse.core.resources.prefs	(.../org.eclipse.core.resources.prefs)	(revision da054e07ed923d897e58f77a14e21d864ac4d5b8)
+++ firmware/.settings/org.eclipse.core.resources.prefs	(.../org.eclipse.core.resources.prefs)	(revision cd356a67e07af95b64122fe32e35e51c2190ac5d)
@@ -1,4 +1,25 @@
 eclipse.preferences.version=1
+encoding//Debug/App/Controllers/subdir_rules.mk=UTF-8
+encoding//Debug/App/Controllers/subdir_vars.mk=UTF-8
+encoding//Debug/App/Drivers/subdir_rules.mk=UTF-8
+encoding//Debug/App/Drivers/subdir_vars.mk=UTF-8
+encoding//Debug/App/Modes/subdir_rules.mk=UTF-8
+encoding//Debug/App/Modes/subdir_vars.mk=UTF-8
+encoding//Debug/App/Services/subdir_rules.mk=UTF-8
+encoding//Debug/App/Services/subdir_vars.mk=UTF-8
+encoding//Debug/App/Tasks/subdir_rules.mk=UTF-8
+encoding//Debug/App/Tasks/subdir_vars.mk=UTF-8
+encoding//Debug/FWCommon/FlashDriver/subdir_rules.mk=UTF-8
+encoding//Debug/FWCommon/FlashDriver/subdir_vars.mk=UTF-8
+encoding//Debug/FWCommon/subdir_rules.mk=UTF-8
+encoding//Debug/FWCommon/subdir_vars.mk=UTF-8
+encoding//Debug/makefile=UTF-8
+encoding//Debug/objects.mk=UTF-8
+encoding//Debug/source/subdir_rules.mk=UTF-8
+encoding//Debug/source/subdir_vars.mk=UTF-8
+encoding//Debug/sources.mk=UTF-8
+encoding//Debug/subdir_rules.mk=UTF-8
+encoding//Debug/subdir_vars.mk=UTF-8
 encoding//Release/App/Controllers/subdir_rules.mk=UTF-8
 encoding//Release/App/Controllers/subdir_vars.mk=UTF-8
 encoding//Release/App/Drivers/subdir_rules.mk=UTF-8
Index: firmware/App/Modes/ModeInitPOST.c
===================================================================
diff -u -rda054e07ed923d897e58f77a14e21d864ac4d5b8 -rcd356a67e07af95b64122fe32e35e51c2190ac5d
--- firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision da054e07ed923d897e58f77a14e21d864ac4d5b8)
+++ firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision cd356a67e07af95b64122fe32e35e51c2190ac5d)
@@ -106,8 +106,12 @@
             break;
 
         case POST_STATE_WATCHDOG:
+#ifndef RM46_EVAL_BOARD_TARGET
             testStatus = execWatchdogTest();
             postState = handlePOSTStatus( testStatus );  // ignoring return value because last test
+#else
+            postState = POST_STATE_RTC;
+#endif
             break;
 
         case POST_STATE_ALARM_LAMP:
Index: firmware/App/Services/WatchdogMgmt.c
===================================================================
diff -u -rf7e3018ec6ab762fe08efb42b21fb2ca970174b0 -rcd356a67e07af95b64122fe32e35e51c2190ac5d
--- firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision f7e3018ec6ab762fe08efb42b21fb2ca970174b0)
+++ firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision cd356a67e07af95b64122fe32e35e51c2190ac5d)
@@ -105,7 +105,7 @@
         petWatchdog();
         resetWDTaskCheckIns();
     }
-
+#ifndef RM46_EVAL_BOARD_TARGET
     // check to see if watchdog has expired
     if ( getCPLDWatchdogExpired() == PIN_SIGNAL_HIGH )
     {
@@ -118,8 +118,10 @@
 #endif
         }
     }
+#endif
 }
 
+
 /*************************************************************************
  * @brief checkInWithWatchdogMgmt
  * The checkInWithWatchdogMgmt function checks a given task in with the \n