smallsolar/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge git://git.denx.de/u-boot-dm

Browse Source 
Conflicts:
	drivers/serial/serial-uclass.c

Signed-off-by: Tom Rini <trini@ti.com>
This commit is contained in:
Tom Rini
2014-11-24 12:01:48 -05:00
parent 746667f1e5 17b28edb37
commit 1739564e75
41 changed files with 1049 additions and 365 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/asm-generic/global_data.h
View File

@@ -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 */