Merge git://git.denx.de/u-boot-dm

This commit is contained in:
Tom Rini 2016-03-14 19:21:44 -04:00
commit 88033d737d
121 changed files with 1738 additions and 1022 deletions

View file

@ -90,14 +90,16 @@ int spl_usb_load_image(void);
int spl_sata_load_image(void);
/* SPL FAT image functions */
int spl_load_image_fat(block_dev_desc_t *block_dev, int partition, const char *filename);
int spl_load_image_fat_os(block_dev_desc_t *block_dev, int partition);
int spl_load_image_fat(struct blk_desc *block_dev, int partition,
const char *filename);
int spl_load_image_fat_os(struct blk_desc *block_dev, int partition);
void __noreturn jump_to_image_no_args(struct spl_image_info *spl_image);
/* SPL EXT image functions */
int spl_load_image_ext(block_dev_desc_t *block_dev, int partition, const char *filename);
int spl_load_image_ext_os(block_dev_desc_t *block_dev, int partition);
int spl_load_image_ext(struct blk_desc *block_dev, int partition,
const char *filename);
int spl_load_image_ext_os(struct blk_desc *block_dev, int partition);
/**
* spl_init() - Set up device tree and driver model in SPL if enabled