From patchwork Fri Nov 16 21:20:42 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 199781 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 521CD2C0085 for ; Sat, 17 Nov 2012 08:36:49 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id CFF654A212; Fri, 16 Nov 2012 22:35:34 +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 SydMJNB11yin; Fri, 16 Nov 2012 22:35:34 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A79C74A267; Fri, 16 Nov 2012 22:30:53 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id CD8ED4A189 for ; Fri, 16 Nov 2012 22:29:29 +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 GYpvvn91MODA for ; Fri, 16 Nov 2012 22:29:29 +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-qa0-f74.google.com (mail-qa0-f74.google.com [209.85.216.74]) by theia.denx.de (Postfix) with ESMTPS id A79DD4A1B5 for ; Fri, 16 Nov 2012 22:28:53 +0100 (CET) Received: by mail-qa0-f74.google.com with SMTP id g40so358183qab.3 for ; Fri, 16 Nov 2012 13:28:53 -0800 (PST) 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=DU32LtJYw01co36RpNfJozsm5ZO1xwwy4SP20Kjg1oc=; b=eSEbwBwmsykoMnDen4f3c3FwC/e+x3pAZXbyMz54ePtuGwhjZur6cC2/CVgqs3D+dL OL7f/luaz0mowB9iJlo5qYLTjf91SjbDixUcmK4I1rXfuNV8wyDpQjKlrsRW293arIKv XkGpV4LKNkDYTKhh3IvjiYyM+zfk//4H+il2IsgXhyP7TOKKZWam9QXMZuO/sAUFcguT 1niKulY3AXBQgD5sso9t1nynu7rSstCm2M2SW3wCE1Un4/thhV8ODk+s1uRUwlFhoSvr uD3bLf5Fe/403i7fJ8aFa3bWz3NO001UqgeCX3vqaV/is5oSnMVraj0qNbn2ZXGF7eYF cpVQ== Received: by 10.236.153.6 with SMTP id e6mr4044281yhk.20.1353101333079; Fri, 16 Nov 2012 13:28:53 -0800 (PST) Received: from wpzn3.hot.corp.google.com (216-239-44-65.google.com [216.239.44.65]) by gmr-mx.google.com with ESMTPS id i27si212012yhe.4.2012.11.16.13.28.53 (version=TLSv1/SSLv3 cipher=AES128-SHA); Fri, 16 Nov 2012 13:28:53 -0800 (PST) Received: from kaka.mtv.corp.google.com (kaka.mtv.corp.google.com [172.22.73.79]) by wpzn3.hot.corp.google.com (Postfix) with ESMTP id E0B49100056; Fri, 16 Nov 2012 13:28:52 -0800 (PST) Received: by kaka.mtv.corp.google.com (Postfix, from userid 121222) id B9BC81608CB; Fri, 16 Nov 2012 13:28:52 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Date: Fri, 16 Nov 2012 13:20:42 -0800 Message-Id: <1353100842-20126-58-git-send-email-sjg@chromium.org> X-Mailer: git-send-email 1.7.7.3 In-Reply-To: <1353100842-20126-1-git-send-email-sjg@chromium.org> References: <1353100842-20126-1-git-send-email-sjg@chromium.org> X-Gm-Message-State: ALoCoQk5AV+ajvqc2RioLE513y4QhvNFgwTNiViXsxVs8taPJCsscA6K1f6Xh8Tz+HjXq2UpxE9D66MvkYXfyoOmvUlKz8bFhY17zqLdBduLvHQLMcxWQg1oTaEj8iI3qlWzXgVaKIRvHgX5oHfTLj7cLX4q4WdJH7vBtwnJJr2UtIA9GDGsvYDGr9L/G28tiHHBYRh3oFSB Cc: Tom Rini Subject: [U-Boot] [PATCH 57/57] x86: Use generic global_data 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 Move x86 over to use generic global_data. Signed-off-by: Simon Glass --- arch/x86/include/asm/global_data.h | 32 +++----------------------------- 1 files changed, 3 insertions(+), 29 deletions(-) diff --git a/arch/x86/include/asm/global_data.h b/arch/x86/include/asm/global_data.h index d2eb00a..f0875f8 100644 --- a/arch/x86/include/asm/global_data.h +++ b/arch/x86/include/asm/global_data.h @@ -40,35 +40,11 @@ struct arch_global_data { unsigned long gdt_addr; /* Location of GDT */ }; -/* - * The following data structure is placed in some memory wich is - * available very early after boot (like DPRAM on MPC8xx/MPC82xx, or - * some locked parts of the data cache) to allow for a minimum set of - * global variables during system initialization (until we have set - * up the memory controller so that we can use RAM). - */ - -typedef struct global_data { - bd_t *bd; - unsigned long flags; - unsigned int baudrate; - unsigned long have_console; /* serial_init() was called */ -#ifdef CONFIG_PRE_CONSOLE_BUFFER - unsigned long precon_buf_idx; /* Pre-Console buffer index */ #endif - unsigned long reloc_off; /* Relocation Offset */ - unsigned long env_addr; /* Address of Environment struct */ - unsigned long env_valid; /* Checksum of Environment valid? */ - 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 */ - void **jt; /* jump table */ - char env_buf[32]; /* buffer for getenv() before reloc. */ - struct arch_global_data arch; /* architecture-specific data */ -} gd_t; +#include + +#ifndef __ASSEMBLY__ static inline gd_t *get_fs_gd_ptr(void) { gd_t *gd_ptr; @@ -82,8 +58,6 @@ static inline gd_t *get_fs_gd_ptr(void) #endif -#include - #define DECLARE_GLOBAL_DATA_PTR #endif /* __ASM_GBL_DATA_H */