From patchwork Fri Feb 4 12:35:56 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Graeme Russ X-Patchwork-Id: 81878 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 68229B711E for ; Fri, 4 Feb 2011 23:41:26 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id AAD6A28566; Fri, 4 Feb 2011 13:39:24 +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 0+DS0G26ui94; Fri, 4 Feb 2011 13:39:24 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 9815028441; Fri, 4 Feb 2011 13:38:28 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 70891284C2 for ; Fri, 4 Feb 2011 13:38:25 +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 LdJJjm+mcz0X for ; Fri, 4 Feb 2011 13:38:25 +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-yw0-f44.google.com (mail-yw0-f44.google.com [209.85.213.44]) by theia.denx.de (Postfix) with ESMTPS id 71F2D28434 for ; Fri, 4 Feb 2011 13:37:32 +0100 (CET) Received: by mail-yw0-f44.google.com with SMTP id 9so994717ywk.3 for ; Fri, 04 Feb 2011 04:37:32 -0800 (PST) Received: by 10.150.178.17 with SMTP id a17mr14067151ybf.163.1296823052100; Fri, 04 Feb 2011 04:37:32 -0800 (PST) Received: from helios.localdomain6 (d122-104-34-241.sbr6.nsw.optusnet.com.au [122.104.34.241]) by mx.google.com with ESMTPS id g27sm398868yhc.8.2011.02.04.04.37.29 (version=SSLv3 cipher=RC4-MD5); Fri, 04 Feb 2011 04:37:31 -0800 (PST) From: Graeme Russ To: u-boot@lists.denx.de Date: Fri, 4 Feb 2011 23:35:56 +1100 Message-Id: <1296822959-3927-30-git-send-email-graeme.russ@gmail.com> X-Mailer: git-send-email 1.7.1.422.g049e9 In-Reply-To: <1296822959-3927-1-git-send-email-graeme.russ@gmail.com> References: <1296822959-3927-1-git-send-email-graeme.russ@gmail.com> Subject: [U-Boot] [PATCH 29/32] x86: Rearrange function calls in board_init_f 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 --- arch/i386/lib/board.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/i386/lib/board.c b/arch/i386/lib/board.c index 44e871b..4751e49 100644 --- a/arch/i386/lib/board.c +++ b/arch/i386/lib/board.c @@ -235,6 +235,14 @@ static int do_elf_reloc_fixups(void) */ void board_init_f(ulong boot_flags) { + /* First stage CPU initialization */ + if (cpu_init_f() != 0) + hang(); + + /* First stage Board initialization */ + if (board_early_init_f() != 0) + hang(); + if (env_init() != 0) hang(); @@ -253,14 +261,6 @@ void board_init_f(ulong boot_flags) if (calculate_relocation_address() != 0) hang(); - /* First stage CPU initialization */ - if (cpu_init_f() != 0) - hang(); - - /* First stage Board initialization */ - if (board_early_init_f() != 0) - hang(); - /* Copy U-Boot into RAM */ if (copy_uboot_to_ram() != 0) hang();