Patchwork [U-Boot,51/57] nios2: Use generic global_data

login
register
mail settings
Submitter Simon Glass
Date Nov. 16, 2012, 9:20 p.m.
Message ID <1353100842-20126-52-git-send-email-sjg@chromium.org>
Download mbox | patch
Permalink /patch/199783/
State Superseded, archived
Delegated to: Tom Rini
Headers show

Comments

Simon Glass - Nov. 16, 2012, 9:20 p.m.
Move nios2 over to use generic global_data.

Signed-off-by: Simon Glass <sjg@chromium.org>
---
 arch/nios2/include/asm/global_data.h |   24 +-----------------------
 1 files changed, 1 insertions(+), 23 deletions(-)
Thomas Chou - Nov. 20, 2012, 4:01 a.m.
On 11/17/2012 05:20 AM, Simon Glass wrote:
> Move nios2 over to use generic global_data.

Hi Simon,

Built and tested on nios2 board.

Acked-by: Thomas Chou <thomas@wytron.com.tw>

- Thomas

Patch

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 <asm-generic/global_data_flags.h>
+#include <asm-generic/global_data.h>
 
 #define DECLARE_GLOBAL_DATA_PTR     register gd_t *gd asm ("gp")