diff options
author | Wolfgang Denk <wd@denx.de> | 2007-03-22 00:00:03 +0100 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2007-03-22 00:00:03 +0100 |
commit | a17824c749aac3df0bbb528bb5d33af68296b0b1 (patch) | |
tree | 399efb15b55d6992279eef98fa6878852d403352 /include/asm-blackfin/global_data.h | |
parent | 2a8dfe08359a1b663418b2faa1da1d7bce34d302 (diff) | |
parent | b2777c087b5a564e9209988873da4ec749f85aad (diff) | |
download | talos-obmc-uboot-a17824c749aac3df0bbb528bb5d33af68296b0b1.tar.gz talos-obmc-uboot-a17824c749aac3df0bbb528bb5d33af68296b0b1.zip |
Merge with /home/wd/git/u-boot/custodian/u-boot-blackfin
Diffstat (limited to 'include/asm-blackfin/global_data.h')
-rw-r--r-- | include/asm-blackfin/global_data.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/include/asm-blackfin/global_data.h b/include/asm-blackfin/global_data.h index 56a12f07b3..1c738533c8 100644 --- a/include/asm-blackfin/global_data.h +++ b/include/asm-blackfin/global_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 |