--- a/gsm-fw/gpf/conf/gsmcomp.c	Sat Jun 27 07:31:30 2015 +0000
+++ b/gsm-fw/gpf/conf/gsmcomp.c	Sat Jun 27 16:14:14 2015 +0000
@@ -382,11 +382,21 @@
 
 #define PRIMPOOL_3_PARTITIONS      6 /*  0 */ /* Number to be optimized */ 
 
-#ifdef TI_PS_UICC_CHIPSET_15
-#define PRIMPOOL_4_PARTITIONS      6 /* 10 */
-#else
-#define PRIMPOOL_4_PARTITIONS      5 /* 10 */
-#endif
+/*
+ * FreeCalypso change: bumping the number of 432-byte partitions in the
+ * voice-only config from 5 or 6 to 10.  Our FreeCalypso code appears to
+ * work with the original smaller config, but this warning is seen:
+
+SYSTEM WARNING: Bigger partition allocated than requested, entity SIM, Size 288
+
+ * SIM's request for size 288 will normally be allocated out of the 432 pool,
+ * but the next size up is the rare big one (used to be 900, we bumped it up
+ * to 1600), and wasting those is bad.  So let's give it some more 432-byte
+ * partitions.  (See the FAX_AND_DATA config above for comparison.)
+ */
+
+#define PRIMPOOL_4_PARTITIONS      10
+
 #define PRIMPOOL_5_PARTITIONS      3 /* FreeCalypso raised from 2 */
 
 #endif /* else, #ifdef FAX_AND_DATA */