--- a/gsm-fw/bsp/abb+spi/Makefile	Sun Aug 17 03:28:56 2014 +0000
+++ b/gsm-fw/bsp/abb+spi/Makefile	Sun Aug 17 03:38:58 2014 +0000
@@ -7,7 +7,7 @@
 OBJS=	abb.o spi_api.o spi_drv.o spi_env.o spi_process.o spi_task.o
 
 ifeq (${CONFIG_INCLUDE_L1},1)
-OBJS+=	abb_core_inth.o
+OBJS+=	abb_core_inth.o abb_inth.o
 endif
 
 HDRS=	abb.h abb_core_inth.h abb_inline.h abb_inth.h spi_api.h spi_drv.h \

--- a/gsm-fw/bsp/abb+spi/abb_inth.c	Sun Aug 17 03:28:56 2014 +0000
+++ b/gsm-fw/bsp/abb+spi/abb_inth.c	Sun Aug 17 03:38:58 2014 +0000
@@ -33,41 +33,41 @@
 /*                                                                            */
 /******************************************************************************/
 
-#include "l1sw.cfg"
-#include "chipset.cfg"
-#include "swconfig.cfg"
-#include "sys.cfg"
-
+#include "../../include/config.h"
+#include "../../include/sys_types.h"
+#include "../../riviera/rv/general.h"
+#include "../../nucleus/nucleus.h"      // for NUCLEUS functions and types
 
-#include "l1_macro.h"
-#include "l1_confg.h"
+#include "../../L1/include/l1_confg.h"
+#include "../../L1/include/l1_macro.h"
+
 #include <string.h>          
-#include "abb/abb_inth.h"
-#include "nucleus.h"
+#include "abb_inth.h"
 
-#include "rv/rv_defined_swe.h"     // for RVM_PWR_SWE
+#include "../../riviera/rv/rv_defined_swe.h"     // for RVM_PWR_SWE
 
 #if (CHIPSET == 12)
     #include "sys_inth.h"
 #else
-    #include "inth/iq.h"
+    #include "../iq.h"
 #endif
 
-#include "cust_os.h"
-#include "l1_signa.h"
-#include "abb/abb.h"
+#include "../../gpf/inc/cust_os.h"
+#include "../../L1/include/l1_signa.h"
+#include "abb.h"
 
 #if defined (OP_WCP)
   #include "ffs/ffs.h"
   #include "ffs/board/ffspcm.h"
 #endif
 
-#include "rvm/rvm_use_id_list.h"   // for SPI_USE_ID
-#include "spi/spi_env.h"
-#include "spi/spi_process.h"       // for ABB_EXT_IRQ_EVT
+#include "../../riviera/rvm/rvm_use_id_list.h"   // for SPI_USE_ID
+#include "spi_env.h"
+#include "spi_process.h"           // for ABB_EXT_IRQ_EVT
+#if 0	// FreeCalypso
 #include "kpd/kpd_power_api.h"     // for kpd_power_key_pressed()
 #include "power/power.h"	 
-
+#endif
 
 #ifdef RVM_LCC_SWE
   #include "lcc/lcc_api.h"
@@ -96,7 +96,12 @@
    extern T_PWR_CTRL_BLOCK *pwr_ctrl;
 #endif
 
-   
+/*
+ * FreeCalypso: the following logic, which makes sense for complete
+ * phones but not for Openmoko-style modems, has not been integrated
+ * yet.
+ */
+#if 0
    // check all the possible causes of the ABB IT
    if (*read_value & PUSHOFF_IT_STS)
    {
@@ -164,6 +169,11 @@
       /* 'Remote Power' from ON to OFF */
       Power_OFF_Remote();
    }
+#else
+   /* dummy to satisfy C */
+   if (0)
+      ;
+#endif
         
    else if (*read_value & ADCEND_IT_STS)
    {