From patchwork Mon Nov 5 01:53:13 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yoshihiro Shimoda X-Patchwork-Id: 197119 X-Patchwork-Delegate: iwamatsu@nigauri.org 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 1A9702C00AC for ; Mon, 5 Nov 2012 12:58:37 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 7648C4A1E7; Mon, 5 Nov 2012 02:58:32 +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 n48fv-ETa3xQ; Mon, 5 Nov 2012 02:58:32 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 705A34A1C5; Mon, 5 Nov 2012 02:58:29 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E218B4A1C5 for ; Mon, 5 Nov 2012 02:58:27 +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 lIMZgIA9+3bk for ; Mon, 5 Nov 2012 02:58:26 +0100 (CET) X-Greylist: delayed 303 seconds by postgrey-1.27 at theia; Mon, 05 Nov 2012 02:58:25 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 relmlor1.renesas.com (relmlor1.renesas.com [210.160.252.171]) by theia.denx.de (Postfix) with ESMTP id 9768B4A1AD for ; Mon, 5 Nov 2012 02:58:25 +0100 (CET) Received: from relmlir1.idc.renesas.com ([10.200.68.151]) by relmlor1.idc.renesas.com ( SJSMS) with ESMTP id <0MCZ001D1RWPJS50@relmlor1.idc.renesas.com> for u-boot@lists.denx.de; Mon, 05 Nov 2012 10:53:13 +0900 (JST) Received: from relmlac3.idc.renesas.com ([10.200.69.23]) by relmlir1.idc.renesas.com (SJSMS) with ESMTP id <0MCZ00142RWOS420@relmlir1.idc.renesas.com> for u-boot@lists.denx.de; Mon, 05 Nov 2012 10:53:13 +0900 (JST) Received: by relmlac3.idc.renesas.com (Postfix, from userid 0) id C99801809F; Mon, 05 Nov 2012 10:53:13 +0900 (JST) Received: from relmlac3.idc.renesas.com (localhost [127.0.0.1]) by relmlac3.idc.renesas.com (Postfix) with ESMTP id C541A1809C; Mon, 05 Nov 2012 10:53:13 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac3.idc.renesas.com with ESMTP id LAA10510; Mon, 05 Nov 2012 10:53:13 +0900 X-IronPort-AV: E=Sophos; i="4.80,712,1344178800"; d="scan'208"; a="104951019" Received: from unknown (HELO [172.30.8.157]) ([172.30.8.157]) by relmlii2.idc.renesas.com with ESMTP; Mon, 05 Nov 2012 10:53:13 +0900 Message-id: <50971C09.9050609@renesas.com> Date: Mon, 05 Nov 2012 10:53:13 +0900 From: "Shimoda, Yoshihiro" User-Agent: Mozilla/5.0 (Windows NT 5.1; rv:16.0) Gecko/20121026 Thunderbird/16.0.2 MIME-version: 1.0 To: Nobuhiro Iwamatsu Cc: u-boot@lists.denx.de Subject: [U-Boot] [PATCH] sh: fix trigger_address_error() X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de The function should set BL bit, but it should not clear other flags. So, the patch uses set_bl_bit() instead of a local asm code. Signed-off-by: Yoshihiro Shimoda --- arch/sh/include/asm/system.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/sh/include/asm/system.h b/arch/sh/include/asm/system.h index 56fd77a..24b5ce8 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)