--- a/doc/Compiling	Wed Nov 07 09:16:23 2018 +0000
+++ b/doc/Compiling	Wed Nov 07 09:34:02 2018 +0000
@@ -43,6 +43,7 @@
 
 c11x		Motorola C11x/12x
 c139		Motorola C139/140
+c155		Motorola C155/156
 fcdev3b		FreeCalypso FCDEV3B
 gtamodem	The Calypso GSM/GPRS modem in Openmoko GTA01/02 smartphones
 pirelli		Pirelli DP-L10
@@ -77,14 +78,14 @@
 
 	This setting enables or disables the FCHG battery charging driver.  By
 	default it is enabled on targets that have battery charging hardware
-	(c11x, c139, pirelli) and disabled on those that don't have such hw
-	(fcdev3b, gtamodem).
+	(c11x, c139, c155, pirelli) and disabled on those that don't have such
+	hw (fcdev3b, gtamodem).
 
 GPRS
 
 	Self-explanatory: enables or disables GPRS.  By default GPRS is enabled
 	on proper modem hw targets (fcdev3b and gtamodem) and disabled on c11x,
-	c139 and pirelli.
+	c139, c155 and pirelli.
 
 L1_DYN_DSP_DWNLD
 
@@ -119,6 +120,14 @@
 	the G23M protocol stack built on top of it.  This code has not been
 	properly studied yet; play with it at your own risk.
 
+RVTMUX_ON_MODEM
+
+	This setting configures the usage of Calypso UARTs.  RVTMUX_ON_MODEM=0
+	puts the AT command interface on the MODEM UART and RVTMUX on the IrDA
+	UART (TI's intended config and the default on sensible hw targets);
+	RVTMUX_ON_MODEM=1 (default on the crippled C1xx targets) puts RVTMUX on
+	the MODEM UART, sacrificing the standard AT command interface.
+
 SERIAL_DYNAMIC_SWITCH
 
 	TI's TCS211 fw includes a provision (only for Bluetooth-enabled fw in
@@ -148,8 +157,8 @@
 	SRVC=2: CSD enabled, but not fax
 
 	The default is SRVC=1 (fax and data enabled) for proper modem hw targets
-	(fcdev3b and gtamodem) and SRVC=0 (voice and SMS only) on c11x, c139
-	and pirelli.
+	(fcdev3b and gtamodem) and SRVC=0 (voice and SMS only) on c11x, c139,
+	c155 and pirelli.
 
 SUFFIX
 
@@ -197,12 +206,10 @@
 cl470 run, i.e., for each individual C source file.
 
 When the build is done, the flashable firmware image will be in fwimage.bin.
-This image is to be flashed with fc-loadtool at address 0x10000 on Mot C11x and
-C139 targets, and at address 0 on the more sensible targets that have the
-Calypso boot ROM enabled.  The build system also produces a short text file
-named flash-script which is a flashing command script for fc-loadtool that
-erases the correct range of flash sectors and then programs fwimage.bin at the
-right address.
+This image is to be flashed with fc-loadtool at a target-dependent base address.
+The build system also produces a short text file named flash-script which is a
+flashing command script for fc-loadtool that erases the correct range of flash
+sectors and then programs fwimage.bin at the right address.
 
 When building firmware for the FCDEV3B or for the Pirelli, one can build either
 a flashable image or a RAM-loadable one - or both.  Because this part of the
@@ -220,4 +227,4 @@
 device (flash or run in RAM as appropriate), you will need to use FreeCalypso
 host tools.  As of this writing, the latest packaged release is this one:
 
-ftp://ftp.freecalypso.org/pub/GSM/FreeCalypso/fc-host-tools-r8.tar.bz2
+ftp://ftp.freecalypso.org/pub/GSM/FreeCalypso/fc-host-tools-r9a.tar.bz2