From patchwork Fri Nov 16 21:20:33 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 199779 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 B854C2C0085 for ; Sat, 17 Nov 2012 08:36:30 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id DF8644A25F; Fri, 16 Nov 2012 22:35:21 +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 mwPcEEhGl4lt; Fri, 16 Nov 2012 22:35:21 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 962644A260; Fri, 16 Nov 2012 22:30:51 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 20FC54A189 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 pR2eNAakSfso for ; Fri, 16 Nov 2012 22:29:28 +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-yh0-f74.google.com (mail-yh0-f74.google.com [209.85.213.74]) by theia.denx.de (Postfix) with ESMTPS id 9A3AC4A1B3 for ; Fri, 16 Nov 2012 22:28:53 +0100 (CET) Received: by mail-yh0-f74.google.com with SMTP id 10so351859yhl.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=r3Gw+N+a8Jp1037dbzLdPeez3wjzezzK0iCqTRtdw98=; b=J3Lm614IcCtOHFSgOCzd4muTy6MSKV/kqQh/EDMrOGbbuYpXlHSZY+4WFVy7lxrk9B tMxialpRme6nzWWyVNZQCPG4jMgjjB6BYKFVWiDY3MmoWgGBY3S1p8p3VczUlE8zgf1F qiSFONyCmA3gPvTAwjjH4IwJ7eJTplK5qMg392Bbw5Fcgx4VQ6T6G7Wljqtjpy+6yIQn 1bCwbNw4XOXkdk9AxIz+HrnzcCkQ4MUlpZOdKUCG2T3IaVBycboQTDC+Idt9fN6AMsrZ Ew0OV8/fPgnriFLjZgauisoNV9MAdQrrzsUj4RbzWvI65ehpdAE3iBUGqLbkJpS9ecqA U+PQ== Received: by 10.236.151.39 with SMTP id a27mr4089713yhk.42.1353101332176; 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 r6si210742yhc.7.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 0491B100048; Fri, 16 Nov 2012 13:28:52 -0800 (PST) Received: by kaka.mtv.corp.google.com (Postfix, from userid 121222) id D9C9E1608CB; Fri, 16 Nov 2012 13:28:51 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Date: Fri, 16 Nov 2012 13:20:33 -0800 Message-Id: <1353100842-20126-49-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: ALoCoQnr361D5nnj3dXiTASny/2l47hPb1GU4phUBYSmTVqCjEf0pj73wnuywR38ALuOXITpzXKiBYAFqltFGEZQF6/2yEfkVdrFlite/fIMeOBOGFIe8+bewIcl1EaH9IBSyFt+l5sQQiUVrrlap7I30SdaBLzZ9CwA69W7eYZbfYmyQ3w4kw3SEnlg0f66+3RIO25hsMJi Cc: Tom Rini Subject: [U-Boot] [PATCH 48/57] microblaze: 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 microblaze over to use generic global_data. Signed-off-by: Simon Glass --- arch/microblaze/include/asm/global_data.h | 27 +-------------------------- 1 files changed, 1 insertions(+), 26 deletions(-) diff --git a/arch/microblaze/include/asm/global_data.h b/arch/microblaze/include/asm/global_data.h index 025131c..89dcef7 100644 --- a/arch/microblaze/include/asm/global_data.h +++ b/arch/microblaze/include/asm/global_data.h @@ -29,32 +29,7 @@ struct arch_global_data { }; -/* - * 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 env_addr; /* Address of Environment struct */ - const void *fdt_blob; /* Our device tree, NULL if none */ - unsigned long env_valid; /* Checksum of Environment valid? */ - unsigned long fb_base; /* base address of frame buffer */ - 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 volatile gd_t *gd asm ("r31")