r1066 - trunk/src/target/u-boot/patches

werner at sita.openmoko.org werner at sita.openmoko.org
Wed Feb 21 02:11:09 CET 2007


Author: werner
Date: 2007-02-21 02:11:02 +0100 (Wed, 21 Feb 2007)
New Revision: 1066

Modified:
   trunk/src/target/u-boot/patches/uboot-neo1973-resume.patch
Log:
http://www.fluff.org/ben/openmoko/uboot-neo1973-resume5.patch



Modified: trunk/src/target/u-boot/patches/uboot-neo1973-resume.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-neo1973-resume.patch	2007-02-21 00:58:26 UTC (rev 1065)
+++ trunk/src/target/u-boot/patches/uboot-neo1973-resume.patch	2007-02-21 01:11:02 UTC (rev 1066)
@@ -3,7 +3,7 @@
 Signed-off-by: Ben Dooks <ben-linux at fluff.org>
 
 --- u-boot-1.2.0/board/neo1973/lowlevel_init.S	2007-02-20 00:49:00.000000000 +0000
-+++ u-boot-1.2.0-bjd1/board/neo1973/lowlevel_init.S	2007-02-20 01:34:50.000000000 +0000
++++ u-boot-1.2.0-bjd1/board/neo1973/lowlevel_init.S	2007-02-21 01:06:02.000000000 +0000
 @@ -40,6 +40,8 @@
   *
   */
@@ -40,7 +40,7 @@
  #if defined(CONFIG_ARCH_GTA01_v4) || defined(CONFIG_ARCH_GTA01B_v2) || defined(CONFIG_ARCH_GTA01B_v3)
  	/* switch on power for NAND */
  	ldr	r0, =0x56000010	/* GPBCON */
-@@ -165,7 +178,22 @@ lowlevel_init:
+@@ -165,7 +178,21 @@ lowlevel_init:
  	orr	r1, r1, #(1 <<2)
  	str	r1, [r0]
  #endif
@@ -52,13 +52,12 @@
 +	bpl	1b
 +	
 +	/* test for resume */
-+	ldr	r0, =0x560000B4		/* gstatus2 */
-+	ldr	r0, [ r0 ]
++	ldr	r1, =0x560000B4		/* gstatus2 */
++	ldr	r0, [ r1 ]
 +	tst	r0, #0x02		/* is this resume from power down */
 +	beq	not_resuming
 +
-+	ldr	r0, =0x560000B4		/* gstatus3 */
-+	ldr	pc, [r0]		/* resume execution */
++	ldr	pc, [r1, #4]		/* gstatus3 */
 +	
 +not_resuming:
  	/* everything is fine now */





More information about the commitlog mailing list