diff -purN ../u-boot/CHANGELOG ./CHANGELOG
--- ../u-boot/CHANGELOG	2003-05-28 03:06:31.000000000 -0500
+++ ./CHANGELOG	2003-05-28 17:20:24.418516000 -0500
@@ -2,6 +2,10 @@
 Changes since U-Boot 0.3.1:
 ======================================================================
 
+* Patch by Matthew McClintock, 28 May 2003
+  cpu/mpc824x/start.S: no longer relocate code from sdram if we are in debug
+  mode.
+
 * Fix data abort exception handling for arm920t CPU
 
 * Fix alignment problems with flash driver for TRAB board
diff -purN ../u-boot/cpu/mpc824x/start.S ./cpu/mpc824x/start.S
--- ../u-boot/cpu/mpc824x/start.S	2003-05-22 17:53:09.000000000 -0500
+++ ./cpu/mpc824x/start.S	2003-05-28 17:17:52.089171000 -0500
@@ -542,7 +542,7 @@ relocate_code:
 	mr	r10, r5		/* Save copy of Destination Address	*/
 
 	mr	r3,  r5				/* Destination Address	*/
-#ifdef DEBUG
+#ifdef CFG_BOOT_IMAGE_FROM_RAM
 	lis	r4, CFG_SDRAM_BASE@h		/* Source      Address	*/
 	ori	r4, r4, CFG_SDRAM_BASE@l
 #else