Merge branch 'master' of git://git.denx.de/u-boot

[karo-tx-uboot.git] / arch / arm / include / asm / omap_common.h

diff --git a/arch/arm/include/asm/omap_common.h b/arch/arm/include/asm/omap_common.h
index 34bec4568dac0ce43bc4232c111ee3cef0ce6bf0..2a40b898e351c806c03c81e020a179c3bec9a613 100644 (file)
--- a/arch/arm/include/asm/omap_common.h
+++ b/arch/arm/include/asm/omap_common.h
@@ -34,74 +34,11 @@
 #define OMAP_INIT_CONTEXT_UBOOT_AFTER_SPL      2
 #define OMAP_INIT_CONTEXT_UBOOT_AFTER_CH       3
 
-void preloader_console_init(void);
-
-/* Boot device */
-#ifdef CONFIG_OMAP54XX
-#define BOOT_DEVICE_NONE        0
-#define BOOT_DEVICE_XIP         1
-#define BOOT_DEVICE_XIPWAIT     2
-#define BOOT_DEVICE_NAND        3
-#define BOOT_DEVICE_ONE_NAND    4
-#define BOOT_DEVICE_MMC1        5
-#define BOOT_DEVICE_MMC2        6
-#define BOOT_DEVICE_MMC3       7
-#elif defined(CONFIG_OMAP44XX) /* OMAP4 */
-#define BOOT_DEVICE_NONE       0
-#define BOOT_DEVICE_XIP                1
-#define BOOT_DEVICE_XIPWAIT    2
-#define BOOT_DEVICE_NAND       3
-#define BOOT_DEVICE_ONE_NAND   4
-#define BOOT_DEVICE_MMC1       5
-#define BOOT_DEVICE_MMC2       6
-#elif defined(CONFIG_OMAP34XX) /* OMAP3 */
-#define BOOT_DEVICE_NONE       0
-#define BOOT_DEVICE_XIP                1
-#define BOOT_DEVICE_NAND       2
-#define BOOT_DEVICE_ONE_NAND   3
-#define BOOT_DEVICE_MMC2       5 /*emmc*/
-#define BOOT_DEVICE_MMC1       6
-#define BOOT_DEVICE_XIPWAIT    7
-#elif defined(CONFIG_AM33XX)   /* AM33XX */
-#define BOOT_DEVICE_NAND       5
-#define BOOT_DEVICE_MMC1       8
-#define BOOT_DEVICE_MMC2       0
-#define BOOT_DEVICE_UART       65
-#endif
-
-/* Boot type */
-#define        MMCSD_MODE_UNDEFINED    0
-#define MMCSD_MODE_RAW         1
-#define MMCSD_MODE_FAT         2
-#define NAND_MODE_HW_ECC       3
-
-struct spl_image_info {
-       const char *name;
-       u8 os;
-       u32 load_addr;
-       u32 entry_point;
-       u32 size;
-};
-
-extern struct spl_image_info spl_image;
-
-extern u32* boot_params_ptr;
-u32 omap_boot_device(void);
-u32 omap_boot_mode(void);
-
-/* SPL common function s*/
-void spl_parse_image_header(const struct image_header *header);
-void omap_rev_string(void);
-
-/* NAND SPL functions */
-void spl_nand_load_image(void);
-
-/* MMC SPL functions */
-void spl_mmc_load_image(void);
-
-#ifdef CONFIG_SPL_BOARD_INIT
-void spl_board_init(void);
-#endif
+static inline u32 omap_revision(void)
+{
+       extern u32 *const omap_si_rev;
+       return *omap_si_rev;
+}
 
 /*
  * silicon revisions.
@@ -122,4 +59,5 @@ void spl_board_init(void);
 /* omap5 */
 #define OMAP5430_SILICON_ID_INVALID    0
 #define OMAP5430_ES1_0 0x54300100
+#define OMAP5432_ES1_0 0x54320100
 #endif /* _OMAP_COMMON_H_ */