Rename getenv_r() into getenv_f()

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

diff --git a/include/configs/mimc200.h b/include/configs/mimc200.h
index 312fdc9e4d1b1ac92f6672620dd4f85bfdd2324d..36488b32cd2c5addf5176c4db793922155fa9e94 100644 (file)
--- a/include/configs/mimc200.h
+++ b/include/configs/mimc200.h
@@ -74,14 +74,16 @@
 
 #define CONFIG_BAUDRATE                        115200
 #define CONFIG_BOOTARGS                                                        \
-       "console=ttyS0 root=/dev/mtdblock1 fbmem=600k rootfstype=jffs2"
+       "root=/dev/mtdblock1 rootfstype=jffs2 fbmem=512k console=ttyS1"
 #define CONFIG_BOOTCOMMAND                                             \
-       "fsload; bootm"
+       "fsload boot/uImage; bootm"
 
 #define CONFIG_SILENT_CONSOLE          1       /* enable silent startup */
-#define CONFIG_SILENT_CONSOLE_INPUT    1       /* disable console inputs */
+#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.
@@ -121,12 +123,26 @@
 
 #define CONFIG_ATMEL_USART             1
 #define CONFIG_MACB                    1
-#define CONFIG_PIO2                    1
+#define CONFIG_PORTMUX_PIO             1
 #define CONFIG_SYS_NR_PIOS                     5
 #define CONFIG_SYS_HSDRAMC                     1
 #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