From patchwork Fri Dec 23 12:25:48 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Graeme Russ X-Patchwork-Id: 133028 X-Patchwork-Delegate: graeme.russ@gmail.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 E2495B718D for ; Fri, 23 Dec 2011 23:28:22 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 74B7E2822F; Fri, 23 Dec 2011 13:27:52 +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 F-vtwR0Jmm53; Fri, 23 Dec 2011 13:27:52 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 65EB728289; Fri, 23 Dec 2011 13:27:18 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 3143128257 for ; Fri, 23 Dec 2011 13:27:09 +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 TNjyd2C2N-Lc for ; Fri, 23 Dec 2011 13:27:08 +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-gy0-f172.google.com (mail-gy0-f172.google.com [209.85.160.172]) by theia.denx.de (Postfix) with ESMTPS id A476A2823D for ; Fri, 23 Dec 2011 13:26:47 +0100 (CET) Received: by mail-gy0-f172.google.com with SMTP id g18so2601071ghb.3 for ; Fri, 23 Dec 2011 04:26:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=/oY03egJbg1blb4E0ypvGTK6L4uk88cTBq9LHFzvtag=; b=qDGKWGc7yzqO1YJ1TLrZNT9ajWNYCIppVNN3DpZF69kHGnPj5/ZSFqWhs6kRzvkpOY 6osC//eGDQtNNIFUxQTzQBARlRMl4x56WUVwAemoMBSXSu0knuQ9Zzwi9nEFkesdUOSo nW6R59v3JSah6bVGRdFKYJMjsNzOTmFSqglqo= Received: by 10.101.27.25 with SMTP id e25mr6494663anj.5.1324643206858; Fri, 23 Dec 2011 04:26:46 -0800 (PST) Received: from localhost.localdomain (d58-106-90-149.sbr801.nsw.optusnet.com.au. [58.106.90.149]) by mx.google.com with ESMTPS id y17sm32624370anc.2.2011.12.23.04.26.44 (version=SSLv3 cipher=OTHER); Fri, 23 Dec 2011 04:26:46 -0800 (PST) From: Graeme Russ To: u-boot@lists.denx.de Date: Fri, 23 Dec 2011 23:25:48 +1100 Message-Id: <1324643151-23642-12-git-send-email-graeme.russ@gmail.com> X-Mailer: git-send-email 1.7.5.2.317.g391b14 In-Reply-To: <1324643151-23642-1-git-send-email-graeme.russ@gmail.com> References: <1324643151-23642-1-git-send-email-graeme.russ@gmail.com> Subject: [U-Boot] [RFC 11/14] x86: remove gd->start_addr_sp 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's not used for anything useful --- arch/x86/include/asm/global_data.h | 1 - arch/x86/lib/board.c | 4 +--- 2 files changed, 1 insertions(+), 4 deletions(-) diff --git a/arch/x86/include/asm/global_data.h b/arch/x86/include/asm/global_data.h index 05a2139..ad15509 100644 --- a/arch/x86/include/asm/global_data.h +++ b/arch/x86/include/asm/global_data.h @@ -50,7 +50,6 @@ typedef struct global_data { unsigned long cpu_clk; /* CPU clock in Hz! */ unsigned long bus_clk; unsigned long relocaddr; /* Start address of U-Boot in RAM */ - unsigned long start_addr_sp; /* start_addr_stackpointer */ phys_size_t ram_size; /* RAM size */ unsigned long reset_status; /* reset status register at boot */ void **jt; /* jump table */ diff --git a/arch/x86/lib/board.c b/arch/x86/lib/board.c index f201542..e8274bf 100644 --- a/arch/x86/lib/board.c +++ b/arch/x86/lib/board.c @@ -163,7 +163,7 @@ static int calculate_relocation_address(gd_t *id) ulong rel_offset; /* Calculate destination RAM Address and relocation offset */ - dest_addr = id->start_addr_sp; + dest_addr = (ulong)id; dest_addr -= CONFIG_SYS_STACK_SIZE; dest_addr -= (bss_end - text_start); @@ -265,8 +265,6 @@ void relocate_code(ulong stack_ptr, gd_t *id, ulong reloc_addr) /* gd is still in CAR - Copy it into SDRAM */ memcpy(id, gd, sizeof(gd_t)); - id->start_addr_sp = stack_ptr; - if (init_cache() != 0) hang();