summaryrefslogtreecommitdiffstats
path: root/c/src/lib/libbsp
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2003-09-29 21:42:57 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2003-09-29 21:42:57 +0000
commitb56a278a1078d870b9be91c62915dffd1df8832f (patch)
tree17d8cd6dd92907ad5ee5676ea86a2f4e15c5336e /c/src/lib/libbsp
parent2003-09-29 Joel Sherrill <joel@OARcorp.com> (diff)
downloadrtems-b56a278a1078d870b9be91c62915dffd1df8832f.tar.bz2
2003-09-29 Till Strauman <strauman@slac.stanford.edu>
PR 497/bsps * bootloader/head.S: Disable code that returned to the firmware when the loader starts.
Diffstat (limited to 'c/src/lib/libbsp')
-rw-r--r--c/src/lib/libbsp/powerpc/shared/ChangeLog6
-rw-r--r--c/src/lib/libbsp/powerpc/shared/bootloader/head.S4
2 files changed, 8 insertions, 2 deletions
diff --git a/c/src/lib/libbsp/powerpc/shared/ChangeLog b/c/src/lib/libbsp/powerpc/shared/ChangeLog
index bec24b2a92..0583895a99 100644
--- a/c/src/lib/libbsp/powerpc/shared/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/shared/ChangeLog
@@ -1,3 +1,9 @@
+2003-09-29 Till Strauman <strauman@slac.stanford.edu>
+
+ PR 497/bsps
+ * bootloader/head.S: Disable code that returned to the firmware when
+ the loader starts.
+
2003-09-26 Till Strauman <strauman@slac.stanford.edu>
PR 496/bsps
diff --git a/c/src/lib/libbsp/powerpc/shared/bootloader/head.S b/c/src/lib/libbsp/powerpc/shared/bootloader/head.S
index 51be3126a0..3d5d010fb5 100644
--- a/c/src/lib/libbsp/powerpc/shared/bootloader/head.S
+++ b/c/src/lib/libbsp/powerpc/shared/bootloader/head.S
@@ -76,7 +76,7 @@
* code area, so that simple C routines can be called.
*/
start:
-#if defined(USE_PPCBUG) && defined(DEBUG)
+#if defined(USE_PPCBUG) && defined(DEBUG) && defined(REENTER_MONITOR)
MONITOR_ENTER
#endif
bl 1f
@@ -308,7 +308,7 @@ moved: lwz r1,stack(bd)
mtspr HID0,r0
/* Provisional return to FW, works for PPCBug */
-#if 0
+#if 0 && defined(REENTER_MONITOR)
MONITOR_ENTER
#else
1: bctr