summaryrefslogtreecommitdiffstats
path: root/c/src/lib
diff options
context:
space:
mode:
authorTill Straumann <strauman@slac.stanford.edu>2011-07-18 16:37:25 +0000
committerTill Straumann <strauman@slac.stanford.edu>2011-07-18 16:37:25 +0000
commit96d81ef5169fbd85eca1240142511371a677b914 (patch)
tree997fb36ef07ccf05d5a82f1a039b2e117435fa48 /c/src/lib
parent2011-07-18 Till Straumann <strauman@slac.stanford.edu> (diff)
downloadrtems-96d81ef5169fbd85eca1240142511371a677b914.tar.bz2
2011-07-18 Till Straumann <strauman@slac.stanford.edu>
* shared/bootloader/head.S: disable USE_PPCBUG under qemu.
Diffstat (limited to 'c/src/lib')
-rw-r--r--c/src/lib/libbsp/powerpc/ChangeLog4
-rw-r--r--c/src/lib/libbsp/powerpc/shared/bootloader/head.S3
2 files changed, 7 insertions, 0 deletions
diff --git a/c/src/lib/libbsp/powerpc/ChangeLog b/c/src/lib/libbsp/powerpc/ChangeLog
index 79881ea8d8..4fed9877ab 100644
--- a/c/src/lib/libbsp/powerpc/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/ChangeLog
@@ -1,5 +1,9 @@
2011-07-18 Till Straumann <strauman@slac.stanford.edu>
+ * shared/bootloader/head.S: disable USE_PPCBUG under qemu.
+
+2011-07-18 Till Straumann <strauman@slac.stanford.edu>
+
* shared/startup/bspstart.c: Select console *before* doing
any potential printk() (e.g., panic).
diff --git a/c/src/lib/libbsp/powerpc/shared/bootloader/head.S b/c/src/lib/libbsp/powerpc/shared/bootloader/head.S
index 14ece61bfb..f768a3661c 100644
--- a/c/src/lib/libbsp/powerpc/shared/bootloader/head.S
+++ b/c/src/lib/libbsp/powerpc/shared/bootloader/head.S
@@ -18,6 +18,7 @@
#include <rtems/asm.h>
#include <rtems/score/cpu.h>
#include "bootldr.h"
+#include <bspopts.h>
#define TEST_PPCBUG_CALLS
#undef TEST_PPCBUG_CALLS
@@ -27,7 +28,9 @@
#define INVL_CACHES (HID0_DCI | HID0_ICFI)
#define ENBL_CACHES (HID0_DCE | HID0_ICE)
+#ifndef qemu
#define USE_PPCBUG
+#endif
#define PRINT_CHAR(c) \
addi r20,r3,0 ; \