diff options
| author | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2009-03-23 10:22:41 +0100 |
|---|---|---|
| committer | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2009-03-23 10:22:41 +0100 |
| commit | 8206bfae3ab7f99965136384360ba2de0c6f4c3b (patch) | |
| tree | e11bf0fad2e418e6771e8db7dbcb6630a6053f0c /include/configs | |
| parent | ee1702d75a30d076139d1841383a1fa7220a0e11 (diff) | |
| parent | 58a518c3d8a2c7de11d414e8b903495daee7dc7e (diff) | |
Merge branch 'mimc200'
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/atngw100.h | 2 | ||||
| -rw-r--r-- | include/configs/atstk1002.h | 2 | ||||
| -rw-r--r-- | include/configs/atstk1003.h | 2 | ||||
| -rw-r--r-- | include/configs/atstk1004.h | 2 | ||||
| -rw-r--r-- | include/configs/atstk1006.h | 2 | ||||
| -rw-r--r-- | include/configs/favr-32-ezkit.h | 2 | ||||
| -rw-r--r-- | include/configs/hammerhead.h | 2 | ||||
| -rw-r--r-- | include/configs/mimc200.h | 8 |
8 files changed, 11 insertions, 11 deletions
diff --git a/include/configs/atngw100.h b/include/configs/atngw100.h index 9e97624765..c998952fbf 100644 --- a/include/configs/atngw100.h +++ b/include/configs/atngw100.h @@ -124,7 +124,7 @@ #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 diff --git a/include/configs/atstk1002.h b/include/configs/atstk1002.h index 2870adef0f..2284277da2 100644 --- a/include/configs/atstk1002.h +++ b/include/configs/atstk1002.h @@ -149,7 +149,7 @@ #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 diff --git a/include/configs/atstk1003.h b/include/configs/atstk1003.h index 1e80dc856e..2ef255274f 100644 --- a/include/configs/atstk1003.h +++ b/include/configs/atstk1003.h @@ -133,7 +133,7 @@ #undef CONFIG_CMD_XIMG #define CONFIG_ATMEL_USART 1 -#define CONFIG_PIO2 1 +#define CONFIG_PORTMUX_PIO 1 #define CONFIG_SYS_HSDRAMC 1 #define CONFIG_MMC 1 #define CONFIG_ATMEL_MCI 1 diff --git a/include/configs/atstk1004.h b/include/configs/atstk1004.h index 0e4f4103b2..195be82095 100644 --- a/include/configs/atstk1004.h +++ b/include/configs/atstk1004.h @@ -133,7 +133,7 @@ #undef CONFIG_CMD_XIMG #define CONFIG_ATMEL_USART 1 -#define CONFIG_PIO2 1 +#define CONFIG_PORTMUX_PIO 1 #define CONFIG_SYS_HSDRAMC 1 #define CONFIG_MMC 1 #define CONFIG_ATMEL_MCI 1 diff --git a/include/configs/atstk1006.h b/include/configs/atstk1006.h index c53459664b..8cfa31269b 100644 --- a/include/configs/atstk1006.h +++ b/include/configs/atstk1006.h @@ -149,7 +149,7 @@ #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 diff --git a/include/configs/favr-32-ezkit.h b/include/configs/favr-32-ezkit.h index 3cef4196df..21802df1d2 100644 --- a/include/configs/favr-32-ezkit.h +++ b/include/configs/favr-32-ezkit.h @@ -146,7 +146,7 @@ #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 diff --git a/include/configs/hammerhead.h b/include/configs/hammerhead.h index 317a3d7dd7..0c70af5742 100644 --- a/include/configs/hammerhead.h +++ b/include/configs/hammerhead.h @@ -117,7 +117,7 @@ #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 diff --git a/include/configs/mimc200.h b/include/configs/mimc200.h index 312fdc9e4d..8ff2f8a21e 100644 --- a/include/configs/mimc200.h +++ b/include/configs/mimc200.h @@ -74,12 +74,12 @@ #define CONFIG_BAUDRATE 115200 #define CONFIG_BOOTARGS \ - "console=ttyS0 root=/dev/mtdblock1 fbmem=600k rootfstype=jffs2" + "root=/dev/mtdblock1 rootfstype=jffs2 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 */ /* @@ -121,7 +121,7 @@ #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 |