projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-fdt
[platform/kernel/u-boot.git]
/
include
/
asm-m68k
/
global_data.h
diff --git
a/include/asm-m68k/global_data.h
b/include/asm-m68k/global_data.h
index
958736e
..
413c200
100644
(file)
--- a/
include/asm-m68k/global_data.h
+++ b/
include/asm-m68k/global_data.h
@@
-30,7
+30,7
@@
* global variables during system initialization (until we have set
* up the memory controller so that we can use RAM).
*
* global variables during system initialization (until we have set
* up the memory controller so that we can use RAM).
*
- * Keep it *SMALL* and remember to set C
FG
_GBL_DATA_SIZE > sizeof(gd_t)
+ * Keep it *SMALL* and remember to set C
ONFIG_SYS
_GBL_DATA_SIZE > sizeof(gd_t)
*/
typedef struct global_data {
*/
typedef struct global_data {
@@
-47,7
+47,11
@@
typedef struct global_data {
unsigned long vco_clk;
unsigned long flb_clk;
#endif
unsigned long vco_clk;
unsigned long flb_clk;
#endif
- unsigned long ram_size; /* RAM size */
+#ifdef CONFIG_FSL_I2C
+ unsigned long i2c1_clk;
+ unsigned long i2c2_clk;
+#endif
+ phys_size_t ram_size; /* RAM size */
unsigned long reloc_off; /* Relocation Offset */
unsigned long reset_status; /* reset status register at boot */
unsigned long env_addr; /* Address of Environment struct */
unsigned long reloc_off; /* Relocation Offset */
unsigned long reset_status; /* reset status register at boot */
unsigned long env_addr; /* Address of Environment struct */
@@
-69,6
+73,9
@@
typedef struct global_data {
#define GD_FLG_DEVINIT 0x00002 /* Devices have been initialized */
#define GD_FLG_SILENT 0x00004 /* Silent mode */
#define GD_FLG_POSTFAIL 0x00008 /* Critical POST test failed */
#define GD_FLG_DEVINIT 0x00002 /* Devices have been initialized */
#define GD_FLG_SILENT 0x00004 /* Silent mode */
#define GD_FLG_POSTFAIL 0x00008 /* Critical POST test failed */
+#define GD_FLG_POSTSTOP 0x00010 /* POST seqeunce aborted */
+#define GD_FLG_LOGINIT 0x00020 /* Log Buffer has been initialized */
+#define GD_FLG_DISABLE_CONSOLE 0x00040 /* Disable console (in & out) */
#if 0
extern gd_t *global_data;
#if 0
extern gd_t *global_data;