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

[werner at sita.openmoko.org]

Author: werner
Date: 2008-01-12 22:19:34 +0100 (Sat, 12 Jan 2008)
New Revision: 3819

Added:
   trunk/src/target/u-boot/patches/boot-from-nor.patch
Modified:
   trunk/src/target/u-boot/patches/series
Log:
Initialize memory also when booting from NOR.

boot-from-nor.patch:
- cpu/arm920t/start.S: added low-level setup if executing from address 0



Added: trunk/src/target/u-boot/patches/boot-from-nor.patch
===================================================================
--- trunk/src/target/u-boot/patches/boot-from-nor.patch	2008-01-12 17:31:35 UTC (rev 3818)
+++ trunk/src/target/u-boot/patches/boot-from-nor.patch	2008-01-12 21:19:34 UTC (rev 3819)
@@ -0,0 +1,18 @@
+Index: u-boot/cpu/arm920t/start.S
+===================================================================
+--- u-boot.orig/cpu/arm920t/start.S
++++ u-boot/cpu/arm920t/start.S
+@@ -202,6 +202,13 @@
+ #endif /* CONFIG_S3C2410_NAND_BOOT */
+ 
+ relocate:				/* relocate U-Boot to RAM	    */
++#if !defined(CONFIG_SKIP_LOWLEVEL_INIT) && defined(CONFIG_LL_INIT_NAND_ONLY)
++	teq	r0, #0			/* running at address 0 ?	    */
++	bleq	cpu_init_crit		/* yes -> do low-level setup	    */
++#endif /* !CONFIG_SKIP_LOWLEVEL_INIT && CONFIG_LL_INIT_NAND_ONLY */
++
++	adr	r0, _start		/* the above may have clobbered r0  */
++
+ 	ldr	r1, _TEXT_BASE		/* test if we run from flash or RAM */
+ 	cmp     r0, r1                  /* don't reloc during debug         */
+ 	beq     done_relocate

Modified: trunk/src/target/u-boot/patches/series
===================================================================
--- trunk/src/target/u-boot/patches/series	2008-01-12 17:31:35 UTC (rev 3818)
+++ trunk/src/target/u-boot/patches/series	2008-01-12 21:19:34 UTC (rev 3819)
@@ -22,6 +22,7 @@
 
 boot-from-ram-reloc.patch
 boot-from-ram-and-nand.patch
+boot-from-nor.patch
 wakeup-reason-nand-only.patch
 uboot-neo1973-resume.patch