From patchwork Fri Dec 14 06:49:15 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 206352 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 ED54A2C009F for ; Fri, 14 Dec 2012 18:03:43 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 11ADB4A485; Fri, 14 Dec 2012 08:03:08 +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 YIg+GxQ7OdCo; Fri, 14 Dec 2012 08:03:07 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 9C57A4A26A; Fri, 14 Dec 2012 07:55:57 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 9160A4A124 for ; Fri, 14 Dec 2012 07:53:15 +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 rD4zJ4BdChcM for ; Fri, 14 Dec 2012 07:53:13 +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-wg0-f74.google.com (mail-wg0-f74.google.com [74.125.82.74]) by theia.denx.de (Postfix) with ESMTPS id A9F584A143 for ; Fri, 14 Dec 2012 07:50:25 +0100 (CET) Received: by mail-wg0-f74.google.com with SMTP id dt14so155711wgb.3 for ; Thu, 13 Dec 2012 22:50:23 -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=r6WN6ZjceQnBxPrrmrQBB7v2Nil99l9EBUHx9SmbgSw=; b=nG3AYdSNOeV538w2d5RsnxXAMJ2uiG0uYRa58ntkkHk6Zp8yK0laYSgEpphRriLLeJ N1Cgw33UNM9LtDkGxZFb6CMUNLlxzU4/KxnSjigvNFew8cqQsr6UJjReJH+DxZctt7pX 0vqbgnBFGkHsWii8DuOwtibGqGYMVBkeS7maszQVsijGzTQLm4gshD3F6D9nUPeehRya Q5NmWA//DzGyIsKHMI2o1N+xhsTGEEqF9sOKM9XT77Yp/PwX0GEnnwIHVDdo2Wnd5fuT KNL0b6Wx6Vz3xj3fHMPEl49A0AtZTvCRoPFvS9goFdizFfy810Y0ei7fZRgV9rRQZh74 uGjw== Received: by 10.14.214.197 with SMTP id c45mr4606075eep.7.1355467823621; Thu, 13 Dec 2012 22:50:23 -0800 (PST) Received: from hpza10.eem.corp.google.com ([74.125.121.33]) by gmr-mx.google.com with ESMTPS id z44si963826een.0.2012.12.13.22.50.23 (version=TLSv1/SSLv3 cipher=AES128-SHA); Thu, 13 Dec 2012 22:50:23 -0800 (PST) Received: from kaka.mtv.corp.google.com (kaka.mtv.corp.google.com [172.22.73.79]) by hpza10.eem.corp.google.com (Postfix) with ESMTP id 411E920004E; Thu, 13 Dec 2012 22:50:23 -0800 (PST) Received: by kaka.mtv.corp.google.com (Postfix, from userid 121222) id 01767160878; Thu, 13 Dec 2012 22:50:22 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Date: Thu, 13 Dec 2012 22:49:15 -0800 Message-Id: <1355467767-29575-47-git-send-email-sjg@chromium.org> X-Mailer: git-send-email 1.7.7.3 In-Reply-To: <1355467767-29575-1-git-send-email-sjg@chromium.org> References: <1355467767-29575-1-git-send-email-sjg@chromium.org> X-Gm-Message-State: ALoCoQksY+nI6+3f3muEJk6W2b1M5UqBM+cfvkZ+wvCPM04XI4hv8AWp3z+UC2TNPfKMmQ6r4RrUiu1HGJ/M6dyXDPEBPKf2j1MoD4GZuZlWeXwrlvUzvksLPbib7pe5EmvKWnxDn1qK9hoiaUIN8MVSc9SKpRPO8qsHSF+nw+J2axK/3eNgHyICkJpryOrJTxiguUUSdqqL Cc: Tom Rini Subject: [U-Boot] [PATCH v2 46/58] avr32: 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 avr32 over to use generic global_data. Signed-off-by: Simon Glass --- Changes in v2: None arch/avr32/include/asm/global_data.h | 29 +---------------------------- 1 files changed, 1 insertions(+), 28 deletions(-) diff --git a/arch/avr32/include/asm/global_data.h b/arch/avr32/include/asm/global_data.h index aeb6605..a71f199 100644 --- a/arch/avr32/include/asm/global_data.h +++ b/arch/avr32/include/asm/global_data.h @@ -28,34 +28,7 @@ struct arch_global_data { unsigned long cpu_hz; /* cpu core clock frequency */ }; -/* - * 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 env struct */ - unsigned long env_valid; /* Checksum of env valid? */ -#if defined(CONFIG_LCD) - void *fb_base; /* framebuffer address */ -#endif - void **jt; /* 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("r5")