From patchwork Fri Nov 16 21:20:36 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 199783 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 0F6462C0085 for ; Sat, 17 Nov 2012 08:37:06 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id C138E4A245; Fri, 16 Nov 2012 22:35:48 +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 wlpqsWrj0+JL; Fri, 16 Nov 2012 22:35:48 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 848764A26F; Fri, 16 Nov 2012 22:30:55 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 355374A180 for ; Fri, 16 Nov 2012 22:29:31 +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 U1oGQz99-p7z for ; Fri, 16 Nov 2012 22:29:30 +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-vb0-f74.google.com (mail-vb0-f74.google.com [209.85.212.74]) by theia.denx.de (Postfix) with ESMTPS id ADDF14A1B7 for ; Fri, 16 Nov 2012 22:28:53 +0100 (CET) Received: by mail-vb0-f74.google.com with SMTP id s24so350101vbi.3 for ; Fri, 16 Nov 2012 13:28:52 -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=Dq8U3CDbBz0iSxKosEaqeKHtvfbl9qrbO4kuCD1dE04=; b=NOJbwQldthXN/uGtdhzIkEgYyt44S4Ay/5Q44UBTSMKvn65bvMXEQz1YYzS05N+Pdh x1BcjeICEyWd5mjSW5zw1btNrCMQZ5vvVQKLFBzO7pD1P+HIRsE1IAQNM6wL1EBKS0SM 3GjrBPkouoOndqqb86MQzfsKkSxndvDPI7/Tc5bjFaaymuk616yvHiyTSfqc4V4uDOJo zZXAM3DtD5+CX2FP2rQrJA5wbXBbD88M/JOHWn+UzGolX6nPxiIpsQ585QQUOj3exdUl FgMUEJ/zEHu/AJdE8OVGk10oM0pNrk0Pe6GObGNIsYM/CdyQJrWHexSMsMWQRoAt3goe ejrw== Received: by 10.236.183.202 with SMTP id q50mr4135017yhm.29.1353101332526; Fri, 16 Nov 2012 13:28:52 -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 b7si212524yhj.1.2012.11.16.13.28.52 (version=TLSv1/SSLv3 cipher=AES128-SHA); Fri, 16 Nov 2012 13:28:52 -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 53ECD100048; Fri, 16 Nov 2012 13:28:52 -0800 (PST) Received: by kaka.mtv.corp.google.com (Postfix, from userid 121222) id 2BEE0160847; Fri, 16 Nov 2012 13:28:52 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Date: Fri, 16 Nov 2012 13:20:36 -0800 Message-Id: <1353100842-20126-52-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: ALoCoQlHH5Ox9eWSiacbcLacNyls6r5C700MyDA09DfJaMroUJVWmYGuhG2A6ONnYqfYe+HXZ/qkh676v/v1Y1d3cum1A1FdWoni9709M1b8oqdy2nKWbeRFBgfj5uMg+fOxKfgdSisnOT8Nv0bzMBXQMrM3ua13wHanGebdhaK975sl1NRRzIrOKj51mCiccq6wuWZ/kq5H Cc: Tom Rini , Scott McNutt Subject: [U-Boot] [PATCH 51/57] nios2: 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 nios2 over to use generic global_data. Signed-off-by: Simon Glass Acked-by: Thomas Chou --- arch/nios2/include/asm/global_data.h | 24 +----------------------- 1 files changed, 1 insertions(+), 23 deletions(-) diff --git a/arch/nios2/include/asm/global_data.h b/arch/nios2/include/asm/global_data.h index cf8597b..39c5700 100644 --- a/arch/nios2/include/asm/global_data.h +++ b/arch/nios2/include/asm/global_data.h @@ -27,29 +27,7 @@ struct arch_global_data { }; -typedef struct global_data { - bd_t *bd; - unsigned long flags; - unsigned int baudrate; - unsigned long cpu_clk; /* CPU clock in Hz! */ - unsigned long have_console; /* serial_init() was called */ -#ifdef CONFIG_PRE_CONSOLE_BUFFER - unsigned long precon_buf_idx; /* Pre-Console buffer index */ -#endif - phys_size_t ram_size; /* RAM size */ - unsigned long env_addr; /* Address of Environment struct */ - unsigned long env_valid; /* Checksum of Environment valid */ -#if defined(CONFIG_POST) || defined(CONFIG_LOGBUFFER) - unsigned long post_log_word; /* Record POST activities */ - unsigned long post_log_res; /* success of POST test */ - unsigned long post_init_f_time; /* When post_init_f started */ -#endif - void **jt; /* Standalone app jump table */ - char env_buf[32]; /* buffer for getenv() before reloc. */ - struct arch_global_data arch; /* architecture-specific data */ -} gd_t; - -#include +#include #define DECLARE_GLOBAL_DATA_PTR register gd_t *gd asm ("gp")