arm: omap: innovator: use common code for machine type

[karo-tx-uboot.git] / include / configs / omap1610inn.h

diff --git a/include/configs/omap1610inn.h b/include/configs/omap1610inn.h
index 5dcfce15920da942ae1c454e3b98459a274fc57c..e3f3487ce21ee14bce383ceabe45049a4fbf6d1a 100644 (file)
--- a/include/configs/omap1610inn.h
+++ b/include/configs/omap1610inn.h
@@ -34,7 +34,8 @@
 #define CONFIG_OMAP    1                       /* in a TI OMAP core    */
 #define CONFIG_OMAP1610        1               /* which is in a 1610  */
 #define CONFIG_INNOVATOROMAP1610       1       /*  a Innovator Board  */
-#define CONFIG_MACH_OMAP_INNOVATOR     /* Select board mach-type */
+
+#define CONFIG_MACH_TYPE       MACH_TYPE_OMAP_INNOVATOR
 
 /* input clock of PLL */
 /* the OMAP1610 Innovator has 12MHz input clock */
@@ -51,14 +52,14 @@
  * Size of malloc() pool
  */
 #define CONFIG_SYS_MALLOC_LEN  (CONFIG_ENV_SIZE + 128*1024)
-#define CONFIG_SYS_GBL_DATA_SIZE       128     /* size in bytes reserved for initial data */
 
 /*
  * Hardware drivers
  */
 /*
 */
-#define CONFIG_DRIVER_LAN91C96
+#define CONFIG_NET_MULTI
+#define CONFIG_LAN91C96
 #define CONFIG_LAN91C96_BASE 0x04000300
 #define CONFIG_LAN91C96_EXT_PHY
 
@@ -130,16 +131,14 @@
 #define CONFIG_SYS_MEMTEST_START       0x10000000      /* memtest works on */
 #define CONFIG_SYS_MEMTEST_END 0x12000000      /* 32 MB in DRAM    */
 
-#undef CONFIG_SYS_CLKS_IN_HZ           /* everything, incl board info, in Hz */
-
 #define CONFIG_SYS_LOAD_ADDR   0x10000000      /* default load address */
 
 /* The 1610 has 6 timers, they can be driven by the RefClk (12Mhz) or by
  * DPLL1. This time is further subdivided by a local divisor.
  */
 #define CONFIG_SYS_TIMERBASE   0xFFFEC500      /* use timer 1 */
-#define CONFIG_SYS_PVT 7       /* 2^(pvt+1), divide by 256 */
-#define CONFIG_SYS_HZ  ((CONFIG_SYS_CLK_FREQ)/(2 << CONFIG_SYS_PVT))
+#define CONFIG_SYS_PTV         7       /* 2^(PTV+1), divide by 256 */
+#define CONFIG_SYS_HZ          ((CONFIG_SYS_CLK_FREQ)/(2 << CONFIG_SYS_PTV))
 
 /*-----------------------------------------------------------------------
  * Stack sizes
@@ -179,6 +178,8 @@ extern unsigned long omap_flash_base;               /* set in flash__init */
 
 #endif
 
+#define PHYS_SRAM              0x20000000
+
 /*-----------------------------------------------------------------------
  * FLASH and environment organization
  */
@@ -196,4 +197,7 @@ extern unsigned long omap_flash_base;               /* set in flash__init */
 #define CONFIG_ENV_SIZE        0x20000 /* Total Size of Environment Sector */
 #define CONFIG_ENV_OFFSET      0x20000 /* environment starts here  */
 
+#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM_1
+#define CONFIG_SYS_INIT_SP_ADDR        PHYS_SRAM
+
 #endif                                                 /* __CONFIG_H */