From patchwork Fri Dec 12 13:05:22 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 420462 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 06727140082 for ; Sat, 13 Dec 2014 00:06:42 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id F3E604BA3F; Fri, 12 Dec 2014 14:06:32 +0100 (CET) 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 UkNrReQ32uvK; Fri, 12 Dec 2014 14:06:32 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E30FE4BA43; Fri, 12 Dec 2014 14:06:27 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 1E1F34BA1B for ; Fri, 12 Dec 2014 14:06:25 +0100 (CET) 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 ZHZxF43i+Glh for ; Fri, 12 Dec 2014 14:06:25 +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-pd0-f173.google.com (mail-pd0-f173.google.com [209.85.192.173]) by theia.denx.de (Postfix) with ESMTPS id AE23A4B96F for ; Fri, 12 Dec 2014 14:06:23 +0100 (CET) Received: by mail-pd0-f173.google.com with SMTP id ft15so7139596pdb.4 for ; Fri, 12 Dec 2014 05:06:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:in-reply-to:references; bh=Yco5aNd9PbCyfOobRyBH16Jh9LrqWr+arQbIx52PedY=; b=RXdnoszrmJu6nRXBg9lrKxa+pKobI7JgZSCzU1VxyaEiJFH/rZHOcYO6ioaraiudvB UMJBc9xffsX8LZZb49OjkBKzE9LgdF2APp73vJ2jfblZzuqLXHan5iRWmBQt3cQwB681 Qi+KUqZ/nkN/VPttiH+m5Ve8URrqvjN404Bt0AdPENDrUyboUQe+CA24bYkvyKe18P+e w0yUKr4Ljcrz/SeH9UxH5inad/L5pekpuKksAHn560ux1AaolNwyBmGtYFmc1YsaIAep zzYG5/Rinhtzc6XL/4mixd0HZEhkuIXEYumn42coxyBaLCIGb+ISqitJLUzknbPo5d2b mdXw== X-Received: by 10.68.241.10 with SMTP id we10mr26110134pbc.101.1418389581420; Fri, 12 Dec 2014 05:06:21 -0800 (PST) Received: from localhost ([106.120.101.38]) by mx.google.com with ESMTPSA id 9sm1568437pdg.38.2014.12.12.05.06.19 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 12 Dec 2014 05:06:20 -0800 (PST) From: Bin Meng To: Simon Glass , U-Boot Mailing List Date: Fri, 12 Dec 2014 21:05:22 +0800 Message-Id: <1418389545-11254-5-git-send-email-bmeng.cn@gmail.com> X-Mailer: git-send-email 1.8.2.1 In-Reply-To: <1418389545-11254-1-git-send-email-bmeng.cn@gmail.com> References: <1418389545-11254-1-git-send-email-bmeng.cn@gmail.com> Subject: [U-Boot] [PATCH v3 04/27] x86: Clean up asm-offsets X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.13 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 Move GD_BIST from lib/asm-offsets.c to arch/x86/lib/asm-offsets.c as it is x86 arch specific stuff. Also remove GENERATED_GD_RELOC_OFF which is not referenced anymore. Signed-off-by: Bin Meng Acked-by: Simon Glass --- Changes in v3: None Changes in v2: None arch/x86/cpu/start.S | 3 ++- arch/x86/lib/asm-offsets.c | 2 +- lib/asm-offsets.c | 3 --- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/arch/x86/cpu/start.S b/arch/x86/cpu/start.S index b0d0ac0..f9662fb 100644 --- a/arch/x86/cpu/start.S +++ b/arch/x86/cpu/start.S @@ -1,5 +1,5 @@ /* - * U-boot - x86 Startup Code + * U-Boot - x86 Startup Code * * (C) Copyright 2008-2011 * Graeme Russ, @@ -17,6 +17,7 @@ #include #include #include +#include .section .text .code32 diff --git a/arch/x86/lib/asm-offsets.c b/arch/x86/lib/asm-offsets.c index d65c6ab..50a488f 100644 --- a/arch/x86/lib/asm-offsets.c +++ b/arch/x86/lib/asm-offsets.c @@ -17,6 +17,6 @@ int main(void) { - DEFINE(GENERATED_GD_RELOC_OFF, offsetof(gd_t, reloc_off)); + DEFINE(GD_BIST, offsetof(gd_t, arch.bist)); return 0; } diff --git a/lib/asm-offsets.c b/lib/asm-offsets.c index 580f763..129bc3e 100644 --- a/lib/asm-offsets.c +++ b/lib/asm-offsets.c @@ -31,9 +31,6 @@ int main(void) #ifdef CONFIG_SYS_MALLOC_F_LEN DEFINE(GD_MALLOC_BASE, offsetof(struct global_data, malloc_base)); #endif -#ifdef CONFIG_X86 - DEFINE(GD_BIST, offsetof(struct global_data, arch.bist)); -#endif #if defined(CONFIG_ARM)