From f4278b716c2925b4dcf18b94f0ff932d4736cd5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Bie=C3=9Fmann?= Date: Thu, 4 Nov 2010 23:15:31 +0000 Subject: avr32: fixup definitions to ATMEL_BASE_xxx MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Bießmann --- include/configs/atngw100.h | 4 ++-- include/configs/atstk1002.h | 6 ++---- include/configs/atstk1003.h | 6 ++---- include/configs/atstk1004.h | 6 ++---- include/configs/atstk1006.h | 6 ++---- include/configs/favr-32-ezkit.h | 6 ++---- include/configs/hammerhead.h | 3 ++- include/configs/mimc200.h | 4 +++- 8 files changed, 17 insertions(+), 24 deletions(-) (limited to 'include/configs') diff --git a/include/configs/atngw100.h b/include/configs/atngw100.h index a3e92e8..a93ba8b 100644 --- a/include/configs/atngw100.h +++ b/include/configs/atngw100.h @@ -61,8 +61,8 @@ */ #define CONFIG_SYS_PLL0_OPT 0x04 -#define CONFIG_USART1 1 - +#define CONFIG_USART_BASE ATMEL_BASE_USART1 +#define CONFIG_USART_ID 1 /* User serviceable stuff */ #define CONFIG_DOS_PARTITION 1 diff --git a/include/configs/atstk1002.h b/include/configs/atstk1002.h index 252c5ae..ba1b56c 100644 --- a/include/configs/atstk1002.h +++ b/include/configs/atstk1002.h @@ -85,10 +85,8 @@ */ #define CONFIG_SYS_PLL0_OPT 0x04 -#undef CONFIG_USART0 -#define CONFIG_USART1 1 -#undef CONFIG_USART2 -#undef CONFIG_USART3 +#define CONFIG_USART_BASE ATMEL_BASE_USART1 +#define CONFIG_USART_ID 1 /* User serviceable stuff */ #define CONFIG_DOS_PARTITION 1 diff --git a/include/configs/atstk1003.h b/include/configs/atstk1003.h index 8f06081..85337bf 100644 --- a/include/configs/atstk1003.h +++ b/include/configs/atstk1003.h @@ -85,10 +85,8 @@ */ #define CONFIG_SYS_PLL0_OPT 0x04 -#undef CONFIG_USART0 -#define CONFIG_USART1 1 -#undef CONFIG_USART2 -#undef CONFIG_USART3 +#define CONFIG_USART_BASE ATMEL_BASE_USART1 +#define CONFIG_USART_ID 1 /* User serviceable stuff */ #define CONFIG_DOS_PARTITION 1 diff --git a/include/configs/atstk1004.h b/include/configs/atstk1004.h index 12c9414..344ba8f 100644 --- a/include/configs/atstk1004.h +++ b/include/configs/atstk1004.h @@ -85,10 +85,8 @@ */ #define CONFIG_SYS_PLL0_OPT 0x04 -#undef CONFIG_USART0 -#define CONFIG_USART1 1 -#undef CONFIG_USART2 -#undef CONFIG_USART3 +#define CONFIG_USART_BASE ATMEL_BASE_USART1 +#define CONFIG_USART_ID 1 /* User serviceable stuff */ #define CONFIG_DOS_PARTITION 1 diff --git a/include/configs/atstk1006.h b/include/configs/atstk1006.h index 8cbaf75..e8553fc 100644 --- a/include/configs/atstk1006.h +++ b/include/configs/atstk1006.h @@ -85,10 +85,8 @@ */ #define CONFIG_SYS_PLL0_OPT 0x04 -#undef CONFIG_USART0 -#define CONFIG_USART1 1 -#undef CONFIG_USART2 -#undef CONFIG_USART3 +#define CONFIG_USART_BASE ATMEL_BASE_USART1 +#define CONFIG_USART_ID 1 /* User serviceable stuff */ #define CONFIG_DOS_PARTITION 1 diff --git a/include/configs/favr-32-ezkit.h b/include/configs/favr-32-ezkit.h index a65fbd4..e723ad1 100644 --- a/include/configs/favr-32-ezkit.h +++ b/include/configs/favr-32-ezkit.h @@ -82,10 +82,8 @@ */ #define CONFIG_SYS_PLL0_OPT 0x04 -#undef CONFIG_USART0 -#undef CONFIG_USART1 -#undef CONFIG_USART2 -#define CONFIG_USART3 1 +#define CONFIG_USART_BASE ATMEL_BASE_USART3 +#define CONFIG_USART_ID 3 /* User serviceable stuff */ #define CONFIG_DOS_PARTITION 1 diff --git a/include/configs/hammerhead.h b/include/configs/hammerhead.h index 8ca04ea..1f20fff 100644 --- a/include/configs/hammerhead.h +++ b/include/configs/hammerhead.h @@ -59,7 +59,8 @@ */ #define CONFIG_SYS_PLL0_OPT 0x04 -#define CONFIG_USART1 1 +#define CONFIG_USART_BASE ATMEL_BASE_USART1 +#define CONFIG_USART_ID 1 #define CONFIG_HOSTNAME hammerhead diff --git a/include/configs/mimc200.h b/include/configs/mimc200.h index a5c52e5..f004ec8 100644 --- a/include/configs/mimc200.h +++ b/include/configs/mimc200.h @@ -63,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 */ -- cgit v1.1