diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-06-30 23:00:34 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-06-30 23:00:34 +0200 |
| commit | d6694aff569a0838a9d0ef352128f5aa309d73ff (patch) | |
| tree | a94eeab5431dfd0ed91a510c2e7de5eebb7a78fc /arch/arm/include/asm/spl.h | |
| parent | b5b8d85e9a50c2294b6043830cd045de1002dc5d (diff) | |
| parent | 3f4c01d9f9d38e383f004dcd06c0d5661f2a57e0 (diff) | |
| download | u-boot-d6694aff569a0838a9d0ef352128f5aa309d73ff.tar.gz u-boot-d6694aff569a0838a9d0ef352128f5aa309d73ff.tar.xz u-boot-d6694aff569a0838a9d0ef352128f5aa309d73ff.zip | |
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
Diffstat (limited to 'arch/arm/include/asm/spl.h')
| -rw-r--r-- | arch/arm/include/asm/spl.h | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/arch/arm/include/asm/spl.h b/arch/arm/include/asm/spl.h index 90e5a9dde1..18a319de2f 100644 --- a/arch/arm/include/asm/spl.h +++ b/arch/arm/include/asm/spl.h @@ -7,9 +7,29 @@ #ifndef _ASM_SPL_H_ #define _ASM_SPL_H_ +#if defined(CONFIG_OMAP) || defined(CONFIG_SOCFPGA) || defined(CONFIG_ZYNQ) \ + || defined(CONFIG_EXYNOS4) || defined(CONFIG_EXYNOS5) \ + || defined(CONFIG_EXYNOS4210) /* Platform-specific defines */ #include <asm/arch/spl.h> +#else +enum { + BOOT_DEVICE_RAM, + BOOT_DEVICE_MMC1, + BOOT_DEVICE_MMC2, + BOOT_DEVICE_MMC2_2, + BOOT_DEVICE_NAND, + BOOT_DEVICE_ONENAND, + BOOT_DEVICE_NOR, + BOOT_DEVICE_UART, + BOOT_DEVICE_SPI, + BOOT_DEVICE_SATA, + BOOT_DEVICE_I2C, + BOOT_DEVICE_NONE +}; +#endif + /* Linker symbols. */ extern char __bss_start[], __bss_end[]; |