# HG changeset patch
# User Michael Spacefalcon <msokolov@ivan.Harhan.ORG>
# Date 1404005212 0
# Node ID fe9e620c89ff31697500869be0748db860bddc4f
# Parent  dac495b0d222c692a870ea2d830809f8b5d8b026
loadtools on C155/156: use the flash mapping at 0x03000000

diff -r dac495b0d222 -r fe9e620c89ff loadtools/scripts/c155.config
--- a/loadtools/scripts/c155.config	Sat Jun 28 06:06:15 2014 +0000
+++ b/loadtools/scripts/c155.config	Sun Jun 29 01:26:52 2014 +0000
@@ -13,8 +13,8 @@
 init-script c155.init
 
 # Flash: use CFI autodetection, 8 MiB max
-# mapped at 0, see compal.init for the explanation
-flash cfi-8M 0
+# Unlike C139, C155 and C156 phones do have working flash mapping at 0x03000000
+flash cfi-8M 0x03000000
 
 # bottom boot flash, sector 0 is only 8 KiB
 boot-reflash-hack 0x820000 0x2000
diff -r dac495b0d222 -r fe9e620c89ff loadtools/scripts/c155.init
--- a/loadtools/scripts/c155.init	Sat Jun 28 06:06:15 2014 +0000
+++ b/loadtools/scripts/c155.init	Sun Jun 29 01:26:52 2014 +0000
@@ -3,14 +3,13 @@
 w16 fffffb00 00A3
 w16 fffffb02 00A3
 
-# We need to set the FFFF:FB10 register to map the flash (not the boot ROM)
-# to address 0, same as the basic compal.init version; see the latter for
-# the explanation.
-
-w16 fffffb10 0300
-
 # We need to switch the CS4/ADD22 pin from its default function of CS4
 # to the needed ADD22, to access the 8 MiB of flash.  Compal's C155/156
 # in-flash boot code does this setting, but let's do it ourselves too.
 
 w16 fffef006 0008
+
+# We don't mess with the FFFF:FB10 register on C155/156, i.e., we
+# leave the "enable boot ROM" setting established by compalstage.
+# Unlike C139, C155 and C156 phones do have working flash mapping
+# at 0x03000000, so we use that.