diff options
| author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2009-03-27 23:26:43 +0100 |
|---|---|---|
| committer | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2009-04-04 20:42:20 +0200 |
| commit | beebd851cdbc9dd070bcdfec1fd8f17e3cc91bc0 (patch) | |
| tree | 85b763ee8f6a35b8b963185443810bf98c1a21cd | |
| parent | cb82a532669f6b02225ec3429ea4d49ff2b97d0a (diff) | |
at91rm9200: move serial driver to drivers/serial
add CONFIG_AT91RM9200_USART to activate the driver
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| -rw-r--r-- | cpu/arm920t/at91rm9200/Makefile | 2 | ||||
| -rw-r--r-- | drivers/serial/Makefile | 1 | ||||
| -rw-r--r-- | drivers/serial/at91rm9200_usart.c (renamed from cpu/arm920t/at91rm9200/serial.c) | 0 | ||||
| -rw-r--r-- | include/configs/at91rm9200dk.h | 1 | ||||
| -rw-r--r-- | include/configs/at91rm9200ek.h | 1 | ||||
| -rw-r--r-- | include/configs/cmc_pu2.h | 1 | ||||
| -rw-r--r-- | include/configs/csb637.h | 1 | ||||
| -rw-r--r-- | include/configs/kb9202.h | 1 | ||||
| -rw-r--r-- | include/configs/m501sk.h | 1 | ||||
| -rw-r--r-- | include/configs/mp2usb.h | 1 |
10 files changed, 9 insertions, 1 deletions
diff --git a/cpu/arm920t/at91rm9200/Makefile b/cpu/arm920t/at91rm9200/Makefile index ab4c52c8fb..67f17fadfe 100644 --- a/cpu/arm920t/at91rm9200/Makefile +++ b/cpu/arm920t/at91rm9200/Makefile @@ -26,7 +26,7 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(SOC).a COBJS = bcm5221.o dm9161.o ether.o i2c.o interrupts.o \ - lxt972.o serial.o usb.o spi.o + lxt972.o usb.o spi.o SOBJS = lowlevel_init.o SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile index 696d5fbbba..bb99a349ac 100644 --- a/drivers/serial/Makefile +++ b/drivers/serial/Makefile @@ -26,6 +26,7 @@ include $(TOPDIR)/config.mk LIB := $(obj)libserial.a COBJS-$(CONFIG_ARM_DCC) += arm_dcc.o +COBJS-$(CONFIG_AT91RM9200_USART) += at91rm9200_usart.o COBJS-$(CONFIG_ATMEL_USART) += atmel_usart.o COBJS-$(CONFIG_MCFUART) += mcfuart.o COBJS-$(CONFIG_NS9750_UART) += ns9750_serial.o diff --git a/cpu/arm920t/at91rm9200/serial.c b/drivers/serial/at91rm9200_usart.c index d563445492..d563445492 100644 --- a/cpu/arm920t/at91rm9200/serial.c +++ b/drivers/serial/at91rm9200_usart.c diff --git a/include/configs/at91rm9200dk.h b/include/configs/at91rm9200dk.h index 5a980d353e..56128c153e 100644 --- a/include/configs/at91rm9200dk.h +++ b/include/configs/at91rm9200dk.h @@ -88,6 +88,7 @@ */ /* define one of these to choose the DBGU, USART0 or USART1 as console */ +#define CONFIG_AT91RM9200_USART #define CONFIG_DBGU #undef CONFIG_USART0 #undef CONFIG_USART1 diff --git a/include/configs/at91rm9200ek.h b/include/configs/at91rm9200ek.h index 692ccdb71b..a018873fd6 100644 --- a/include/configs/at91rm9200ek.h +++ b/include/configs/at91rm9200ek.h @@ -112,6 +112,7 @@ * define one of these to choose the DBGU, * USART0 or USART1 as console */ +#define CONFIG_AT91RM9200_USART #define CONFIG_DBGU #undef CONFIG_USART0 #undef CONFIG_USART1 diff --git a/include/configs/cmc_pu2.h b/include/configs/cmc_pu2.h index e5c74e136f..80559bf191 100644 --- a/include/configs/cmc_pu2.h +++ b/include/configs/cmc_pu2.h @@ -88,6 +88,7 @@ */ /* define one of these to choose the DBGU, USART0 or USART1 as console */ +#define CONFIG_AT91RM9200_USART #undef CONFIG_DBGU #define CONFIG_USART0 #undef CONFIG_USART1 diff --git a/include/configs/csb637.h b/include/configs/csb637.h index 761c0dca39..e1cdc7f66e 100644 --- a/include/configs/csb637.h +++ b/include/configs/csb637.h @@ -90,6 +90,7 @@ */ /* define one of these to choose the DBGU, USART0 or USART1 as console */ +#define CONFIG_AT91RM9200_USART #define CONFIG_DBGU #undef CONFIG_USART0 #undef CONFIG_USART1 diff --git a/include/configs/kb9202.h b/include/configs/kb9202.h index 1ce8c6974a..7dd81e69cb 100644 --- a/include/configs/kb9202.h +++ b/include/configs/kb9202.h @@ -72,6 +72,7 @@ */ /* define one of these to choose the DBGU, USART0 or USART1 as console */ +#define CONFIG_AT91RM9200_USART #define CONFIG_DBGU #undef CONFIG_USART0 #undef CONFIG_USART1 diff --git a/include/configs/m501sk.h b/include/configs/m501sk.h index a432850519..1e7d90ed98 100644 --- a/include/configs/m501sk.h +++ b/include/configs/m501sk.h @@ -110,6 +110,7 @@ #define CONFIG_CMC_PU2 /* define one of these to choose the DBGU, USART0 or USART1 as console */ +#define CONFIG_AT91RM9200_USART #define CONFIG_DBGU #undef CONFIG_USART0 #undef CONFIG_USART1 diff --git a/include/configs/mp2usb.h b/include/configs/mp2usb.h index edaa17403f..3225ce714c 100644 --- a/include/configs/mp2usb.h +++ b/include/configs/mp2usb.h @@ -95,6 +95,7 @@ */ /* define one of these to choose the DBGU, USART0 or USART1 as console */ +#define CONFIG_AT91RM9200_USART #define CONFIG_DBGU #undef CONFIG_USART0 #undef CONFIG_USART1 |