--- a/gsm-fw/sysglue/flashboot.S	Sat Oct 31 03:26:15 2015 +0000
+++ b/gsm-fw/sysglue/flashboot.S	Sat Oct 31 03:47:18 2015 +0000
@@ -47,19 +47,20 @@
 	.word	_Flash_boot_entry
 #elif CONFIG_TARGET_C139
 /*
- * On this target we are going to put a special flash boot stage at 0x2000,
- * and then the actual gsm-fw image at the flash erase block boundary
- * at 0x10000.  The following bits will be read by our intermediate
- * flash boot stage.
+ * On this target we'll put a patched version of Compal's boot code in
+ * flash sector 0 (the brickable one); the main fw images will then be
+ * flashed starting at 0x10000, which is where our modified boot code
+ * expects them to be.  The interface between our hacked boot code and
+ * the main fw has been made to mimic TI's TCS211 reference fw.
  */
-	.asciz	"FreeCalypso"
-	.word	_Flash_boot_entry
+#include "vectors.S"
+	.org	0x58	/* put _Flash_boot_entry at 0x10058 */
 #elif CONFIG_TARGET_C155
 /*
  * On this target the hand-off point between the bootloader and the main
- * fw image coincides with a flash erase block boundary, thus no need
- * for an intermediate flash boot stage.  The following bits will appear
- * at 0x20000.
+ * fw image coincides with a flash erase block boundary, thus we can reuse
+ * the original bootloader without having to reflash the brickable sector
+ * at all.  The following bits will appear at 0x20000.
  */
 	.asciz	"FreeCalypso firmware for C155/156 target"
 	.org	0xE0