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 2bc53837d48df46c53c9b8ccd2a542fd4b683363..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
 
@@ -140,8 +139,8 @@
  * 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
@@ -168,6 +167,8 @@
 
 #define CONFIG_SYS_MONITOR_BASE       CONFIG_SYS_FLASH_BASE  /* Monitor at beginning of flash */
 
+#define PHYS_SRAM              0x20000000
+
 /*-----------------------------------------------------------------------
  * FLASH driver setup
  */
@@ -199,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 */