diff options
| author | Tom Rini <trini@konsulko.com> | 2021-01-16 11:14:21 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-01-16 11:14:21 -0500 |
| commit | 14ea1b3635b4af8d9e283e3671f7ee872d50b859 (patch) | |
| tree | b8d1c05256b6f160a598656e797071081bd1f61e /include/asm-generic/global_data.h | |
| parent | b0db69b4e1e1bf1109bd9d4a5185cbd4058f4a8b (diff) | |
| parent | 750c543ca74a80da4b67882deb967c80fe790c3f (diff) | |
Merge branch '2021-01-15-assorted-improvements'
- Add MBR partition layout writing supporting, clean up code.
- A large number of assorted console/iomux cleanups
- A large number of board_r related cleanups.
- Log enhancements
Diffstat (limited to 'include/asm-generic/global_data.h')
| -rw-r--r-- | include/asm-generic/global_data.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-generic/global_data.h b/include/asm-generic/global_data.h index efa09a1943..19f70393b4 100644 --- a/include/asm-generic/global_data.h +++ b/include/asm-generic/global_data.h @@ -412,12 +412,12 @@ struct global_data { * @new_bloblist: relocated blob list information */ struct bloblist_hdr *new_bloblist; -# ifdef CONFIG_SPL +#endif +#if CONFIG_IS_ENABLED(HANDOFF) /** * @spl_handoff: SPL hand-off information */ struct spl_handoff *spl_handoff; -# endif #endif #if defined(CONFIG_TRANSLATION_OFFSET) /** |