--- a/nuc-fw/bsp/Makefile	Thu Oct 31 23:08:59 2013 +0000
+++ b/nuc-fw/bsp/Makefile	Fri Nov 01 01:31:39 2013 +0000
@@ -1,8 +1,7 @@
 CC=	arm-elf-gcc
 CFLAGS=	-O2 -fno-builtin -mthumb-interwork
 ASFLAGS=-mthumb-interwork
-AR=	arm-elf-ar
-RANLIB=	arm-elf-ranlib
+LD=	arm-elf-ld
 
 IOBJS=	niq32.o
 
@@ -11,14 +10,18 @@
 XOBJS=	${XTOBJS}
 AOBJS=	${IOBJS}
 
-HDRS=
+HDRS=	armio.h clkm.h dma.h inth.h iq.h mem.h rhea_arm.h sim.h timer.h \
+	timer1.h timer2.h ulpd.h
 
-all:	${IOBJS} ${XOBJS}
+all:	${IOBJS} ${XOBJS} xipcode.o
 
 ${AOBJS}:	${HDRS}
 
 ${XTOBJS}:	%.o : %.c ${HDRS}
 	${CC} ${CFLAGS} -mthumb -c $<
 
+xipcode.o:	${XOBJS}
+	${LD} -r -o $@ ${XOBJS}
+
 clean:
 	rm -f *.[oa] *errs

--- a/nuc-fw/bsp/niq32.c	Thu Oct 31 23:08:59 2013 +0000
+++ b/nuc-fw/bsp/niq32.c	Fri Nov 01 01:31:39 2013 +0000
@@ -33,6 +33,8 @@
 #include "ulpd.h"
 #include "armio.h"
 
+#include "../serial/serialswitch.h"
+
 #if 0
 
 /* original maze of includes */
@@ -141,8 +143,6 @@
 unsigned IQ_GsmTimerCount; /* Used to check if GSM Timer IT */
 
 /* FreeCalypso: the following interrupt handlers remain to be integrated */
-#define	SER_uart_modem_handler	IQ_Dummy
-#define	SER_uart_irda_handler	IQ_Dummy
 #define	SIM_IntHandler		IQ_Dummy
 #define	SIM_CD_IntHandler	IQ_Dummy
 

--- a/nuc-fw/finlink/Makefile	Thu Oct 31 23:08:59 2013 +0000
+++ b/nuc-fw/finlink/Makefile	Fri Nov 01 01:31:39 2013 +0000
@@ -9,8 +9,8 @@
 LIBGCC_A=	`${CC} -print-file-name=libgcc.a -mthumb-interwork`
 LIBGCC_T=	`${CC} -print-file-name=libgcc.a -mthumb-interwork -mthumb`
 
-LOCAL_LIBS=	../nucleus/libplus.iram.a ../nucleus/libplus.xip.a \
-		../sprintf/libsprintf.a
+LOCAL_LIBS=	../sprintf/libsprintf.a \
+		../nucleus/libplus.xip.a ../nucleus/libplus.iram.a
 
 INT_PIECES=	../sysglue/sysinit.o
 EXT_PIECES=	../nucdemo/demo.o
@@ -32,7 +32,7 @@
 
 ramImage.elf:	iramcode.o xipcode.o ${LOCAL_LIBS} ramImage.ld
 	${LD} -N -T ramImage.ld -o $@ -Map ramImage.map iramcode.o xipcode.o \
-		--start-group ${LOCAL_LIBS} --end-group \
+		${LOCAL_LIBS} \
 		--start-group ${LIBC_A} ${LIBGCC_A} --end-group
 
 ramImage.srec:	ramImage.elf

--- a/nuc-fw/serial/init.c	Thu Oct 31 23:08:59 2013 +0000
+++ b/nuc-fw/serial/init.c	Fri Nov 01 01:31:39 2013 +0000
@@ -21,20 +21,27 @@
 
 const T_AppliSerialInfo appli_ser_cfg_info = {
 	/*
-	 * Default configuration: for now we always set it
-	 * to the "standard" 0x0168; later we may add
-	 * compile-time conditionals based on FreeCalypso
-	 * configuration magic.
+	 * Default configuration: set it to the "standard"
+	 * 0x0168, unless the RVTMUX serial channel has been
+	 * moved to the MODEM UART.
 	 */
+	#if CONFIG_RVTMUX_ON_MODEM
+              {DUMMY_BT_HCI,
+               DUMMY_FAX_DATA,
+               UART_MODEM_TRACE,
+               DUMMY_TRACE},       // 0x0248
+	#else
               {DUMMY_BT_HCI,
                UART_MODEM_FAX_DATA,
                UART_IRDA_TRACE,
-              DUMMY_TRACE},    // default config = 0x0168
-  #ifdef BTEMOBILE
+               DUMMY_TRACE},    // default config = 0x0168
+	#endif
+	/* number of possible configs */
+	#ifdef BTEMOBILE
              12,	// 12 serial config allowed
-  #else // BTEMOBILE
+	#else // BTEMOBILE
              9,	// 9 serial config allowed
-  #endif
+	#endif
              {
               // Configs with Condat Panel only
               {DUMMY_BT_HCI,
@@ -73,7 +80,7 @@
                UART_MODEM_FAX_DATA,
                DUMMY_TRACE,
                UART_IRDA_TRACE},   // 0x1068
-  #ifdef BTEMOBILE
+	#ifdef BTEMOBILE
               // Configs with L1/Riviera Trace and Bluetooth HCI
               {UART_IRDA_BT_HCI,
                DUMMY_FAX_DATA,
@@ -88,7 +95,7 @@
                UART_MODEM_FAX_DATA,
                DUMMY_TRACE,
                DUMMY_TRACE},       // 0x0069
-  #endif // BTEMOBILE
+	#endif // BTEMOBILE
               // Configs with L1/Riviera Trace and AT-Cmd
               {DUMMY_BT_HCI,
                UART_MODEM_FAX_DATA,