projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-mmc
[platform/kernel/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
18a319d
..
5d7f7e6
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_
ARCH_OMAP2PLUS
) \
|| defined(CONFIG_EXYNOS4) || defined(CONFIG_EXYNOS5) \
|| defined(CONFIG_EXYNOS4210)
/* Platform-specific defines */
|| defined(CONFIG_EXYNOS4) || defined(CONFIG_EXYNOS5) \
|| defined(CONFIG_EXYNOS4210)
/* Platform-specific defines */
@@
-24,8
+24,11
@@
enum {
BOOT_DEVICE_NOR,
BOOT_DEVICE_UART,
BOOT_DEVICE_SPI,
BOOT_DEVICE_NOR,
BOOT_DEVICE_UART,
BOOT_DEVICE_SPI,
+ BOOT_DEVICE_USB,
BOOT_DEVICE_SATA,
BOOT_DEVICE_I2C,
BOOT_DEVICE_SATA,
BOOT_DEVICE_I2C,
+ BOOT_DEVICE_BOARD,
+ BOOT_DEVICE_DFU,
BOOT_DEVICE_NONE
};
#endif
BOOT_DEVICE_NONE
};
#endif
@@
-33,6
+36,8
@@
enum {
/* 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