diff options
| author | Tom Rini <trini@konsulko.com> | 2018-12-10 07:16:33 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-12-10 07:16:33 -0500 |
| commit | 7ff485c68b7e5573e5a4a877066e98398283a24f (patch) | |
| tree | 8070ad8de0b18240ee67e1c8b847afc37bdb2d5d /include/asm-generic/global_data.h | |
| parent | 7504e9e75f76a5101b47cd32851ad7bd4ea8ff70 (diff) | |
| parent | 19f8c4dfb6e744a31da59bdd23b24d144152f1dc (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-i2c
- DM_I2C_COMPAT removal for all ti platforms from Jean-Jacques Hiblot
- Fix in i2c command help output from Chirstoph Muellner.
Diffstat (limited to 'include/asm-generic/global_data.h')
| -rw-r--r-- | include/asm-generic/global_data.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/asm-generic/global_data.h b/include/asm-generic/global_data.h index dffd6b26026..78dcf40bff4 100644 --- a/include/asm-generic/global_data.h +++ b/include/asm-generic/global_data.h @@ -77,6 +77,10 @@ typedef struct global_data { #ifdef CONFIG_OF_LIVE struct device_node *of_root; #endif + +#if CONFIG_IS_ENABLED(MULTI_DTB_FIT) + const void *multi_dtb_fit; /* uncompressed multi-dtb FIT image */ +#endif struct jt_funcs *jt; /* jump table */ char env_buf[32]; /* buffer for env_get() before reloc. */ #ifdef CONFIG_TRACE |