From patchwork Fri Dec 14 06:49:23 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 206347 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 7B6CA2C009A for ; Fri, 14 Dec 2012 18:02:49 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 4DF774A44B; Fri, 14 Dec 2012 08:02:18 +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 tg6q92kMHzUF; Fri, 14 Dec 2012 08:02:18 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A9D3C4A253; Fri, 14 Dec 2012 07:55:52 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 035C44A13B for ; Fri, 14 Dec 2012 07:53:43 +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 opWMQVIcqCUE for ; Fri, 14 Dec 2012 07:53:37 +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-gh0-f202.google.com (mail-gh0-f202.google.com [209.85.160.202]) by theia.denx.de (Postfix) with ESMTPS id 29A164A16A for ; Fri, 14 Dec 2012 07:50:26 +0100 (CET) Received: by mail-gh0-f202.google.com with SMTP id z10so309873ghb.3 for ; Thu, 13 Dec 2012 22:50:24 -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=UG2WB+YnKECS5WDSQBS2eKWRAZKX/oHwpEPMUyRSabg=; b=c6ep3uO/WpDfxiII+EguR3f/xQbC9RmqDxv12JP7Gpzr+LR0ADIrXC+5aJ2ngQpzVQ e7skaFlT0kHHwqeWdMRzSFI9vFoLUmbRFEjY0l8U5EZFPGzXQvewkLWPvcCty1n8NsP8 h2cDR12jduCc+Iy78sz9+F9T1eGD/XmkHeiz22RuKbPK6lJqcoErI/WfzwlcONGibkY/ GW1sW8FXwgup51gysh7oqeQBAsRQSZwSRk1IjApbkyMuB2Y8oUfvsFJsVs3rDH56GWQZ rlZT16NO2cgqDH2MdFggI8pXQMjsM2MtmNUQqik32RJFLrS1bpJQdZ+u/ZNbeJXQXe/8 gGmQ== Received: by 10.236.92.144 with SMTP id j16mr2221163yhf.44.1355467824124; Thu, 13 Dec 2012 22:50:24 -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 t49si349518yhc.1.2012.12.13.22.50.24 (version=TLSv1/SSLv3 cipher=AES128-SHA); Thu, 13 Dec 2012 22:50:24 -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 F08A1100047; Thu, 13 Dec 2012 22:50:23 -0800 (PST) Received: by kaka.mtv.corp.google.com (Postfix, from userid 121222) id D246B1608F3; Thu, 13 Dec 2012 22:50:23 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Date: Thu, 13 Dec 2012 22:49:23 -0800 Message-Id: <1355467767-29575-55-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: ALoCoQmjtMQ+1kIIVgPJz6SRw7/hkA1PB5r5O37bYjrP8fHNFNJ/Mgnm3Gyi3yMqfqjRAjNwGfXgJy49yHYGnn0SsUGaOMy/wTedY3SNHPHMq/fJcWydTJwciSCiGMk9KteWSVCpzu8k5n+zKrYbdYFcmxSCBLK9BL/houQ9TTFSWgb7/B2LGb0tyVe3ggdjhqn80UHiWO/F Cc: Kim Phillips , Kumar Gala , Andy Fleming , Tom Rini , Stefan Roese Subject: [U-Boot] [PATCH v2 54/58] powerpc: 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 powerpc over to use generic global_data. Signed-off-by: Simon Glass --- Changes in v2: None arch/powerpc/include/asm/global_data.h | 47 +------------------------------- 1 files changed, 1 insertions(+), 46 deletions(-) diff --git a/arch/powerpc/include/asm/global_data.h b/arch/powerpc/include/asm/global_data.h index 9bf18fb..d5db854 100644 --- a/arch/powerpc/include/asm/global_data.h +++ b/arch/powerpc/include/asm/global_data.h @@ -136,52 +136,7 @@ struct arch_global_data { #endif }; -/* - * 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 cpu_clk; /* CPU clock in Hz! */ - unsigned long bus_clk; - /* We cannot bracket this with CONFIG_PCI due to mpc5xxx */ - unsigned long pci_clk; - unsigned long mem_clk; - phys_size_t ram_size; /* RAM size */ - unsigned long env_addr; /* Address of Environment struct */ - unsigned long env_valid; /* Checksum of Environment valid? */ - 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 relocaddr; /* Start address of U-Boot in RAM */ -#if defined(CONFIG_LCD) || defined(CONFIG_VIDEO) - unsigned long fb_base; /* Base address of framebuffer memory */ -#endif -#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 -#ifdef CONFIG_BOARD_TYPES - unsigned long board_type; -#endif -#ifdef CONFIG_MODEM_SUPPORT - unsigned long do_mdm_init; - unsigned long be_quiet; -#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 #if 1 #define DECLARE_GLOBAL_DATA_PTR register volatile gd_t *gd asm ("r2")