diff options
| author | wdenk <wdenk> | 2004-02-12 00:47:09 +0000 | 
|---|---|---|
| committer | wdenk <wdenk> | 2004-02-12 00:47:09 +0000 | 
| commit | bf9e3b38f77c2eac620263dd60437c6ec47a27bf (patch) | |
| tree | d03891090553d167f3eb08d7f9c3f2532e43fcc2 /include/asm-m68k/global_data.h | |
| parent | a2d18bb7d31e7b971386fef505ff0218f3b6e893 (diff) | |
| download | olio-uboot-2014.01-bf9e3b38f77c2eac620263dd60437c6ec47a27bf.tar.xz olio-uboot-2014.01-bf9e3b38f77c2eac620263dd60437c6ec47a27bf.zip | |
* Some code cleanup
* Patch by Josef Baumgartner, 10 Feb 2004:
  Fixes for Coldfire port
* Patch by Brad Kemp, 11 Feb 2004:
  Fix CFI flash driver problems
Diffstat (limited to 'include/asm-m68k/global_data.h')
| -rw-r--r-- | include/asm-m68k/global_data.h | 7 | 
1 files changed, 6 insertions, 1 deletions
| diff --git a/include/asm-m68k/global_data.h b/include/asm-m68k/global_data.h index 89bc0ad3f..f8a3d8808 100644 --- a/include/asm-m68k/global_data.h +++ b/include/asm-m68k/global_data.h @@ -1,5 +1,5 @@  /* - * (C) Copyright 2002-2003 + * (C) Copyright 2002 - 2003   * Wolfgang Denk, DENX Software Engineering, wd@denx.de.   *   * See file CREDITS for list of people who contributed to this @@ -48,6 +48,7 @@ typedef	struct	global_data {  #ifdef CONFIG_BOARD_TYPES  	unsigned long	board_type;  #endif +	void		**jt;		/* Standalone app jump table */  } gd_t;  /* @@ -56,7 +57,11 @@ typedef	struct	global_data {  #define	GD_FLG_RELOC	0x00001		/* Code was relocated to RAM		*/  #define	GD_FLG_DEVINIT	0x00002		/* Devices have been initialized	*/ +#if 0  extern gd_t *global_data;  #define DECLARE_GLOBAL_DATA_PTR     gd_t *gd = global_data +#else +#define DECLARE_GLOBAL_DATA_PTR     register volatile gd_t *gd asm ("d7") +#endif  #endif /* __ASM_GBL_DATA_H */ |