[U-Boot] [PATCH 10/48] x86: Tidy up global_data flags

[Simon Glass]

These flags now overlap some global ones. Adjust the x86-specific flags to
avoid this.

Signed-off-by: Simon Glass <sjg at chromium.org>
---

 arch/x86/include/asm/global_data.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/x86/include/asm/global_data.h b/arch/x86/include/asm/global_data.h
index 4d9eac6..abd70b9 100644
--- a/arch/x86/include/asm/global_data.h
+++ b/arch/x86/include/asm/global_data.h
@@ -87,14 +87,14 @@ static inline __attribute__((no_instrument_function)) gd_t *get_fs_gd_ptr(void)
 
 #define gd	get_fs_gd_ptr()
 
+#define DECLARE_GLOBAL_DATA_PTR
+
 #endif
 
 /*
  * Our private Global Data Flags
  */
-#define GD_FLG_COLD_BOOT	0x00100	/* Cold Boot */
-#define GD_FLG_WARM_BOOT	0x00200	/* Warm Boot */
-
-#define DECLARE_GLOBAL_DATA_PTR
+#define GD_FLG_COLD_BOOT	0x1000	/* Cold Boot */
+#define GD_FLG_WARM_BOOT	0x2000	/* Warm Boot */
 
 #endif /* __ASM_GBL_DATA_H */
-- 
2.4.3.573.g4eafbef