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

[werner at sita.openmoko.org]

Author: werner
Date: 2007-06-05 03:10:04 +0200 (Tue, 05 Jun 2007)
New Revision: 2154

Modified:
   trunk/src/target/u-boot/patches/uboot-20061030-neo1973.patch
   trunk/src/target/u-boot/patches/uboot-20061030-qt2410.patch
Log:
uboot-20061030-neo1973.patch:

board/neo1973/common/lowlevel_init.S (lowlevel_init): use PC-relative
  addressing so that lowlevel_init can be safely called multiple times

uboot-20061030-qt2410.patch:

board/qt2410/lowlevel_init.S (lowlevel_init): use PC-relative
  addressing so that lowlevel_init can be safely called multiple times



Modified: trunk/src/target/u-boot/patches/uboot-20061030-neo1973.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-20061030-neo1973.patch	2007-06-04 19:18:52 UTC (rev 2153)
+++ trunk/src/target/u-boot/patches/uboot-20061030-neo1973.patch	2007-06-05 01:10:04 UTC (rev 2154)
@@ -1003,7 +1003,7 @@
 ===================================================================
 --- /dev/null
 +++ u-boot/board/neo1973/common/lowlevel_init.S
-@@ -0,0 +1,189 @@
+@@ -0,0 +1,187 @@
 +/*
 + * Memory Setup stuff - taken from blob memsetup.S
 + *
@@ -1144,9 +1144,7 @@
 +	/* memory control configuration */
 +	/* make r0 relative the current location so that it */
 +	/* reads SMRDATA out of FLASH rather than memory ! */
-+	ldr     r0, =SMRDATA
-+	ldr	r1, _TEXT_BASE
-+	sub	r0, r0, r1
++	adr	r0, SMRDATA
 +	ldr	r1, =BWSCON	/* Bus Width Status Controller */
 +	add     r2, r0, #13*4
 +0:

Modified: trunk/src/target/u-boot/patches/uboot-20061030-qt2410.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-20061030-qt2410.patch	2007-06-04 19:18:52 UTC (rev 2153)
+++ trunk/src/target/u-boot/patches/uboot-20061030-qt2410.patch	2007-06-05 01:10:04 UTC (rev 2154)
@@ -547,7 +547,7 @@
 ===================================================================
 --- /dev/null
 +++ u-boot/board/qt2410/lowlevel_init.S
-@@ -0,0 +1,173 @@
+@@ -0,0 +1,171 @@
 +/*
 + * Memory Setup stuff - taken from blob memsetup.S
 + *
@@ -685,9 +685,7 @@
 +	/* memory control configuration */
 +	/* make r0 relative the current location so that it */
 +	/* reads SMRDATA out of FLASH rather than memory ! */
-+	ldr     r0, =SMRDATA
-+	ldr	r1, _TEXT_BASE
-+	sub	r0, r0, r1
++	adr	r0, SMRDATA
 +	ldr	r1, =BWSCON	/* Bus Width Status Controller */
 +	add     r2, r0, #13*4
 +0: