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 /arch/x86/include/asm/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 'arch/x86/include/asm/global_data.h')
-rw-r--r-- | arch/x86/include/asm/global_data.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/x86/include/asm/global_data.h b/arch/x86/include/asm/global_data.h index 797397e6977..17a4d344913 100644 --- a/arch/x86/include/asm/global_data.h +++ b/arch/x86/include/asm/global_data.h @@ -137,10 +137,4 @@ static inline __attribute__((no_instrument_function)) gd_t *get_fs_gd_ptr(void) #endif -/* - * Our private Global Data Flags - */ -#define GD_FLG_COLD_BOOT 0x10000 /* Cold Boot */ -#define GD_FLG_WARM_BOOT 0x20000 /* Warm Boot */ - #endif /* __ASM_GBL_DATA_H */ |