From patchwork Wed Apr 10 00:06:51 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vadim Bendebury X-Patchwork-Id: 235272 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 34C392C00B8 for ; Wed, 10 Apr 2013 10:07:19 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id EED754A027; Wed, 10 Apr 2013 02:07:16 +0200 (CEST) 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 oJzmNSvUG0gz; Wed, 10 Apr 2013 02:07:16 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 7DC2F4A01B; Wed, 10 Apr 2013 02:07:15 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 65B8F4A01B for ; Wed, 10 Apr 2013 02:07:13 +0200 (CEST) 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 7ddv01l3gueK for ; Wed, 10 Apr 2013 02:07:12 +0200 (CEST) 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-oa0-f73.google.com (mail-oa0-f73.google.com [209.85.219.73]) by theia.denx.de (Postfix) with ESMTPS id 5E0504A019 for ; Wed, 10 Apr 2013 02:07:10 +0200 (CEST) Received: by mail-oa0-f73.google.com with SMTP id o6so1913896oag.2 for ; Tue, 09 Apr 2013 17:07:09 -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 :x-gm-message-state; bh=OxCXmKQatbhg/uwAWw2x0AmIn0ZrOlqAP6dpWE1Y7ZM=; b=SENvHfW/JVUbYEuQF2KPY2UDUyTepIrMCPkVvBp1kext7loKfVdJ+R8JdDzTd8ETxB lh1XW6oPWPAnz3IVxKJMdOf8ImxLfmvdzQLt6DtPzTugv81l9tJ9A0zActDwmbC1qoDk fakTtLoqWOK/LOZUGrGh4ndsk7a3onq538f0Wnt3pIPHsjCDvRwSvNi502R24htfx9/d VmFC30ls9xHegWK3kbTur5pxdyOPGZF4zoaZr3DDWBS8cQAgXvmtny5cQCZVki5uxa05 7so6vnaKqyvbduJId0w7GrWQETJ+rYQyVRb/zV3GNueoCe1eHDC/G0FvZQHEB7juarMt p6ow== X-Received: by 10.42.22.75 with SMTP id n11mr21083510icb.19.1365552429518; Tue, 09 Apr 2013 17:07:09 -0700 (PDT) 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 l10si2382736ige.0.2013.04.09.17.07.09 (version=TLSv1.1 cipher=AES128-SHA bits=128/128); Tue, 09 Apr 2013 17:07:09 -0700 (PDT) Received: from eskimo.mtv.corp.google.com (eskimo.mtv.corp.google.com [172.22.83.5]) by corp2gmr1-1.hot.corp.google.com (Postfix) with ESMTP id D735A31C0A5; Tue, 9 Apr 2013 17:07:08 -0700 (PDT) Received: by eskimo.mtv.corp.google.com (Postfix, from userid 41370) id 5C208220C34; Tue, 9 Apr 2013 17:07:08 -0700 (PDT) From: Vadim Bendebury To: u-boot@lists.denx.de Date: Tue, 9 Apr 2013 17:06:51 -0700 Message-Id: <1365552411-11231-1-git-send-email-vbendeb@chromium.org> X-Mailer: git-send-email 1.8.1.3 X-Gm-Message-State: ALoCoQlxrNOVlpCq7Rhvoyz1etup908BTH1Qa31ZHMyCjaUQBe08XZ98YAuz0/FDrja9jmBIHFcIhhwHR8Kmzv05VSVth3iYpL1oSRi5vL77mE5L2gV16YePDM7isj/K/PnTcFhC6Iys5EwSuqMnDYHNCslYLq2upzUI9hHhnYXa7BlgHOna8w1JMKTuRSAr6aQHe/nu4ivr Cc: Vadim Bendebury Subject: [U-Boot] [PATCH] Do not call board_early_init_f() twice 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 Apparently due to a missed rebase conflict resolution board_early_init_f() is included twice in the list of initialization functions. Leave only the first occurrence. . built and boot an Exynos 5250 target Signed-off-by: Vadim Bendebury --- common/board_f.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/common/board_f.c b/common/board_f.c index 29b49c3..7698891 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -788,9 +788,6 @@ static init_fnc_t init_sequence_f[] = { /* TODO: can we rename this to timer_init()? */ init_timebase, #endif -#if defined(CONFIG_BOARD_EARLY_INIT_F) - board_early_init_f, -#endif #ifdef CONFIG_ARM timer_init, /* initialize timer */ #endif