diff options
| author | Tom Rini <[email protected]> | 2015-08-05 14:12:37 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2015-08-05 14:12:37 -0400 |
| commit | 1a2728ae4faf12874173de156b8a7e66cfbbeae5 (patch) | |
| tree | 9aba8e6c915b341df8ec6077d8ecb28f1eb32b0b /include/asm-generic | |
| parent | dcc7dbc73169bb4e39f27c1d95bbf031ccfc1744 (diff) | |
| parent | 12c7510f17ff29190e52336910e43a50c0d620a6 (diff) | |
Merge git://git.denx.de/u-boot-x86
Diffstat (limited to 'include/asm-generic')
| -rw-r--r-- | include/asm-generic/global_data.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-generic/global_data.h b/include/asm-generic/global_data.h index 7ef3e259b46..21552650025 100644 --- a/include/asm-generic/global_data.h +++ b/include/asm-generic/global_data.h @@ -104,7 +104,7 @@ typedef struct global_data { #endif /* - * Global Data Flags + * Global Data Flags - the top 16 bits are reserved for arch-specific flags */ #define GD_FLG_RELOC 0x00001 /* Code was relocated to RAM */ #define GD_FLG_DEVINIT 0x00002 /* Devices have been initialized */ @@ -117,5 +117,6 @@ typedef struct global_data { #define GD_FLG_SERIAL_READY 0x00100 /* Pre-reloc serial console ready */ #define GD_FLG_FULL_MALLOC_INIT 0x00200 /* Full malloc() is ready */ #define GD_FLG_SPL_INIT 0x00400 /* spl_init() has been called */ +#define GD_FLG_SKIP_RELOC 0x00800 /* Don't relocate */ #endif /* __ASM_GENERIC_GBL_DATA_H */ |