--- a/gsm-fw/services/ffs/cfgffs.c	Sun Nov 01 03:05:06 2015 +0000
+++ b/gsm-fw/services/ffs/cfgffs.c	Sun Nov 01 03:39:51 2015 +0000
@@ -37,22 +37,41 @@
     .numblocks	   = 7,
 };
 
-#elif CONFIG_PIRHACK_FFS
+#elif CONFIG_AFTERMARKET_FFS
+
+/* see ../../cfgmagic/feature.aftermarket-ffs */
+
+#if CONFIG_TARGET_COMPAL
 
-/* see ../../cfgmagic/feature.pirhack-ffs */
+struct dev_s dev = {
+    .base	   = (char *) (CONFIG_AFTERMARKET_FFS_START * 0x10000),
+    .manufact	   = MANUFACT_INTEL,
+    .blocksize	   = 0x10000,
+    .blocksize_ld  = 16,
+    .driver	   = FFS_DRIVER_INTEL_SB,
+    .numblocks	   = CONFIG_AFTERMARKET_FFS_NBLOCKS,
+};
+
+#elif CONFIG_TARGET_PIRELLI
 
 struct dev_s dev = {
     .base	   = (char *) FLASH2_BASE_ADDR +
-				CONFIG_PIRHACK_FFS_START * 0x40000,
+				CONFIG_AFTERMARKET_FFS_START * 0x40000,
     .manufact	   = MANUFACT_AMD,
     .blocksize	   = 0x40000,
     .blocksize_ld  = 18,
     .driver	   = FFS_DRIVER_AMD,
-    .numblocks	   = CONFIG_PIRHACK_FFS_NBLOCKS,
+    .numblocks	   = CONFIG_AFTERMARKET_FFS_NBLOCKS,
 };
 
 #else
 
+#error "Unknown target for CONFIG_AFTERMARKET_FFS"
+
+#endif
+
+#else
+
 #error "No valid FFS configuration defined"
 
 #endif