diff options
| author | Tom Rini <trini@konsulko.com> | 2019-07-24 16:24:50 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-07-24 16:24:50 -0400 |
| commit | f9b65c76b4828efbf8093c6b02bee5af0045b98b (patch) | |
| tree | 1429cb8e3cdfea42b63778ddf06ad0b33fb7bcf0 /include | |
| parent | a9aa4c5700c68c070d63a391b51ea8d341b6e8a6 (diff) | |
| parent | 44e02e39a91cd91aae5a28d90259d3a6996010bf (diff) | |
| download | u-boot-f9b65c76b4828efbf8093c6b02bee5af0045b98b.zip u-boot-f9b65c76b4828efbf8093c6b02bee5af0045b98b.tar.gz u-boot-f9b65c76b4828efbf8093c6b02bee5af0045b98b.tar.bz2 | |
Merge tag 'dm-pull-24jul19-take3' of https://gitlab.denx.de/u-boot/custodians/u-boot-dm
Minor driver-model fixes and tweaks
A few device-tree fixes
Binman support for extracting files from an image
Diffstat (limited to 'include')
| -rw-r--r-- | include/cbfs.h | 16 | ||||
| -rw-r--r-- | include/dm/read.h | 2 | ||||
| -rw-r--r-- | include/dm/uclass.h | 2 |
3 files changed, 16 insertions, 4 deletions
diff --git a/include/cbfs.h b/include/cbfs.h index bd1bf75..b8d1dab 100644 --- a/include/cbfs.h +++ b/include/cbfs.h @@ -40,6 +40,17 @@ enum cbfs_filetype { CBFS_TYPE_CMOS_LAYOUT = 0x01aa }; +enum { + CBFS_HEADER_MAGIC = 0x4f524243, +}; + +/** + * struct cbfs_header - header at the start of a CBFS region + * + * All fields use big-endian format. + * + * @magic: Magic number (CBFS_HEADER_MAGIC) + */ struct cbfs_header { u32 magic; u32 version; @@ -54,7 +65,8 @@ struct cbfs_fileheader { u8 magic[8]; u32 len; u32 type; - u32 checksum; + /* offset to struct cbfs_file_attribute or 0 */ + u32 attributes_offset; u32 offset; } __packed; @@ -65,7 +77,7 @@ struct cbfs_cachenode { u32 data_length; char *name; u32 name_length; - u32 checksum; + u32 attributes_offset; } __packed; extern enum cbfs_result file_cbfs_result; diff --git a/include/dm/read.h b/include/dm/read.h index 62d4be6..6ecd062 100644 --- a/include/dm/read.h +++ b/include/dm/read.h @@ -227,7 +227,7 @@ fdt_addr_t dev_read_addr_size(struct udevice *dev, const char *propname, /** * dev_read_name() - get the name of a device's node * - * @node: valid node to look up + * @dev: Device to read from * @return name of node */ const char *dev_read_name(struct udevice *dev); diff --git a/include/dm/uclass.h b/include/dm/uclass.h index 1bc62d5..484d166 100644 --- a/include/dm/uclass.h +++ b/include/dm/uclass.h @@ -297,7 +297,7 @@ int uclass_first_device_err(enum uclass_id id, struct udevice **devp); * * The device returned is probed if necessary, and ready for use * - * This function is useful to start iterating through a list of devices which + * This function is useful to iterate through a list of devices which * are functioning correctly and can be probed. * * @devp: On entry, pointer to device to lookup. On exit, returns pointer |