From patchwork Mon Feb 7 09:39:10 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 82088 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 53D72B7088 for ; Mon, 7 Feb 2011 20:39:23 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id D6126281AF; Mon, 7 Feb 2011 10:39:21 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ITQw2IoiHw2u; Mon, 7 Feb 2011 10:39:21 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E5F59281A3; Mon, 7 Feb 2011 10:39:19 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 1865A281AC for ; Mon, 7 Feb 2011 10:39:18 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Gxmh93V6dsPA for ; Mon, 7 Feb 2011 10:39:16 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-fx0-f44.google.com (mail-fx0-f44.google.com [209.85.161.44]) by theia.denx.de (Postfix) with ESMTPS id 057B42818E for ; Mon, 7 Feb 2011 10:39:14 +0100 (CET) Received: by fxm9 with SMTP id 9so5105370fxm.3 for ; Mon, 07 Feb 2011 01:39:14 -0800 (PST) Received: by 10.223.83.8 with SMTP id d8mr14599236fal.94.1297071554501; Mon, 07 Feb 2011 01:39:14 -0800 (PST) Received: from localhost ([178.23.216.97]) by mx.google.com with ESMTPS id r24sm1073701fax.27.2011.02.07.01.39.13 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 07 Feb 2011 01:39:13 -0800 (PST) From: Michal Simek To: u-boot@lists.denx.de Date: Mon, 7 Feb 2011 10:39:10 +0100 Message-Id: <1297071551-29295-1-git-send-email-monstr@monstr.eu> X-Mailer: git-send-email 1.5.5.1 Subject: [U-Boot] [PATCH] microblaze: Fix systems with MSR=0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.9 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de 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 --- arch/microblaze/include/asm/asm.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) 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 );