diff options
| author | Tom Rini <[email protected]> | 2018-11-26 12:40:22 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2018-11-26 12:40:22 -0500 |
| commit | 6b21502229035779059493b2193fd790448fe85e (patch) | |
| tree | e48319d91713218a49706b7526f147f2d56c7aee /include/asm-generic | |
| parent | 5830791d91d1200854ef78fcb32f808c8080f0f0 (diff) | |
| parent | b0edea3c27af3bf7b959fa190a7fe9d7881153c5 (diff) | |
Merge branch '2018-11-25-master-imports'
- Bring in the series from Simon for SPL logging support and bloblist
Diffstat (limited to 'include/asm-generic')
| -rw-r--r-- | include/asm-generic/global_data.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/asm-generic/global_data.h b/include/asm-generic/global_data.h index c83fc01b764..dffd6b26026 100644 --- a/include/asm-generic/global_data.h +++ b/include/asm-generic/global_data.h @@ -122,6 +122,13 @@ typedef struct global_data { struct list_head log_head; /* List of struct log_device */ int log_fmt; /* Mask containing log format info */ #endif +#if CONFIG_IS_ENABLED(BLOBLIST) + struct bloblist_hdr *bloblist; /* Bloblist information */ + struct bloblist_hdr *new_bloblist; /* Relocated blolist info */ +# ifdef CONFIG_SPL + struct spl_handoff *spl_handoff; +# endif +#endif } gd_t; #endif |