From patchwork Tue Nov 8 12:33:23 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Graeme Russ X-Patchwork-Id: 124350 X-Patchwork-Delegate: graeme.russ@gmail.com 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 6CD1E1007D3 for ; Tue, 8 Nov 2011 23:36:37 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 421A129AE9; Tue, 8 Nov 2011 13:35: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 ZIgshucCPOd6; Tue, 8 Nov 2011 13:35:18 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 3D944299FA; Tue, 8 Nov 2011 13:34:46 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B3703298DD for ; Tue, 8 Nov 2011 13:34:42 +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 8f5h2rMPp7as for ; Tue, 8 Nov 2011 13:34:42 +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-gy0-f172.google.com (mail-gy0-f172.google.com [209.85.160.172]) by theia.denx.de (Postfix) with ESMTPS id 9B941298E0 for ; Tue, 8 Nov 2011 13:34:00 +0100 (CET) Received: by mail-gy0-f172.google.com with SMTP id 5so469058gye.3 for ; Tue, 08 Nov 2011 04:34:00 -0800 (PST) Received: by 10.101.137.38 with SMTP id p38mr6908105ann.33.1320755640744; Tue, 08 Nov 2011 04:34:00 -0800 (PST) Received: from localhost.localdomain (d122-104-32-210.sbr6.nsw.optusnet.com.au. [122.104.32.210]) by mx.google.com with ESMTPS id u19sm3948194ank.11.2011.11.08.04.33.58 (version=SSLv3 cipher=OTHER); Tue, 08 Nov 2011 04:34:00 -0800 (PST) From: Graeme Russ To: u-boot@lists.denx.de Date: Tue, 8 Nov 2011 23:33:23 +1100 Message-Id: <1320755603-8695-13-git-send-email-graeme.russ@gmail.com> X-Mailer: git-send-email 1.7.5.2.317.g391b14 In-reply-to: <1320459711-20257-8-git-send-email-graeme.russ@gmail.com> Cc: Graeme Russ Subject: [U-Boot] [PATCH v2 12/12] x86: Misc cleanups 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 Signed-off-by: Graeme Russ --- Changes for v1: - None (skipped to set single version for consolidated series) Changes for v2: - Consolidated patch series arch/x86/cpu/start.S | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) -- 1.7.5.2.317.g391b14 diff --git a/arch/x86/cpu/start.S b/arch/x86/cpu/start.S index d099fc9..f87633b 100644 --- a/arch/x86/cpu/start.S +++ b/arch/x86/cpu/start.S @@ -48,7 +48,7 @@ _x86boot_start: cli cld - /* Turn of cache (this might require a 486-class CPU) */ + /* Turn off cache (this might require a 486-class CPU) */ movl %cr0, %eax orl $(X86_CR0_NW | X86_CR0_CD), %eax movl %eax, %cr0 @@ -122,7 +122,8 @@ relocate_code: /* Jump to in-RAM copy of board_init_r() */ call *%ebp -die: hlt +die: + hlt jmp die hlt