summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2012-11-30 07:15:27 -0700
committerTom Rini <trini@ti.com>2012-11-30 07:15:27 -0700
commitb04eb342af72d5dbcc29ccd7f3f9475044113361 (patch)
treefb236d495c2dfe2a2cacf93a9b5ef09ddf52d841 /arch
parentf3269ad4e8faa4e9803245dd13ef0dc83f0339fc (diff)
parent7c791b3f0a8e42f8012f782ef56ad6e88858e7c4 (diff)
downloadblackbird-obmc-uboot-b04eb342af72d5dbcc29ccd7f3f9475044113361.tar.gz
blackbird-obmc-uboot-b04eb342af72d5dbcc29ccd7f3f9475044113361.zip
Merge branch 'master' of git://git.denx.de/u-boot-sh
Diffstat (limited to 'arch')
-rw-r--r--arch/sh/include/asm/system.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/include/asm/system.h b/arch/sh/include/asm/system.h
index 56fd77acea..24b5ce8e30 100644
--- a/arch/sh/include/asm/system.h
+++ b/arch/sh/include/asm/system.h
@@ -274,8 +274,8 @@ void enable_hlt(void);
static inline void trigger_address_error(void)
{
+ set_bl_bit();
__asm__ __volatile__ (
- "ldc %0, sr\n\t"
"mov.l @%1, %0"
:
: "r" (0x10000000), "r" (0x80000001)
OpenPOWER on IntegriCloud