mirror of
https://source.denx.de/u-boot/u-boot.git
synced 2026-06-13 15:03:58 +03:00
Merge patch series "vbe: Series part D"
Simon Glass <sjg@chromium.org> says: This includes various patches towards implementing the VBE abrec bootmeth in U-Boot.
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user