Merge remote-tracking branch 'u-boot/master'

[platform/kernel/u-boot.git] / include / spl.h

diff --git a/include/spl.h b/include/spl.h
index 2923cd2..af94a82 100644 (file)
--- a/include/spl.h
+++ b/include/spl.h
@@ -38,8 +38,11 @@ struct spl_image_info {
        u32 load_addr;
        u32 entry_point;
        u32 size;
+       u32 flags;
 };
 
+#define SPL_COPY_PAYLOAD_ONLY  1
+
 extern struct spl_image_info spl_image;
 extern u32 *boot_params_ptr;
 
@@ -56,6 +59,9 @@ void spl_display_print(void);
 /* NAND SPL functions */
 void spl_nand_load_image(void);
 
+/* NOR SPL functions */
+void spl_nor_load_image(void);
+
 /* MMC SPL functions */
 void spl_mmc_load_image(void);
 
@@ -63,7 +69,7 @@ void spl_mmc_load_image(void);
 void spl_ymodem_load_image(void);
 
 /* SPI SPL functions */
-void spi_boot(void);
+void spl_spi_load_image(void);
 
 #ifdef CONFIG_SPL_BOARD_INIT
 void spl_board_init(void);