From patchwork Fri Dec 14 06:49:18 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 206353 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 056B82C0097 for ; Fri, 14 Dec 2012 18:03:51 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 9F5AC4A276; Fri, 14 Dec 2012 08:03:17 +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 Kph+cvKv3J1C; Fri, 14 Dec 2012 08:03:17 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 295B74A237; Fri, 14 Dec 2012 07:55:59 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id DA5E64A12E for ; Fri, 14 Dec 2012 07:53:19 +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 VG-zqbBmSpLJ for ; Fri, 14 Dec 2012 07:53:16 +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 BA4AF4A144 for ; Fri, 14 Dec 2012 07:50:25 +0100 (CET) Received: by mail-qa0-f74.google.com with SMTP id r4so48760qaq.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=gBj6SSrKzU16aKKZp4RV1yKp1nCxI8Qsoe4tMOP219o=; b=MrBQDnPwEsD9WC7Z+wsZnE/awgTZhhpR8Bf928QzwxBMOzZ3fUn4Q7Yv1ZKlhOMkp+ O5O/b1NnoKxsFmQ76gpGM93VZCjRkl0JeJvks66c4hLPo1XvZO5U5HhBYrZKTN5zYB/n t+Tnp5uzjNZbpFWKt6YScLhFAVLoHaa0pG5S1Bn7/M6ntg4jH0HQxOdfewTcInr9r2wA MT78Rz3u/t7A55NjhdIykYhvsShjJxrUMVid3TXRkIVctA8R6KDM+9/IRDa89DLBitKY n6DoQ1Z7AhagLFCfGQ4vLVP47npbfF+wFMpM2sjWIk8FH4ihkeZ3lZGSXcy9Tr8Jetyz VIZQ== Received: by 10.101.175.32 with SMTP id c32mr557224anp.8.1355467823596; Thu, 13 Dec 2012 22:50:23 -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 j11si183547ank.2.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 wpzn3.hot.corp.google.com (Postfix) with ESMTP id 6EF42100048; Thu, 13 Dec 2012 22:50:23 -0800 (PST) Received: by kaka.mtv.corp.google.com (Postfix, from userid 121222) id 4926C1608F3; Thu, 13 Dec 2012 22:50:23 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Date: Thu, 13 Dec 2012 22:49:18 -0800 Message-Id: <1355467767-29575-50-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: ALoCoQnIyG//j6ivCvvlHr8qI9Cn4TLIShZ1SjDZyEfgEvQFXjkMnzYe+31yiocKsh1NW17hYAtA2h/LuE/vSbrSUU+lQs9RcRrAzbVrvn9X9rm0auObIdi9c/wLNKren26qxIKShb8kgW7I6hpi0mLMWd8syxT/0G2BKuIYeu5Qk1apdqm8CB3N0nL1fsQoEGVNd/yb0Rq/ Cc: Tom Rini Subject: [U-Boot] [PATCH v2 49/58] 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 Tested-by: Michal Simek --- Changes in v2: None 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")