From patchwork Mon Mar 11 16:08:09 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 226579 X-Patchwork-Delegate: trini@ti.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 E32592C02A6 for ; Tue, 12 Mar 2013 03:09:55 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 1705F4A1DF; Mon, 11 Mar 2013 17:09:54 +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 ns8eWpzxoWcn; Mon, 11 Mar 2013 17:09:53 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 8BADE4A1EE; Mon, 11 Mar 2013 17:09:29 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 09EB44A180 for ; Mon, 11 Mar 2013 17:09:14 +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 aftw16slNpZ0 for ; Mon, 11 Mar 2013 17:09:12 +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-qe0-f74.google.com (mail-qe0-f74.google.com [209.85.128.74]) by theia.denx.de (Postfix) with ESMTPS id 179594A1DE for ; Mon, 11 Mar 2013 17:09:00 +0100 (CET) Received: by mail-qe0-f74.google.com with SMTP id 9so394157qea.1 for ; Mon, 11 Mar 2013 09:08:59 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=t1eKXHV2hxKtNrDmcUScL95r7C+Sg7xNUepwTBaAVlM=; b=Oxtj+oPpE/eUQ+WK5l+VU6fgCfZcNU6MKfOAjvL1rVTkVH1GEFbNXml5qc+vsmW9xo bNosHC+cdPluZUffRUWyVDVtgIk7EH4yI/lmpy1JeSdbGZOtHMmELA86VpbRGoSbjG/B 17eqfpg4rOiBysvc1MgbTVoj8jj7tL6ozAJ18TXyYt9VQvH4G50icM9JN27OymhTlVeW mrdEdZE2JPzSa20arMnnhVVxCPCXUsqfRWod2S1J0VBM7ZNh+z9JF5PQ/cvdkQgBvmis U1pd9ZTxytIcjo4QnY0xZhv4xT4H5JC1qM6OjBbfRHaqEove3LcHiB7Dxu556wQXx3NN GbfA== X-Received: by 10.236.82.102 with SMTP id n66mr8195899yhe.28.1363018139606; Mon, 11 Mar 2013 09:08:59 -0700 (PDT) Received: from corp2gmr1-2.hot.corp.google.com (corp2gmr1-2.hot.corp.google.com [172.24.189.93]) by gmr-mx.google.com with ESMTPS id f47si1087469yhg.4.2013.03.11.09.08.59 (version=TLSv1.1 cipher=AES128-SHA bits=128/128); Mon, 11 Mar 2013 09:08:59 -0700 (PDT) Received: from kaka.mtv.corp.google.com (kaka.mtv.corp.google.com [172.22.73.79]) by corp2gmr1-2.hot.corp.google.com (Postfix) with ESMTP id 6F1FB5A41D4; Mon, 11 Mar 2013 09:08:59 -0700 (PDT) Received: by kaka.mtv.corp.google.com (Postfix, from userid 121222) id 4A49716072B; Mon, 11 Mar 2013 09:08:59 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Date: Mon, 11 Mar 2013 09:08:09 -0700 Message-Id: <1363018093-28979-12-git-send-email-sjg@chromium.org> X-Mailer: git-send-email 1.8.1.3 In-Reply-To: <1363018093-28979-1-git-send-email-sjg@chromium.org> References: <1363018093-28979-1-git-send-email-sjg@chromium.org> X-Gm-Message-State: ALoCoQnkgspdkqThRAMuR6jc7+naeeHz0iUjpDtEqBgEDdXhQUbcGkrbmyTeIJht62oHZdaSBpuvoc+MOlGjag2jhBryXDM6tBsDfQo+nKP0D1ffJ6xr2/5l/laGWQ5/k9TiPljTiY/LJzTkIBMpQiQ5timedllFvpk0lLCkraLlRZ4iG03fb0NUwxO55qt1p7u1uIP1Gntq Cc: Graeme Russ , Tom Warren Subject: [U-Boot] [PATCH v2 11/15] x86: Move PCI init before SPI init 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 It is possible that our PCI bus will provide the SPI controller, so change the init order to make this work. Signed-off-by: Simon Glass --- Changes in v2: None arch/x86/lib/board.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/x86/lib/board.c b/arch/x86/lib/board.c index 2441a66..e727374 100644 --- a/arch/x86/lib/board.c +++ b/arch/x86/lib/board.c @@ -163,13 +163,13 @@ init_fnc_t *init_sequence_r[] = { #ifndef CONFIG_SYS_NO_FLASH flash_init_r, #endif -#ifdef CONFIG_SPI - init_func_spi; -#endif - env_relocate_r, #ifdef CONFIG_PCI pci_init_r, #endif +#ifdef CONFIG_SPI + init_func_spi, +#endif + env_relocate_r, stdio_init, jumptable_init_r, console_init_r,