Merge git://git.denx.de/u-boot-mmc

[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 90e5a9dde1d64fa599f9f9a91b33a81a4d5b743d..b9e8a4f5d5b5f86d735f66d329d6ead1cc70fdf5 100644 (file)
--- a/arch/arm/include/asm/spl.h
+++ b/arch/arm/include/asm/spl.h
@@ -1,18 +1,44 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * (C) Copyright 2012
  * Texas Instruments, <www.ti.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 #ifndef        _ASM_SPL_H_
 #define        _ASM_SPL_H_
 
+#if defined(CONFIG_ARCH_OMAP2PLUS) \
+       || 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_USB,
+       BOOT_DEVICE_SATA,
+       BOOT_DEVICE_I2C,
+       BOOT_DEVICE_BOARD,
+       BOOT_DEVICE_DFU,
+       BOOT_DEVICE_XIP,
+       BOOT_DEVICE_BOOTROM,
+       BOOT_DEVICE_NONE
+};
+#endif
+
 /* Linker symbols. */
 extern char __bss_start[], __bss_end[];
 
+#ifndef CONFIG_DM
 extern gd_t gdata;
+#endif
 
 #endif