diff options
| author | Peter Pearse <peter.pearse@arm.com> | 2007-04-19 13:17:20 +0100 |
|---|---|---|
| committer | Peter Pearse <peter.pearse@arm.com> | 2007-04-19 13:17:20 +0100 |
| commit | ee89bf2782406b1f87088b4764aeb6f811d82526 (patch) | |
| tree | b144476f4b5e92a414efff165d214d34062d4365 /include/asm-blackfin/global_data.h | |
| parent | 9c00dfb0bf89c8c23e8af5b5bdf49cf66d769f85 (diff) | |
| parent | 37837828d89084879bee2f2b8c7c68d4695940df (diff) | |
| download | u-boot-imx-ee89bf2782406b1f87088b4764aeb6f811d82526.zip u-boot-imx-ee89bf2782406b1f87088b4764aeb6f811d82526.tar.gz u-boot-imx-ee89bf2782406b1f87088b4764aeb6f811d82526.tar.bz2 | |
Merge with git://www.denx.de/git/u-boot.git
Diffstat (limited to 'include/asm-blackfin/global_data.h')
| -rw-r--r-- | include/asm-blackfin/global_data.h | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/include/asm-blackfin/global_data.h b/include/asm-blackfin/global_data.h index 56a12f0..9024d0a 100644 --- a/include/asm-blackfin/global_data.h +++ b/include/asm-blackfin/global_data.h @@ -1,7 +1,7 @@ /* * U-boot - global_data.h Declarations for global data of u-boot * - * Copyright (c) 2005 blackfin.uclinux.org + * Copyright (c) 2005-2007 Analog Devices Inc. * * (C) Copyright 2000-2004 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. @@ -21,8 +21,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, + * MA 02110-1301 USA */ #ifndef __ASM_GBL_DATA_H @@ -45,11 +45,16 @@ typedef struct global_data { unsigned long board_type; unsigned long baudrate; unsigned long have_console; /* serial_init() was called */ - unsigned long ram_size; /* RAM size */ + unsigned long ram_size; /* RAM size */ unsigned long reloc_off; /* Relocation Offset */ - unsigned long env_addr; /* Address of Environment struct */ + unsigned long env_addr; /* Address of Environment struct */ unsigned long env_valid; /* Checksum of Environment valid? */ - void **jt; /* jump table */ +#if defined(CONFIG_POST) || defined(CONFIG_LOGBUFFER) + unsigned long post_log_word; /* Record POST activities */ + unsigned long post_init_f_time; /* When post_init_f started */ +#endif + + void **jt; /* jump table */ } gd_t; /* @@ -59,6 +64,6 @@ typedef struct global_data { #define GD_FLG_DEVINIT 0x00002 /* Devices have been initialized */ #define GD_FLG_SILENT 0x00004 /* Silent mode */ -#define DECLARE_GLOBAL_DATA_PTR register volatile gd_t *gd asm ("P5") +#define DECLARE_GLOBAL_DATA_PTR register gd_t * volatile gd asm ("P5") #endif |