diff options
| author | Tom Rini <[email protected]> | 2024-10-03 11:52:42 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2024-10-03 11:52:42 -0600 |
| commit | 0d28900dd171d3444ea16d9cc18af35a90c03e27 (patch) | |
| tree | 246e8a9bb1b15c7c2791f6a8b60e6420bcf35216 /include | |
| parent | 08990e2254ffd63ade7f633b78b6573abc9b7e90 (diff) | |
| parent | fe38b88453d2ed40e1009d22f3f4d4213d2016b7 (diff) | |
Merge patch series "vbe: Series part D"
Simon Glass <[email protected]> says:
This includes various patches towards implementing the VBE abrec
bootmeth in U-Boot.
Diffstat (limited to 'include')
| -rw-r--r-- | include/bootdev.h | 8 | ||||
| -rw-r--r-- | include/gzip.h | 6 |
2 files changed, 12 insertions, 2 deletions
diff --git a/include/bootdev.h b/include/bootdev.h index 2cee8832d26..ad4af0d1310 100644 --- a/include/bootdev.h +++ b/include/bootdev.h @@ -395,6 +395,7 @@ int bootdev_next_prio(struct bootflow_iter *iter, struct udevice **devp); */ int bootdev_setup_for_dev(struct udevice *parent, const char *drv_name); +#if CONFIG_IS_ENABLED(BOOTSTD) /** * bootdev_setup_for_sibling_blk() - Bind a new bootdev device for a blk device * @@ -409,6 +410,13 @@ int bootdev_setup_for_dev(struct udevice *parent, const char *drv_name); * Return: 0 if OK, -ve on error */ int bootdev_setup_for_sibling_blk(struct udevice *blk, const char *drv_name); +#else +static int bootdev_setup_for_sibling_blk(struct udevice *blk, + const char *drv_name) +{ + return 0; +} +#endif /** * bootdev_get_sibling_blk() - Locate the block device for a bootdev diff --git a/include/gzip.h b/include/gzip.h index 5e0d0ec07fb..304002ffc42 100644 --- a/include/gzip.h +++ b/include/gzip.h @@ -28,7 +28,8 @@ int gzip_parse_header(const unsigned char *src, unsigned long len); * @dst: Destination for uncompressed data * @dstlen: Size of destination buffer * @src: Source data to decompress - * @lenp: Returns length of uncompressed data + * @lenp: On entry, length of data at @src. On exit, number of bytes used from + * @src * Return: 0 if OK, -1 on error */ int gunzip(void *dst, int dstlen, unsigned char *src, unsigned long *lenp); @@ -39,7 +40,8 @@ int gunzip(void *dst, int dstlen, unsigned char *src, unsigned long *lenp); * @dst: Destination for uncompressed data * @dstlen: Size of destination buffer * @src: Source data to decompress - * @lenp: On entry, length data at @src. On exit, number of bytes used from @src + * @lenp: On entry, length of data at @src. On exit, number of bytes used from + * @src * @stoponerr: 0 to continue when a decode error is found, 1 to stop * @offset: start offset within the src buffer * Return: 0 if OK, -1 on error |