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

[u-boot] / arch / arm / include / asm / arch-omap5 / omap.h

diff --git a/arch/arm/include/asm/arch-omap5/omap.h b/arch/arm/include/asm/arch-omap5/omap.h
index e844bfb884e1203ad8188939b504a17d5c7c5df6..524fae4bb9c642307212c0b56b7936e1b73c5952 100644 (file)
--- a/arch/arm/include/asm/arch-omap5/omap.h
+++ b/arch/arm/include/asm/arch-omap5/omap.h
@@ -216,27 +216,6 @@ struct s32ktimer {
 #define OMAP5_ABB_LDOVBBMPU_MUX_CTRL_MASK      (0x1 << 10)
 #define OMAP5_ABB_LDOVBBMPU_VSET_OUT_MASK      (0x1f << 0)
 
-/* IO Delay module defines */
-#define CFG_IO_DELAY_BASE              0x4844A000
-#define CFG_IO_DELAY_LOCK              (CFG_IO_DELAY_BASE + 0x02C)
-
-/* CPSW IO Delay registers*/
-#define CFG_RGMII0_TXCTL               (CFG_IO_DELAY_BASE + 0x74C)
-#define CFG_RGMII0_TXD0                        (CFG_IO_DELAY_BASE + 0x758)
-#define CFG_RGMII0_TXD1                        (CFG_IO_DELAY_BASE + 0x764)
-#define CFG_RGMII0_TXD2                        (CFG_IO_DELAY_BASE + 0x770)
-#define CFG_RGMII0_TXD3                        (CFG_IO_DELAY_BASE + 0x77C)
-#define CFG_VIN2A_D13                  (CFG_IO_DELAY_BASE + 0xA7C)
-#define CFG_VIN2A_D17                  (CFG_IO_DELAY_BASE + 0xAAC)
-#define CFG_VIN2A_D16                  (CFG_IO_DELAY_BASE + 0xAA0)
-#define CFG_VIN2A_D15                  (CFG_IO_DELAY_BASE + 0xA94)
-#define CFG_VIN2A_D14                  (CFG_IO_DELAY_BASE + 0xA88)
-
-#define CFG_IO_DELAY_UNLOCK_KEY                0x0000AAAA
-#define CFG_IO_DELAY_LOCK_KEY          0x0000AAAB
-#define CFG_IO_DELAY_ACCESS_PATTERN    0x00029000
-#define CFG_IO_DELAY_LOCK_MASK         0x400
-
 #ifndef __ASSEMBLY__
 struct srcomp_params {
        s8 divide_factor;
@@ -255,9 +234,17 @@ struct ctrl_ioregs {
        u32 ctrl_ddr_ctrl_ext_0;
 };
 
-struct io_delay {
-       u32 addr;
-       u32 dly;
-};
 #endif /* __ASSEMBLY__ */
+
+/* Boot parameters */
+#ifndef __ASSEMBLY__
+struct omap_boot_parameters {
+       unsigned int boot_message;
+       unsigned int boot_device_descriptor;
+       unsigned char boot_device;
+       unsigned char reset_reason;
+       unsigned char ch_flags;
+};
+#endif
+
 #endif