Index: firmware/App/Modes/ModeInitPOST.c
===================================================================
diff -u -r7665e7b142961a50c5e77c44877247366a374526 -ra95967003ef6168c6cb3c0d35b9219936645eae6
--- firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision 7665e7b142961a50c5e77c44877247366a374526)
+++ firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision a95967003ef6168c6cb3c0d35b9219936645eae6)
@@ -103,7 +103,7 @@
         case POST_STATE_START:
             postState = POST_STATE_WATCHDOG;
 #ifdef SKIP_POST
-#ifndef RM46_EVAL_BOARD_TARGET
+#ifndef BOARD_WITH_NO_HARDWARE
             postState = POST_STATE_COMPLETED;
 #else
             postState = POST_STATE_NVDATAMGMT;
Index: firmware/App/Tasks/TaskBG.c
===================================================================
diff -u -r7665e7b142961a50c5e77c44877247366a374526 -ra95967003ef6168c6cb3c0d35b9219936645eae6
--- firmware/App/Tasks/TaskBG.c	(.../TaskBG.c)	(revision 7665e7b142961a50c5e77c44877247366a374526)
+++ firmware/App/Tasks/TaskBG.c	(.../TaskBG.c)	(revision a95967003ef6168c6cb3c0d35b9219936645eae6)
@@ -57,7 +57,7 @@
         // Wait for UI to come up after power up
         if ( FALSE == uiCommunicated() )
         {
-#ifndef RM46_EVAL_BOARD_TARGET
+#ifndef BOARD_WITH_NO_HARDWARE
 #ifndef SIMULATE_UI
             if ( TRUE == didTimeout( startUICommTimeout, MAX_TIME_FOR_UI_TO_COMMUNICATE_MS ) )
             {
Index: firmware/App/Tasks/TaskGeneral.c
===================================================================
diff -u -r7665e7b142961a50c5e77c44877247366a374526 -ra95967003ef6168c6cb3c0d35b9219936645eae6
--- firmware/App/Tasks/TaskGeneral.c	(.../TaskGeneral.c)	(revision 7665e7b142961a50c5e77c44877247366a374526)
+++ firmware/App/Tasks/TaskGeneral.c	(.../TaskGeneral.c)	(revision a95967003ef6168c6cb3c0d35b9219936645eae6)
@@ -65,7 +65,7 @@
     if ( TRUE == uiCommunicated() )
 #endif
     {
-#ifndef RM46_EVAL_BOARD_TARGET
+#ifndef BOARD_WITH_NO_HARDWARE
         // Monitor DG
         execDGInterfaceMonitor();
 
Index: firmware/App/Tasks/TaskPriority.c
===================================================================
diff -u -r7665e7b142961a50c5e77c44877247366a374526 -ra95967003ef6168c6cb3c0d35b9219936645eae6
--- firmware/App/Tasks/TaskPriority.c	(.../TaskPriority.c)	(revision 7665e7b142961a50c5e77c44877247366a374526)
+++ firmware/App/Tasks/TaskPriority.c	(.../TaskPriority.c)	(revision a95967003ef6168c6cb3c0d35b9219936645eae6)
@@ -55,7 +55,7 @@
     if ( TRUE == uiCommunicated() )
 #endif
     {
-#ifndef RM46_EVAL_BOARD_TARGET
+#ifndef BOARD_WITH_NO_HARDWARE
         // 1st pass for FPGA
         execFPGAIn();