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

[u-boot] / arch / arm / include / asm / spl.h

diff --git a/arch/arm/include/asm/spl.h b/arch/arm/include/asm/spl.h
index 19e6c5050f5734cfade91ff1576735e002bd653b..62011aaada411fdfbb9fe5af857df23f421633d6 100644 (file)
--- a/arch/arm/include/asm/spl.h
+++ b/arch/arm/include/asm/spl.h
@@ -26,36 +26,9 @@
 /* Platform-specific defines */
 #include <asm/arch/spl.h>
 
-struct spl_image_info {
-       const char *name;
-       u8 os;
-       u32 load_addr;
-       u32 entry_point;
-       u32 size;
-};
+/* Linker symbols. */
+extern char __bss_start[], __bss_end__[];
 
-extern struct spl_image_info spl_image;
-extern u32 *boot_params_ptr;
+extern gd_t gdata;
 
-/* SPL common functions */
-void preloader_console_init(void);
-u32 spl_boot_device(void);
-u32 spl_boot_mode(void);
-void spl_parse_image_header(const struct image_header *header);
-void spl_board_prepare_for_linux(void);
-int spl_start_uboot(void);
-void spl_display_print(void);
-
-/* NAND SPL functions */
-void spl_nand_load_image(void);
-
-/* MMC SPL functions */
-void spl_mmc_load_image(void);
-
-/* YMODEM SPL functions */
-void spl_ymodem_load_image(void);
-
-#ifdef CONFIG_SPL_BOARD_INIT
-void spl_board_init(void);
-#endif
 #endif