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 5e248561f13791ade05d69dea96f5315410cb20c..16b3566a947398493fe102afa7e210048e1b2429 100644 (file)
--- a/include/spl.h
+++ b/include/spl.h
@@ -15,7 +15,8 @@
 /* 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 {
        const char *name;
@@ -64,10 +65,19 @@ void spl_net_load_image(const char *device);
 /* USB SPL functions */
 void spl_usb_load_image(void);
 
+/* SATA SPL functions */
+void 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);
 
+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