Merge branch 'master' of git://git.denx.de/u-boot-arm

[karo-tx-uboot.git] / include / spl.h

diff --git a/include/spl.h b/include/spl.h
index a7e41da7fd4980ef2362816a63d8680cc26ef1b9..16b3566a947398493fe102afa7e210048e1b2429 100644 (file)
--- a/include/spl.h
+++ b/include/spl.h
@@ -15,7 +15,7 @@
 /* Boot type */
 #define MMCSD_MODE_UNDEFINED   0
 #define MMCSD_MODE_RAW         1
-#define MMCSD_MODE_FAT         2
+#define MMCSD_MODE_FS          2
 #define MMCSD_MODE_EMMCBOOT    3
 
 struct spl_image_info {
@@ -72,6 +72,12 @@ void spl_sata_load_image(void);
 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);
 
+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);
+
 #ifdef CONFIG_SPL_BOARD_INIT
 void spl_board_init(void);
 #endif