# HG changeset patch
# User Michael Spacefalcon <msokolov@ivan.Harhan.ORG>
# Date 1409596737 0
# Node ID 1f54d2ba42c2eb767e2f71334d85eeda96135097
# Parent  da72b51c0572c926816a80b4d36b2c3d3a19a388
gsm-fw/sysglue/flashboot.S: be consistent with fc-xram for CS4/ADD22 switch

diff -r da72b51c0572 -r 1f54d2ba42c2 gsm-fw/sysglue/flashboot.S
--- a/gsm-fw/sysglue/flashboot.S	Mon Sep 01 18:20:58 2014 +0000
+++ b/gsm-fw/sysglue/flashboot.S	Mon Sep 01 18:38:57 2014 +0000
@@ -53,14 +53,18 @@
 	strh	r0, [r2, #2]
 #endif
 /*
- * Switch the CS4/ADD22 pin to the ADD22 function.  We only need this
- * setting on targets with 8 MiB flash (or XRAM) banks, but it doesn't
- * hurt to do it on all targets (like TI's original code does),
- * until and unless we encounter a target that uses the CS4 function.
+ * On targets with 8 MiB flash (or XRAM) banks we need to switch the
+ * CS4/ADD22 pin to the ADD22 function.  We could do it for all targets
+ * (not aware of any that need the pin to be CS4), but we strongly
+ * prefer to have a consistent execution environment between flashImage
+ * and ramImage, so let's only do this setting on those targets
+ * on which we do it in ../../loadtools/scripts/*.init (for fc-xram).
  */
+#if CONFIG_TARGET_PIRELLI || CONFIG_TARGET_C156
 	ldr	r1, =0xFFFEF006
 	mov	r2, #0x0008
 	strh	r2, [r1]
+#endif
 /* we now have full access to all flash and RAM on the device */
 /* copy iram.text to where it's supposed to be */
 	ldr	r8, =__iramtext_flash_addr