From patchwork Tue Dec 6 23:00:19 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Warren X-Patchwork-Id: 129847 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 51F7E1007D5 for ; Wed, 7 Dec 2011 10:07:05 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 76D40280A2; Wed, 7 Dec 2011 00:07:03 +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 IWU-kec6YqC3; Wed, 7 Dec 2011 00:07:03 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 5CF51280AA; Wed, 7 Dec 2011 00:07:01 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B656D280C2 for ; Wed, 7 Dec 2011 00:01: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 VKPlXHGwQ0xM for ; Wed, 7 Dec 2011 00:01:19 +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-iy0-f172.google.com (mail-iy0-f172.google.com [209.85.210.172]) by theia.denx.de (Postfix) with ESMTPS id 55BAA280C0 for ; Wed, 7 Dec 2011 00:01:17 +0100 (CET) Received: by iaek3 with SMTP id k3so8109359iae.3 for ; Tue, 06 Dec 2011 15:01:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; bh=f0zYwY2OWkt+/e44J7zjVL68Ak+akZwCcHaXKicSUKc=; b=KDbQwof0O1SI6fsWy5C1JWKmSZs3/Bpn09pRJrl45AG9ereNm+IoOjQ5azzuzoP7/X v8ESJU3JXR4HSeet1EOy9rQe6DPM2BXTCB8CH+jmF2eN5wJnzmgfBHmo8trSnR/+bWBW 2jCRpLnfDQqYS6Thde53p7OPR4/YZGNpXBdjU= Received: by 10.231.61.210 with SMTP id u18mr3865566ibh.86.1323212476542; Tue, 06 Dec 2011 15:01:16 -0800 (PST) Received: from localhost.localdomain (ip68-106-253-43.ph.ph.cox.net. [68.106.253.43]) by mx.google.com with ESMTPS id g16sm94584996ibs.8.2011.12.06.15.01.13 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 06 Dec 2011 15:01:15 -0800 (PST) From: Tom Warren To: u-boot@lists.denx.de Date: Tue, 6 Dec 2011 16:00:19 -0700 Message-Id: <1323212419-21023-1-git-send-email-twarren@nvidia.com> X-Mailer: git-send-email 1.7.7.1 X-Mailman-Approved-At: Wed, 07 Dec 2011 00:06:59 +0100 Cc: trini@ti.com, twarren@nvidia.com Subject: [U-Boot] [PATCH] arm: Tegra: fix undefined instruction hang immediately after reset 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: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de commit 0d479b53 (Aneesh V) added code for OMAP4 that doesn't execute on Tegra, due to the AVP (ARM7TDI) not having a CP15. Result was an undefined instruction hang just after reset. Signed-off-by: Tom Warren Cc: Albert Aribaud Cc: Tom Rini Acked-by: Aneesh V --- arch/arm/cpu/armv7/start.S | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/arch/arm/cpu/armv7/start.S b/arch/arm/cpu/armv7/start.S index d23dc9d..ceed11e 100644 --- a/arch/arm/cpu/armv7/start.S +++ b/arch/arm/cpu/armv7/start.S @@ -144,6 +144,7 @@ reset: orr r0, r0, #0xd3 msr cpsr,r0 +#if !defined(CONFIG_TEGRA2) /* * Setup vector: * (OMAP4 spl TEXT_BASE is not 32 byte aligned. @@ -159,6 +160,7 @@ reset: ldr r0, =_start mcr p15, 0, r0, c12, c0, 0 @Set VBAR #endif +#endif /* !Tegra2 */ /* the mask ROM code should have PLL and others stable */ #ifndef CONFIG_SKIP_LOWLEVEL_INIT