diff options
| author | Tom Rini <trini@konsulko.com> | 2019-08-19 09:21:46 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-08-19 09:21:46 -0400 |
| commit | 0ed2e2d825ac70d99ef89e3bb745979a22e2972e (patch) | |
| tree | 1ae055f2a6243c62af81ac0ce31fc49db3f8f2e2 /include/asm-generic/global_data.h | |
| parent | 81fed78c0a59af0d5698b13608eb4d26be84f397 (diff) | |
| parent | d117f917bfd2ccf4eaf90bddfa256501a554b1a4 (diff) | |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-x86
- QEMU build warning fix when CONFIG_DISTRO_DEFAULTS=n
- Small fixes on x86 reST docs
- Allow CBFS to be used in SPL
- Remove x86 specific GD flags
Diffstat (limited to 'include/asm-generic/global_data.h')
| -rw-r--r-- | include/asm-generic/global_data.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-generic/global_data.h b/include/asm-generic/global_data.h index 5372d5d8cd9..7587ba2ee58 100644 --- a/include/asm-generic/global_data.h +++ b/include/asm-generic/global_data.h @@ -150,7 +150,7 @@ typedef struct global_data { #endif /* - * Global Data Flags - the top 16 bits are reserved for arch-specific flags + * Global Data Flags */ #define GD_FLG_RELOC 0x00001 /* Code was relocated to RAM */ #define GD_FLG_DEVINIT 0x00002 /* Devices have been initialized */ |