From patchwork Tue Sep 25 00:31:04 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 186666 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 C8A952C0090 for ; Tue, 25 Sep 2012 10:35:27 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 7DD66280AC; Tue, 25 Sep 2012 02:34:48 +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 gkyHTEk69aOV; Tue, 25 Sep 2012 02:34:48 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 10DFB28103; Tue, 25 Sep 2012 02:33:53 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id ED9DC28084 for ; Tue, 25 Sep 2012 02:33:10 +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 T-kK6mUlV81c for ; Tue, 25 Sep 2012 02:33:10 +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-pa0-f44.google.com (mail-pa0-f44.google.com [209.85.220.44]) by theia.denx.de (Postfix) with ESMTPS id 526CE28081 for ; Tue, 25 Sep 2012 02:32:18 +0200 (CEST) Received: by mail-pa0-f44.google.com with SMTP id fb11so1811529pad.3 for ; Mon, 24 Sep 2012 17:32:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=JLZNYbzAOB8kGSeiO2obCKUd/NvwOtU/U1sGneU8TIg=; b=rTCZl0HP/xYi3zDP086qh39SX46ODyxl1dT1ty8u1z0qtZygSF1hIBW5Vg8NzqKwc3 WECAkADHCE3hyO0e83kZzZWyNKCet3QGeAwZMlfoHOHq91mWo5gs2KykPNYr+YUFKKzy ZkhWE3VuxAaOrwXPN3Wd9QY/Xjw+FEWKK7gMFL5FDb7DEAnvacaszfB8tW380SHrVWSo tLjpWUd/UcrtDA+vFJ95qy0jVu3Ue9GaE5cqj5HuDwUmnDAtCQ1ZlDRzd0RYEpnn59Ry H/ECicu8jZBYMOaSYff91w+k1qpFKeT++nuHkvrabSyjjXyYpzHtun7FSm0qlsjd0zGh xRlw== Received: by 10.68.213.138 with SMTP id ns10mr40787834pbc.157.1348533137910; Mon, 24 Sep 2012 17:32:17 -0700 (PDT) Received: from localhost.localdomain (ip68-230-54-74.ph.ph.cox.net. [68.230.54.74]) by mx.google.com with ESMTPS id pj10sm10377538pbb.46.2012.09.24.17.32.15 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 24 Sep 2012 17:32:16 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Date: Mon, 24 Sep 2012 17:31:04 -0700 Message-Id: <1348533068-13038-27-git-send-email-trini@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1348533068-13038-1-git-send-email-trini@ti.com> References: <1348533068-13038-1-git-send-email-trini@ti.com> Cc: Sudhakar Rajashekhara , Stefan Roese , Christian Riesch Subject: [U-Boot] [PATCH v7 26/29] SPL: Enable use of custom defined U-Boot entry point 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: Stefan Roese By setting CONFIG_SYS_UBOOT_START boards can now use a different entry point for their U-Boot image. So the U-Boot entry point is not fixed to CONFIG_SYS_TEXT_BASE any more. Signed-off-by: Stefan Roese Signed-off-by: Tom Rini --- Changes in v6: - Add Stefan's patch for custom U-Boot entry point common/spl/spl.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/common/spl/spl.c b/common/spl/spl.c index 40de454..14f7bdb 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -35,6 +35,9 @@ DECLARE_GLOBAL_DATA_PTR; +#ifndef CONFIG_SYS_UBOOT_START +#define CONFIG_SYS_UBOOT_START CONFIG_SYS_TEXT_BASE +#endif #ifndef CONFIG_SYS_MONITOR_LEN #define CONFIG_SYS_MONITOR_LEN (200 * 1024) #endif @@ -104,7 +107,7 @@ void spl_parse_image_header(const struct image_header *header) header->ih_magic); /* Let's assume U-Boot will not be more than 200 KB */ spl_image.size = CONFIG_SYS_MONITOR_LEN; - spl_image.entry_point = CONFIG_SYS_TEXT_BASE; + spl_image.entry_point = CONFIG_SYS_UBOOT_START; spl_image.load_addr = CONFIG_SYS_TEXT_BASE; spl_image.os = IH_OS_U_BOOT; spl_image.name = "U-Boot";