projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'zynq' of git://www.denx.de/git/u-boot-microblaze
[oweals/u-boot.git]
/
arch
/
arm
/
include
/
asm
/
spl.h
diff --git
a/arch/arm/include/asm/spl.h
b/arch/arm/include/asm/spl.h
index 18a319de2f6ab25c146f1d8f3d35f1f08934f6b8..5c5d33f0bdac78c8c6a68098adafc599eed56341 100644
(file)
--- a/
arch/arm/include/asm/spl.h
+++ b/
arch/arm/include/asm/spl.h
@@
-7,7
+7,7
@@
#ifndef _ASM_SPL_H_
#define _ASM_SPL_H_
#ifndef _ASM_SPL_H_
#define _ASM_SPL_H_
-#if defined(CONFIG_OMAP)
|| defined(CONFIG_SOCFPGA) || defined(CONFIG_ZYNQ)
\
+#if defined(CONFIG_OMAP) \
|| defined(CONFIG_EXYNOS4) || defined(CONFIG_EXYNOS5) \
|| defined(CONFIG_EXYNOS4210)
/* Platform-specific defines */
|| defined(CONFIG_EXYNOS4) || defined(CONFIG_EXYNOS5) \
|| defined(CONFIG_EXYNOS4210)
/* Platform-specific defines */
@@
-26,13
+26,25
@@
enum {
BOOT_DEVICE_SPI,
BOOT_DEVICE_SATA,
BOOT_DEVICE_I2C,
BOOT_DEVICE_SPI,
BOOT_DEVICE_SATA,
BOOT_DEVICE_I2C,
+ BOOT_DEVICE_BOARD,
BOOT_DEVICE_NONE
};
#endif
BOOT_DEVICE_NONE
};
#endif
+/**
+ * Board specific load method for boards that have a special way of loading
+ * U-Boot, which does not fit with the existing SPL code.
+ *
+ * @return 0 on success, negative errno value on failure.
+ */
+
+int spl_board_load_image(void);
+
/* Linker symbols. */
extern char __bss_start[], __bss_end[];
/* Linker symbols. */
extern char __bss_start[], __bss_end[];
+#ifndef CONFIG_DM
extern gd_t gdata;
extern gd_t gdata;
+#endif
#endif
#endif