diff options
| author | Tom Rini <trini@ti.com> | 2014-11-24 12:01:48 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-11-24 12:01:48 -0500 |
| commit | 1739564e753bc3a8097f8937a3cbe738bdaaed5d (patch) | |
| tree | 56fe759e62f129dc055b6f6a22f299f6c8b5cdde /include/asm-generic | |
| parent | 746667f1e56bf08d03e66a178df3c4f4f6c806e1 (diff) | |
| parent | 17b28edb37a33d0c89089faf36e4edd7084f65fa (diff) | |
| download | blackbird-obmc-uboot-1739564e753bc3a8097f8937a3cbe738bdaaed5d.tar.gz blackbird-obmc-uboot-1739564e753bc3a8097f8937a3cbe738bdaaed5d.zip | |
Merge git://git.denx.de/u-boot-dm
Conflicts:
drivers/serial/serial-uclass.c
Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'include/asm-generic')
| -rw-r--r-- | include/asm-generic/global_data.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-generic/global_data.h b/include/asm-generic/global_data.h index f61acbc4fc..9c5a1e166f 100644 --- a/include/asm-generic/global_data.h +++ b/include/asm-generic/global_data.h @@ -108,5 +108,6 @@ typedef struct global_data { #define GD_FLG_DISABLE_CONSOLE 0x00040 /* Disable console (in & out) */ #define GD_FLG_ENV_READY 0x00080 /* Env. imported into hash table */ #define GD_FLG_SERIAL_READY 0x00100 /* Pre-reloc serial console ready */ +#define GD_FLG_FULL_MALLOC_INIT 0x00200 /* Full malloc() is ready */ #endif /* __ASM_GENERIC_GBL_DATA_H */ |
