Patchwork [U-Boot] microblaze: Fix systems with MSR=0

login
register
mail settings
Submitter Michal Simek
Date Feb. 7, 2011, 9:39 a.m.
Message ID <1297071551-29295-1-git-send-email-monstr@monstr.eu>
Download mbox | patch
Permalink /patch/82088/
State Accepted
Commit b777a37c29f547f647ead4578f88f4bcfad52b10
Headers show

Comments

Michal Simek - Feb. 7, 2011, 9:39 a.m.
u-boot BSP generates XILINX_USE_MSR_INSTR macro
even for system with MSR=0. That's why explicitly
check that MSR=1.

Signed-off-by: Michal Simek <monstr@monstr.eu>
---
 arch/microblaze/include/asm/asm.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Patch

diff --git a/arch/microblaze/include/asm/asm.h b/arch/microblaze/include/asm/asm.h
index deb23e0..c89e904 100644
--- a/arch/microblaze/include/asm/asm.h
+++ b/arch/microblaze/include/asm/asm.h
@@ -62,7 +62,7 @@ 
 #define NOP	__asm__ __volatile__ ("nop");
 
 /* use machine status registe USE_MSR_REG */
-#ifdef XILINX_USE_MSR_INSTR
+#if XILINX_USE_MSR_INSTR == 1
 #define MSRSET(val) \
 	__asm__ __volatile__ ("msrset r0," #val );