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

[laforge at sita.openmoko.org]

Author: laforge
Date: 2007-02-24 14:47:14 +0100 (Sat, 24 Feb 2007)
New Revision: 1102

Modified:
   trunk/src/target/u-boot/patches/series
   trunk/src/target/u-boot/patches/wakeup-reason-nand-only.patch
Log:
merge and activate wakeup-reason-nand-only.patch, it's not the culprit


Modified: trunk/src/target/u-boot/patches/series
===================================================================
--- trunk/src/target/u-boot/patches/series	2007-02-24 13:21:16 UTC (rev 1101)
+++ trunk/src/target/u-boot/patches/series	2007-02-24 13:47:14 UTC (rev 1102)
@@ -24,7 +24,7 @@
 
 #boot-from-ram-reloc.patch
 #boot-from-ram-and-nand.patch
-#wakeup-reason-nand-only.patch
+wakeup-reason-nand-only.patch
 #uboot-neo1973-resume.patch
 
 uboot-arm920t-gd_in_irq.patch

Modified: trunk/src/target/u-boot/patches/wakeup-reason-nand-only.patch
===================================================================
--- trunk/src/target/u-boot/patches/wakeup-reason-nand-only.patch	2007-02-24 13:21:16 UTC (rev 1101)
+++ trunk/src/target/u-boot/patches/wakeup-reason-nand-only.patch	2007-02-24 13:47:14 UTC (rev 1102)
@@ -10,9 +10,9 @@
 
 Index: u-boot/board/neo1973/neo1973.c
 ===================================================================
---- u-boot.orig/board/neo1973/neo1973.c
-+++ u-boot/board/neo1973/neo1973.c
-@@ -193,12 +193,16 @@ int board_init (void)
+--- u-boot.orig/board/neo1973/neo1973.c	2007-02-24 14:43:12.000000000 +0100
++++ u-boot/board/neo1973/neo1973.c	2007-02-24 14:43:14.000000000 +0100
+@@ -193,12 +193,16 @@
  
  int board_late_init(void)
  {
@@ -29,7 +29,7 @@
  	/* obtain wake-up reason, save INT1 in environment */
  	tmp = pcf50606_reg_read(PCF50606_REG_INT1);
  	sprintf(buf, "0x%02x", tmp);
-@@ -241,6 +245,7 @@ int board_late_init(void)
+@@ -241,6 +245,7 @@
  		neo1973_poweroff();
  	}
  
@@ -39,30 +39,28 @@
  
 Index: u-boot/cpu/arm920t/start.S
 ===================================================================
---- u-boot.orig/cpu/arm920t/start.S
-+++ u-boot/cpu/arm920t/start.S
-@@ -77,6 +77,14 @@ _fiq:			.word fiq
+--- u-boot.orig/cpu/arm920t/start.S	2007-02-24 14:43:12.000000000 +0100
++++ u-boot/cpu/arm920t/start.S	2007-02-24 14:45:20.000000000 +0100
+@@ -77,6 +77,12 @@
   *************************************************************************
   */
  
-+#ifdef CONFIG_S3C2410_NAND_BOOT
 +.globl	booted_from_nand
 +booted_from_nand:
 +	.word	0
 +_booted_from_nand:
 +	.word	booted_from_nand
-+#endif /* CONFIG_S3C2410_NAND_BOOT */
 +
  _TEXT_BASE:
  	.word	TEXT_BASE
  
-@@ -281,6 +289,9 @@ notmatch:
+@@ -269,6 +275,9 @@
  #endif
  1:	b	1b
  done_nand_read:
 +	ldr	r0, _booted_from_nand
 +	mov	r1, #1
 +	strb	r1, [r0]
- #endif /* CONFIG_S3C2410_NAND_BOOT */
- done_relocate:
- #endif /* CONFIG_SKIP_RELOCATE_UBOOT */
+ #endif /* NAND_BOOT */
+ #endif	/* CONFIG_SKIP_RELOCATE_UBOOT */
+