--- a/src/cs/system/main/create_RVtasks.c	Fri May 15 04:01:28 2020 +0000
+++ b/src/cs/system/main/create_RVtasks.c	Fri May 15 04:25:10 2020 +0000
@@ -112,7 +112,7 @@
 
     rvt_register_id("TM", &etm_trace_user_id, etm_receive);
 
-#if (PSP_STANDALONE != 1)
+#if 0 //(PSP_STANDALONE != 1)
     tm_trace_user_id = etm_trace_user_id; // TML1 use the tm_trace_user_id
 #endif
 }
@@ -574,11 +574,13 @@
 #if (REMU==0) /* moved this to kpd start function.  rv_start function for REMU. rv_start is called from Application Initialize 
 context.  Since this is a blocking call, we cannot afford to block in Application_Initialization. */
 #ifndef _WINDOWS
+#if 0	/* FC FFS editor */
     // Perform switch ON processing.
     Switch_ON();
 #endif
+#endif
 
-#if (_GSM==1)
+#if 0 //(_GSM==1)
     BZ_KeyBeep_ON ();          // Audio feedback if ON/OFF pushed
 #endif // if (_GSM==1)
 
@@ -586,7 +588,7 @@
 #if (CHIPSET!=15) || (REMU==0)
     /* dump the Riviera memory state */
     rvf_delay (RVF_MS_TO_TICKS (300)) ;
-	rvf_dump_mem ();
+    rvf_dump_mem ();
     rvf_dump_pool();
     rvf_dump_tasks();
 #endif

--- a/src/cs/system/main/init.c	Fri May 15 04:01:28 2020 +0000
+++ b/src/cs/system/main/init.c	Fri May 15 04:25:10 2020 +0000
@@ -812,33 +812,12 @@
  *
  * Performs Drivers Initialization.
  */
-void Set_Switch_ON_Cause(void);
 void Init_Drivers(void)
 {
-
-#if (CHIPSET==15)
-	bspI2c_init();
-	bspTwl3029_init();
-
-	#if (OP_L1_STANDALONE == 0)
-		Set_Switch_ON_Cause();
-	#endif
-
-
-	/* Turn on DRP We will make VRMCC to device group Modem
-	 * And Switch it on.
-	 */
-	bspTwl3029_Power_setDevGrp(NULL,BSP_TWL3029_POWER_VRMMC,BSP_TWL3029_POWER_DEV_GRP_MODEM);
-	wait_ARM_cycles(convert_nanosec_to_cycles(100000*2));
-    bspTwl3029_Power_enable(NULL,BSP_TWL3029_POWER_VRMMC,BSP_TWL3029_POWER_STATE_ACTIVE);
-#endif
-
-#if (CHIPSET!=15)
   #if ABB_SEMAPHORE_PROTECTION
     // Create the ABB semaphore
     ABB_Sem_Create();
   #endif  // SEMAPHORE_PROTECTION
-#endif
 
   #if (OP_L1_STANDALONE == 0)
     /*
@@ -866,10 +845,8 @@
     /*
      * SIM Main Initialization.
      */
-    #if (CHIPSET!=15)
+    #if 0	/* FC FFS editor */
     	SIM_Initialize ();
-    #else
-	bspUicc_bootInit();
     #endif
   #endif
 }
@@ -949,10 +926,14 @@
  */
 void Init_Unmask_IT (void)
 {
+#if 0	/* FC FFS editor */
 	IQ_Unmask(IQ_FRAME);
+#endif
 	IQ_Unmask(IQ_UART_IRDA_IT);
 	IQ_Unmask(IQ_UART_IT);
+#if 0	/* FC FFS editor */
 	IQ_Unmask(IQ_ARMIO);
+#endif
 #if (L1_DYN_DSP_DWNLD == 1)
 	IQ_Unmask(IQ_API);
 #endif

--- a/src/cs/system/main/main.c	Fri May 15 04:01:28 2020 +0000
+++ b/src/cs/system/main/main.c	Fri May 15 04:25:10 2020 +0000
@@ -1,11 +1,15 @@
-/* trivial reconstruction from disassembly */
+/* modified for FC FFS editor */
 
 Application_Initialize()
 {
 	Init_Target();
 	Init_Drivers();
+#if 0
 	Cust_Init_Layer1();
+#endif
 	Init_Serial_Flows();
+#if 0
 	StartFrame();
+#endif
 	Init_Unmask_IT();
 }