From patchwork Fri Feb 4 23:06:03 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Schwingen X-Patchwork-Id: 81980 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 3E751B70FF for ; Sat, 5 Feb 2011 10:34:11 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 2CC472845E; Sat, 5 Feb 2011 00:32:39 +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 SGzi9422BAgO; Sat, 5 Feb 2011 00:32:39 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 7968028486; Sat, 5 Feb 2011 00:30:54 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 11B3E2829C for ; Sat, 5 Feb 2011 00:30: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 CdTk3XaMbixV for ; Sat, 5 Feb 2011 00:30:20 +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.dascon.de (pve-mail.dascon.de [93.159.248.171]) by theia.denx.de (Postfix) with ESMTP id 3164A283ED for ; Sat, 5 Feb 2011 00:30:10 +0100 (CET) Received: by mail.dascon.de (Postfix, from userid 10) id B0FB920A7; Sat, 5 Feb 2011 00:30:07 +0100 (CET) Received: from discworld.ms.intern (discworld.dascon.de [192.168.11.1]) by a-tuin.dascon.de (Postfix) with ESMTP id 2DDD42D7B1; Sat, 5 Feb 2011 00:06:16 +0100 (CET) From: Michael Schwingen To: u-boot@lists.denx.de, sr@denx.de, albert.aribaud@free.fr, michael@schwingen.org Date: Sat, 5 Feb 2011 00:06:03 +0100 Message-Id: <1296860763-16149-18-git-send-email-michael@schwingen.org> X-Mailer: git-send-email 1.7.2.3 In-Reply-To: <1296860763-16149-1-git-send-email-michael@schwingen.org> References: <1296860763-16149-1-git-send-email-michael@schwingen.org> Subject: [U-Boot] [PATCH 17/17] run arm_pci_init after relocation 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: Michael Schwingen --- arch/arm/lib/board.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c index c620d2c..50e63c7 100644 --- a/arch/arm/lib/board.c +++ b/arch/arm/lib/board.c @@ -262,9 +262,6 @@ init_fnc_t *init_sequence[] = { init_func_i2c, #endif dram_init, /* configure available RAM banks */ -#if defined(CONFIG_CMD_PCI) || defined (CONFIG_PCI) - arm_pci_init, -#endif NULL, }; @@ -529,6 +526,9 @@ void board_init_r (gd_t *id, ulong dest_addr) /* initialize environment */ env_relocate (); +#if defined(CONFIG_CMD_PCI) || defined(CONFIG_PCI) + arm_pci_init(); +#endif #ifdef CONFIG_VFD /* must do this after the framebuffer is allocated */ drv_vfd_init();