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

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

diff --git a/include/configs/stv0991.h b/include/configs/stv0991.h
index f95de06b59b32ff2f88cf3aa7f13dc5f6706436c..fd9bd638c65575f23913b040f60799377f4c365c 100644 (file)
--- a/include/configs/stv0991.h
+++ b/include/configs/stv0991.h
@@ -28,14 +28,21 @@
        (PHYS_SDRAM_1_SIZE - CONFIG_ENV_SIZE)
 #define CONFIG_SYS_MAXARGS                     16
 #define CONFIG_SYS_MALLOC_LEN                  (CONFIG_ENV_SIZE + 16 * 1024)
+#define CONFIG_SYS_MALLOC_F_LEN                        0x2000
 
+#define CONFIG_DM
 /* serial port (PL011) configuration */
-#define CONFIG_SYS_SERIAL0                     0x80406000
-#define CONFIG_PL011_SERIAL
-#define CONFIG_CONS_INDEX                      0
 #define CONFIG_BAUDRATE                                115200
-#define CONFIG_PL01x_PORTS                     {(void *)CONFIG_SYS_SERIAL0}
-#define CONFIG_PL011_CLOCK                     (2700 * 1000)
+#ifdef CONFIG_DM
+#define CONFIG_DM_SERIAL
+#define CONFIG_PL01X_SERIAL
+#else
+#define CONFIG_SYS_SERIAL0                     0x80406000
+#define CONFIG_CONS_INDEX                      0
+#define CONFIG_PL011_SERIAL
+#define CONFIG_PL01x_PORTS                     {(void *)CONFIG_SYS_SERIAL0}
+#define CONFIG_PL011_CLOCK                     (2700 * 1000)
+#endif
 
 /* user interface */
 #define CONFIG_SYS_PROMPT                      "STV0991> "
@@ -45,7 +52,7 @@
 
 /* MISC */
 #define CONFIG_SYS_LOAD_ADDR                   0x00000000
-#define CONFIG_SYS_INIT_RAM_SIZE               0x2000
+#define CONFIG_SYS_INIT_RAM_SIZE               0x8000
 #define CONFIG_SYS_INIT_RAM_ADDR               0x00190000
 #define CONFIG_SYS_INIT_SP_OFFSET              \
        (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)