CVS: blob/src/blob start.S,1.12,1.13

[Russ D. <ru...@us...>]

Update of /cvsroot/blob/blob/src/blob
In directory sc8-pr-cvs1:/tmp/cvs-serv1705

Modified Files:
	start.S 
Log Message:
add logic in start.S for s3c2500 switched map. Also, changed sign comparison (ble) to unsigned (bls)

Index: start.S
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/start.S,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- start.S	6 Aug 2003 22:55:41 -0000	1.12
+++ start.S	27 Nov 2003 03:32:28 -0000	1.13
@@ -83,6 +83,16 @@
 relocate:
 	/* relocate the second stage loader */
 	adr	r1, _start
+#if defined(S3C2500)
+	/* If we are reblobing, then copy from our position, otherwise
+	 * we need to copy from mapswitched flash */
+	cmp	r1, #0
+	bne	reblobed
+
+	/* its no longer _start because there is a map switch */
+	orr	r1, r1, #0x80000000
+reblobed:
+#endif
 
 	ldr	r0, piggy_start
 	add	r0, r0, r1
@@ -99,7 +109,7 @@
 	ldmia	r0!, {r3-r10}
 	stmia	r1!, {r3-r10}
 	cmp	r0, r2
-	ble	copy_loop
+	bls	copy_loop
 
 	/* blob is copied to ram, so jump to it */
 	ldr	r0, BLOB_START