Merge branch 'next' of ../custodians into next

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

diff --git a/include/configs/mimc200.h b/include/configs/mimc200.h
index 8f71664f32553939a43787f8b8238998adc2462a..6ed9e75bb467f4d5d981ca963f5836713225622b 100644 (file)
--- a/include/configs/mimc200.h
+++ b/include/configs/mimc200.h
@@ -51,6 +51,9 @@
 #define CONFIG_SYS_CLKDIV_PBA                  2
 #define CONFIG_SYS_CLKDIV_PBB                  1
 
+/* Reserve VM regions for SDRAM, NOR flash and FRAM */
+#define CONFIG_SYS_NR_VM_REGIONS               3
+
 /*
  * The PLLOPT register controls the PLL like this:
  *   icp = PLLOPT<2>
@@ -74,7 +77,7 @@
 
 #define CONFIG_BAUDRATE                        115200
 #define CONFIG_BOOTARGS                                                        \
-       "root=/dev/mtdblock1 rootfstype=jffs2 console=ttyS1"
+       "root=/dev/mtdblock1 rootfstype=jffs2 fbmem=512k console=ttyS1"
 #define CONFIG_BOOTCOMMAND                                             \
        "fsload boot/uImage; bootm"