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

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

diff --git a/include/configs/omap5912osk.h b/include/configs/omap5912osk.h
index bc660e39e829a86c5fdde4ab331168e60a01692c..40ca9bb98d763ed82ff09f075761d8bea3eceb1b 100644 (file)
--- a/include/configs/omap5912osk.h
+++ b/include/configs/omap5912osk.h
@@ -42,10 +42,6 @@
 /* the OMAP5912 OSK has 12MHz input clock */
 #define CONFIG_SYS_CLK_FREQ    12000000
 
-#undef CONFIG_USE_IRQ  /* we don't need IRQ/FIQ stuff */
-
-#define CONFIG_MISC_INIT_R
-
 #define CONFIG_CMDLINE_TAG     1       /* enable passing of ATAGs  */
 #define CONFIG_SETUP_MEMORY_TAGS       1
 #define CONFIG_INITRD_TAG      1       /* Required for ramdisk support */
@@ -54,14 +50,12 @@
  * 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_NET_MULTI
 #define CONFIG_LAN91C96
 #define CONFIG_LAN91C96_BASE 0x04800300
 #define CONFIG_LAN91C96_EXT_PHY
@@ -85,8 +79,6 @@
 #define CONFIG_ENV_OVERWRITE
 #define CONFIG_CONS_INDEX      1
 #define CONFIG_BAUDRATE        115200
-#define CONFIG_SYS_BAUDRATE_TABLE      { 9600, 19200, 38400, 57600, 115200 }
-
 
 /*
  * Command line configuration.
@@ -144,17 +136,6 @@
 #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
- *
- * The stack sizes are set up in start.S using the settings below
- */
-#define CONFIG_STACKSIZE       (128*1024)      /* regular stack */
-#ifdef CONFIG_USE_IRQ
-#define CONFIG_STACKSIZE_IRQ   (4*1024)        /* IRQ stack */
-#define CONFIG_STACKSIZE_FIQ   (4*1024)        /* FIQ stack */
-#endif
-
 /*-----------------------------------------------------------------------
  * Physical Memory Map
  */
@@ -169,6 +150,8 @@
 
 #define CONFIG_SYS_MONITOR_BASE       CONFIG_SYS_FLASH_BASE  /* Monitor at beginning of flash */
 
+#define PHYS_SRAM              0x20000000
+
 /*-----------------------------------------------------------------------
  * FLASH driver setup
  */
@@ -200,4 +183,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 */