Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging

[oweals/u-boot.git] / include / configs / omap5912osk.h

diff --git a/include/configs/omap5912osk.h b/include/configs/omap5912osk.h
index 63cd9c6b76378282df409004d2750408bd004cb2..a8dfef321d36ca5668bdb27d7daf4f1773bf6a39 100644 (file)
--- a/include/configs/omap5912osk.h
+++ b/include/configs/omap5912osk.h
@@ -54,14 +54,13 @@
  * 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_LAN91C96
 #define CONFIG_LAN91C96_BASE 0x04800300
 #define CONFIG_LAN91C96_EXT_PHY
 
@@ -134,16 +133,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
@@ -170,6 +167,8 @@
 
 #define CONFIG_SYS_MONITOR_BASE       CONFIG_SYS_FLASH_BASE  /* Monitor at beginning of flash */
 
+#define PHYS_SRAM              0x20000000
+
 /*-----------------------------------------------------------------------
  * FLASH driver setup
  */
@@ -201,4 +200,7 @@
 #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 */