avr32: fixup definitions to ATMEL_BASE_xxx

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

diff --git a/include/configs/mimc200.h b/include/configs/mimc200.h
index 312fdc9..f004ec8 100644 (file)
--- a/include/configs/mimc200.h
+++ b/include/configs/mimc200.h
@@ -24,7 +24,7 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#include <asm/arch/memory-map.h>
+#include <asm/arch/hardware.h>
 
 #define CONFIG_AVR32                   1
 #define CONFIG_AT32AP                  1
@@ -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>
@@ -60,7 +63,9 @@
  */
 #define CONFIG_SYS_PLL0_OPT                    0x04
 
-#define CONFIG_USART1                  1
+#define CONFIG_USART_BASE                      ATMEL_BASE_USART1
+#define CONFIG_USART_ID                                1
+
 #define CONFIG_MIMC200_DBGLINK         1
 
 /* User serviceable stuff */
@@ -74,14 +79,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.
@@ -104,8 +111,6 @@
 #define CONFIG_BOOTP_SUBNETMASK
 #define CONFIG_BOOTP_GATEWAY
 
-#define CONFIG_DOS_PARTITION           1
-
 /*
  * Command line configuration.
  */
@@ -121,12 +126,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