From patchwork Wed Mar 6 00:39:53 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 225224 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 54B602C02A8 for ; Wed, 6 Mar 2013 11:44:32 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id CCBC54A229; Wed, 6 Mar 2013 01:43: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 GKlEwuwc8LNb; Wed, 6 Mar 2013 01:43:39 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 59FEB4A241; Wed, 6 Mar 2013 01:41:52 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id DBC574A1E1 for ; Wed, 6 Mar 2013 01:41:23 +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 Le57KP54dXTM for ; Wed, 6 Mar 2013 01:41:23 +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-gh0-f202.google.com (mail-gh0-f202.google.com [209.85.160.202]) by theia.denx.de (Postfix) with ESMTPS id 545734A1E0 for ; Wed, 6 Mar 2013 01:41:02 +0100 (CET) Received: by mail-gh0-f202.google.com with SMTP id z10so806703ghb.5 for ; Tue, 05 Mar 2013 16:41:01 -0800 (PST) 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=G2v2JF9+PB+Wp/HFREkKxl3wtE6bew9KNDQUk2em4Xw=; b=HGxfYkfUWc1Xolf8NgBf/FXPx4idgSKMIxpVDoxkiMjaNo7RmFT1BpN7aijO9j50ZA z8xov1zd2rircMTb6mgN76i82SecUZTJ22kpXoTvGK69y35mMkA/qTToASbUC5GXTFzt 11G7TxQ3dzGUqUzKn5a9iLbPYPxZ/lZaZbML07TEbD8Uqf/DKeiX+Iu5t9aCpnrvXD12 nHuwAZriPf7CYAyxT8Za8ntC/uv0l4NZlys6rF7UtXCd/4W01SnqFhD8a/lR1WN9eySj Mc6BG6FZsDwcs7stqCFO3sjyEh3Ry8VhThtYjIIzOGNi9wi0rHjjuHcpDyENgFD/DJtq hLHA== X-Received: by 10.236.162.134 with SMTP id y6mr15972925yhk.3.1362530461751; Tue, 05 Mar 2013 16:41:01 -0800 (PST) Received: from corp2gmr1-1.hot.corp.google.com (corp2gmr1-1.hot.corp.google.com [172.24.189.92]) by gmr-mx.google.com with ESMTPS id u21si445370yhj.0.2013.03.05.16.41.01 (version=TLSv1.1 cipher=AES128-SHA bits=128/128); Tue, 05 Mar 2013 16:41:01 -0800 (PST) Received: from kaka.mtv.corp.google.com (kaka.mtv.corp.google.com [172.22.73.79]) by corp2gmr1-1.hot.corp.google.com (Postfix) with ESMTP id 95B8831C273; Tue, 5 Mar 2013 16:41:01 -0800 (PST) Received: by kaka.mtv.corp.google.com (Postfix, from userid 121222) id 76E75160A46; Tue, 5 Mar 2013 16:41:01 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Date: Tue, 5 Mar 2013 16:39:53 -0800 Message-Id: <1362530405-10824-20-git-send-email-sjg@chromium.org> X-Mailer: git-send-email 1.8.1.3 In-Reply-To: <1362530405-10824-1-git-send-email-sjg@chromium.org> References: <1362530405-10824-1-git-send-email-sjg@chromium.org> X-Gm-Message-State: ALoCoQlpibv/QXiNmJK23NE/XWEwF8A38ECVSdM3CCDUWkZplbuk5klhKTNzZglUVBsrih5Phardb0PV6XYZux7Bs1Ewy2zjcY6Y8dp3OfrJoSOQ3UELbHINghgx0kUJ3jeFjjMHhcmpaEg39ekXDJ+o14j2NAJ7ajLQRV+Y38b8cldu1bcMm9eZhKQqFj49+rWIh/K2prb1 Cc: Graeme Russ , Tom Rini , Vadim Bendebury Subject: [U-Boot] [PATCH v6 19/31] x86: Adjust board_r.c for x86 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 For x86 the global_data is managed entirely by the start.S code so we do not need to touch it. However, we do have some more initcalls to add. Signed-off-by: Simon Glass --- Changes in v6: None Changes in v5: - Add new patch to adjust board_r.c for x86 Changes in v4: None Changes in v3: None Changes in v2: None common/board_r.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/common/board_r.c b/common/board_r.c index 52587cd..29eccdf 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -63,6 +63,9 @@ #include #endif #include +#ifdef CONFIG_X86 +#include +#endif #include DECLARE_GLOBAL_DATA_PTR; @@ -719,6 +722,9 @@ init_fnc_t init_sequence_r[] = { #ifdef CONFIG_CLOCKS set_cpu_clk_info, /* Setup clock information */ #endif +#ifdef CONFIG_X86 + init_bd_struct_r, +#endif initr_reloc_global_data, initr_serial, initr_announce, @@ -766,11 +772,16 @@ init_fnc_t init_sequence_r[] = { initr_flash, #endif INIT_FUNC_WATCHDOG_RESET -#ifdef CONFIG_PPC +#if defined(CONFIG_PPC) || defined(CONFIG_X86) /* initialize higher level parts of CPU like time base and timers */ cpu_init_r, +#endif +#ifdef CONFIG_PPC initr_spi, #endif +#if defined(CONFIG_X86) && defined(CONFIG_SPI) + init_func_spi, +#endif #ifdef CONFIG_CMD_NAND initr_nand, #endif @@ -824,10 +835,16 @@ init_fnc_t init_sequence_r[] = { #ifdef CONFIG_CMD_KGDB initr_kgdb, #endif +#ifdef CONFIG_X86 + board_early_init_r, +#endif interrupt_init, -#ifdef CONFIG_ARM +#if defined(CONFIG_ARM) || defined(CONFIG_x86) initr_enable_interrupts, #endif +#ifdef CONFIG_X86 + timer_init, /* initialize timer */ +#endif #if defined(CONFIG_STATUS_LED) && defined(STATUS_LED_BOOT) initr_status_led, #endif @@ -889,7 +906,9 @@ init_fnc_t init_sequence_r[] = { void board_init_r(gd_t *new_gd, ulong dest_addr) { +#ifndef CONFIG_X86 gd = new_gd; +#endif if (initcall_run_list(init_sequence_r)) hang();