--- a/loadtools/scripts/c155.config	Tue May 28 07:20:14 2019 +0000
+++ b/loadtools/scripts/c155.config	Tue May 28 07:42:39 2019 +0000
@@ -1,5 +1,5 @@
 # This configuration is for Motorola C155/156 phones.  Use the "generic"
-# compal configuration for C11x/123 and C139/140.
+# compal configuration for C11x/12x and C139/140.
 
 compal-stage thumb
 
@@ -12,14 +12,8 @@
 # The remaining settings are carried out via loadagent commands
 init-script c155.init
 
-# 8 MiB flash, accessible at 0x03000000 without the strange issue
-# seen on the lower C1xx models, but the flash chip turns out to have
-# partition quirks like the one on the D-Sample, so we need to
-# tell fc-loadtool about it explicitly instead of using CFI.
-# The actual chip in these phones is a flash+RAM MCP, but the flash part
-# is exactly the same as the 28F640W30B on the D-Sample (same geometry,
-# same ID codes), so we just tell fc-loadtool that it's a 28F640W30B.
-flash 28f640w30b 0x03000000
+# 8 MiB flash, accessible at 0x03000000 without any problems
+flash single-8M 0x03000000
 
 # bottom boot flash, sector 0 is only 8 KiB
 boot-reflash-hack 0x820000 0x2000

--- a/loadtools/scripts/compal.config	Tue May 28 07:20:14 2019 +0000
+++ b/loadtools/scripts/compal.config	Tue May 28 07:42:39 2019 +0000
@@ -1,10 +1,10 @@
-# This configuration is intended to be applicable to all of C11x, C123,
+# This configuration is intended to be applicable to all of C11x, C12x,
 # C139 and C140.  The "plain" version of compalstage selected below
-# should work for all C11x/123; it will also work on C139/140 phones
-# that had the simpler boot code flashed into them, as will be used for
-# FreeCalypso.  When running loadtools with this config on C139/140
-# phones that still have the "official" fw in them, one will need to
-# specify -h compal -c 1003 to use the inefficient ~15 KiB version of
+# should work for all C11x/12x; it will also work on C139/140 phones
+# that had the simpler boot code flashed into them, as we do with
+# FreeCalypso fw on these phones.  When running loadtools with this config
+# on C139/140 phones that still have the official fw in them, one will need
+# to specify -h compal -c 1004 to use the inefficient ~15 KiB version of
 # compalstage.
 
 compal-stage plain
@@ -26,9 +26,9 @@
 # The remaining settings are carried out via loadagent commands
 init-script compal.init
 
-# Flash: use CFI autodetection, 4 MiB max
+# Flash can be 2 MiB or 4 MiB, will be autodetected, 4 MiB mapping used
 # mapped at 0, see compal.init for the explanation
-flash cfi-4M 0
+flash single-4M 0
 
 boot-reflash-hack 0x820000 0x10000
 

--- a/loadtools/scripts/dsample.config	Tue May 28 07:20:14 2019 +0000
+++ b/loadtools/scripts/dsample.config	Tue May 28 07:42:39 2019 +0000
@@ -14,10 +14,8 @@
 # The remaining settings are carried out via loadagent commands
 init-script cs2-4ws-8mb.init
 
-# 8 MiB flash, accessible at 0x03000000 without Compal-like problems,
-# but the 28F640W30B flash chip has partition quirks, so we need to
-# tell fc-loadtool about it explicitly instead of using CFI.
-flash 28f640w30b 0x03000000
+# 8 MiB flash, accessible at 0x03000000 without any problems
+flash single-8M 0x03000000
 
 # Perform a Iota poweroff when we are done
 exit-mode iota-off

--- a/loadtools/scripts/fcfam.config	Tue May 28 07:20:14 2019 +0000
+++ b/loadtools/scripts/fcfam.config	Tue May 28 07:42:39 2019 +0000
@@ -15,8 +15,8 @@
 # The remaining settings are carried out via loadagent commands
 init-script cs2-4ws-8mb.init
 
-# Flash type and chip select base addresses
-flash pl129n 0x03000000 0x01800000
+# Flash global config and chip select base addresses
+flash dual-8M 0x03000000 0x01800000
 
 # Perform a Iota poweroff when we are done
 exit-mode iota-off

--- a/loadtools/scripts/gta02.config	Tue May 28 07:20:14 2019 +0000
+++ b/loadtools/scripts/gta02.config	Tue May 28 07:42:39 2019 +0000
@@ -14,5 +14,5 @@
 # Configure memory timings with loadagent commands
 init-script k5a3281.init
 
-# Flash type and chip select base address (full access mapping)
-flash k5a32xx_t 0x03000000
+# Flash access mapping
+flash single-4M 0x03000000

--- a/loadtools/scripts/pirelli.config	Tue May 28 07:20:14 2019 +0000
+++ b/loadtools/scripts/pirelli.config	Tue May 28 07:42:39 2019 +0000
@@ -6,8 +6,8 @@
 # The remaining settings are carried out via loadagent commands
 init-script pirelli.init
 
-# Flash type and chip select base addresses
-flash pl129n 0x03000000 0x02000000
+# Flash global config and chip select base addresses
+flash dual-8M 0x03000000 0x02000000
 
 # On this phone the current best exit strategy is jump0.
 # A Iota power-off, even if we implement one, won't be any different: