diff options
| author | Tom Rini <trini@konsulko.com> | 2017-01-16 20:23:14 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-01-16 20:23:14 -0500 |
| commit | f253f2933b7373556329c0174dd5b101039a4056 (patch) | |
| tree | ccd88584899bdc9a66d2d20ab422acac29ab1799 /include | |
| parent | 035ebf85b09cf11c820ae9eec414097420741abd (diff) | |
| parent | 3b593f9030bae149af9261f51933805be506f6b1 (diff) | |
| download | u-boot-f253f2933b7373556329c0174dd5b101039a4056.tar.gz u-boot-f253f2933b7373556329c0174dd5b101039a4056.tar.bz2 u-boot-f253f2933b7373556329c0174dd5b101039a4056.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-video
Diffstat (limited to 'include')
| -rw-r--r-- | include/image.h | 4 | ||||
| -rw-r--r-- | include/splash.h | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/include/image.h b/include/image.h index 6207d62d3c..164b584533 100644 --- a/include/image.h +++ b/include/image.h @@ -872,6 +872,8 @@ int bootz_setup(ulong image, ulong *start, ulong *end); /* image node */ #define FIT_DATA_PROP "data" +#define FIT_DATA_OFFSET_PROP "data-offset" +#define FIT_DATA_SIZE_PROP "data-size" #define FIT_TIMESTAMP_PROP "timestamp" #define FIT_DESC_PROP "description" #define FIT_ARCH_PROP "arch" @@ -950,6 +952,8 @@ int fit_image_get_load(const void *fit, int noffset, ulong *load); int fit_image_get_entry(const void *fit, int noffset, ulong *entry); int fit_image_get_data(const void *fit, int noffset, const void **data, size_t *size); +int fit_image_get_data_offset(const void *fit, int noffset, int *data_offset); +int fit_image_get_data_size(const void *fit, int noffset, int *data_size); int fit_image_hash_get_algo(const void *fit, int noffset, char **algo); int fit_image_hash_get_value(const void *fit, int noffset, uint8_t **value, diff --git a/include/splash.h b/include/splash.h index 136eac7402..228aff441b 100644 --- a/include/splash.h +++ b/include/splash.h @@ -33,8 +33,9 @@ enum splash_storage { }; enum splash_flags { - SPLASH_STORAGE_RAW, - SPLASH_STORAGE_FS, + SPLASH_STORAGE_RAW, /* Stored in raw memory */ + SPLASH_STORAGE_FS, /* Stored within a file system */ + SPLASH_STORAGE_FIT, /* Stored inside a FIT image */ }; struct splash_location { |