From patchwork Sat Nov 3 21:41:26 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 196953 X-Patchwork-Delegate: sjg@chromium.org 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 043622C00C8 for ; Sun, 4 Nov 2012 08:46:06 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 634714A36F; Sat, 3 Nov 2012 22:44:30 +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 C0GhL0CtOdVq; Sat, 3 Nov 2012 22:44:30 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 0D7EF4A1B7; Sat, 3 Nov 2012 22:42:37 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 2CBA44A13F for ; Sat, 3 Nov 2012 22:42:26 +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 9OLMiWrIOolA for ; Sat, 3 Nov 2012 22:42:22 +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-fa0-f74.google.com (mail-fa0-f74.google.com [209.85.161.74]) by theia.denx.de (Postfix) with ESMTPS id C624E4A149 for ; Sat, 3 Nov 2012 22:42:06 +0100 (CET) Received: by mail-fa0-f74.google.com with SMTP id t1so289176fae.3 for ; Sat, 03 Nov 2012 14:42:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=OFHw6bgI1jihBHSx1Qrm52nx9b35kcNcG5wDnBpeoxo=; b=Gr1qSrGbQO5KAx/EVR0vmYt4NthuiXMF25ikyZHbHZVqrHbd+U9NaYTVfhlpgsnPsQ rNJfXxsXgMaP9mUo+fSmbSUD2ZmCWs/vONZFAwIdbQ3PniACVG//n+n9IZrubleyJNtm VqOIcc1kBZOZYXeR877lsaQEypI9AXkU77yhOgwEM3Jaog9M+YMD6XsTFmHF5C3mI4wW Xy3YA73WZ2dTAcPSAM++0Vn224F9QVa/qu6+Ieop9XCncC/XbuSGiznvHWzZIbmmsEnP GgIny89bvyzZVJn1VO+um2gRu/iDdvlkEUn8YPsuTYalaoxzvCriwU+NhoshdXWw3OdP hPCQ== Received: by 10.14.216.197 with SMTP id g45mr5861717eep.3.1351978923342; Sat, 03 Nov 2012 14:42:03 -0700 (PDT) Received: from hpza10.eem.corp.google.com ([74.125.121.33]) by gmr-mx.google.com with ESMTPS id z47si2161844eel.0.2012.11.03.14.42.03 (version=TLSv1/SSLv3 cipher=AES128-SHA); Sat, 03 Nov 2012 14:42:03 -0700 (PDT) Received: from kaka.mtv.corp.google.com (kaka.mtv.corp.google.com [172.22.73.79]) by hpza10.eem.corp.google.com (Postfix) with ESMTP id F1CB420004E; Sat, 3 Nov 2012 14:42:02 -0700 (PDT) Received: by kaka.mtv.corp.google.com (Postfix, from userid 121222) id 56C97161948; Sat, 3 Nov 2012 14:42:02 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Date: Sat, 3 Nov 2012 14:41:26 -0700 Message-Id: <1351978902-23719-5-git-send-email-sjg@chromium.org> X-Mailer: git-send-email 1.7.7.3 In-Reply-To: <1351978902-23719-1-git-send-email-sjg@chromium.org> References: <1351978902-23719-1-git-send-email-sjg@chromium.org> X-Gm-Message-State: ALoCoQm4pxWq9s91VZ/vFCk1ZtbOFqeAjX5YQKHstj+IKbEn7qVY+PvrZ0XShsPErVNwyGXMXT8mt3FxtarYinRPsIU4wE47ubxHSm5p1T0YoZBRDraiH5LkfsYcjo7QuPmC2XjvmlpZZ/IU8XGuudb6cn7sGf/8hyfHwDKw0OiBNafbAvI7ddD/L7nE5BWZJaEtztcrx924 Subject: [U-Boot] [PATCH 04/20] x86: Make calculate_relocation_address an overridable function 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 From: Gabe Black Different systems may have different mechanisms for picking a suitable place to relocate U-Boot to. Signed-off-by: Gabe Black Signed-off-by: Simon Glass --- arch/x86/lib/init_helpers.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/arch/x86/lib/init_helpers.c b/arch/x86/lib/init_helpers.c index 6032ee5..fc28af7 100644 --- a/arch/x86/lib/init_helpers.c +++ b/arch/x86/lib/init_helpers.c @@ -32,6 +32,7 @@ #include #include #include +#include #include @@ -72,7 +73,7 @@ int init_baudrate_f(void) return 0; } -int calculate_relocation_address(void) +__weak int calculate_relocation_address(void) { ulong text_start = (ulong)&__text_start; /* keep .bss variables aligned */