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

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

diff --git a/include/configs/mimc200.h b/include/configs/mimc200.h
index 8ff2f8a21e1d92387c385abbbb9c3a5fbdc66216..36488b32cd2c5addf5176c4db793922155fa9e94 100644 (file)
--- a/include/configs/mimc200.h
+++ b/include/configs/mimc200.h
@@ -74,7 +74,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"
 
@@ -82,6 +82,8 @@
 #define CONFIG_DISABLE_CONSOLE         1       /* disable console */
 #define CONFIG_SYS_DEVICE_NULLDEV              1       /* include nulldev device */
 
+#define CONFIG_LCD                     1
+
 /*
  * Only interrupt autoboot if <space> is pressed. Otherwise, garbage
  * data on the serial line may interrupt the boot sequence.
@@ -127,6 +129,20 @@
 #define CONFIG_MMC                     1
 #define CONFIG_ATMEL_MCI               1
 
+#if defined(CONFIG_LCD)
+#define CONFIG_CMD_BMP
+#define CONFIG_ATMEL_LCD               1
+#define LCD_BPP                                LCD_COLOR16
+#define CONFIG_BMP_16BPP               1
+#define CONFIG_FB_ADDR                 0x10600000
+#define CONFIG_WHITE_ON_BLACK          1
+#define CONFIG_VIDEO_BMP_GZIP          1
+#define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE         262144
+#define CONFIG_ATMEL_LCD_BGR555                1
+#define CONFIG_SYS_CONSOLE_IS_IN_ENV   1
+#define CONFIG_SPLASH_SCREEN           1
+#endif
+
 #define CONFIG_SYS_DCACHE_LINESZ               32
 #define CONFIG_SYS_ICACHE_LINESZ               32