diff options
| author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2009-01-31 09:10:48 +0100 |
|---|---|---|
| committer | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2009-01-31 10:16:02 +0100 |
| commit | 930590f3e49c8f32256edf2e5861e1535a329c6c (patch) | |
| tree | 6f25c8035a932a0b079ee71ce6550b60a2a6fba7 | |
| parent | f90c8022f448bc5e93090e4b714368e52e912f0f (diff) | |
| download | u-boot-imx-930590f3e49c8f32256edf2e5861e1535a329c6c.zip u-boot-imx-930590f3e49c8f32256edf2e5861e1535a329c6c.tar.gz u-boot-imx-930590f3e49c8f32256edf2e5861e1535a329c6c.tar.bz2 | |
ixp: move serial to drivers/serial
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| -rw-r--r-- | cpu/ixp/Makefile | 1 | ||||
| -rw-r--r-- | drivers/serial/Makefile | 1 | ||||
| -rw-r--r-- | drivers/serial/serial_ixp.c (renamed from cpu/ixp/serial.c) | 0 | ||||
| -rw-r--r-- | include/configs/actux1.h | 1 | ||||
| -rw-r--r-- | include/configs/actux2.h | 1 | ||||
| -rw-r--r-- | include/configs/actux3.h | 1 | ||||
| -rw-r--r-- | include/configs/actux4.h | 1 | ||||
| -rw-r--r-- | include/configs/ixdp425.h | 1 | ||||
| -rw-r--r-- | include/configs/ixdpg425.h | 1 | ||||
| -rw-r--r-- | include/configs/pdnb3.h | 1 |
10 files changed, 8 insertions, 1 deletions
diff --git a/cpu/ixp/Makefile b/cpu/ixp/Makefile index 6deecd4..7e98d87 100644 --- a/cpu/ixp/Makefile +++ b/cpu/ixp/Makefile @@ -28,7 +28,6 @@ LIB = $(obj)lib$(CPU).a START = start.o COBJS-y += cpu.o COBJS-y += interrupts.o -COBJS-y += serial.o ifndef CONFIG_USE_IRQ COBJS-y += timer.o endif diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile index c7a1882..b6fd0d7 100644 --- a/drivers/serial/Makefile +++ b/drivers/serial/Makefile @@ -32,6 +32,7 @@ COBJS-y += ns16550.o COBJS-$(CONFIG_DRIVER_S3C4510_UART) += s3c4510b_uart.o COBJS-$(CONFIG_S3C64XX) += s3c64xx.o COBJS-y += serial.o +COBJS-$(CONFIG_IXP_SERIAL) += serial_ixp.o COBJS-$(CONFIG_MAX3100_SERIAL) += serial_max3100.o COBJS-$(CONFIG_PL010_SERIAL) += serial_pl01x.o COBJS-$(CONFIG_PL011_SERIAL) += serial_pl01x.o diff --git a/cpu/ixp/serial.c b/drivers/serial/serial_ixp.c index dd26af4..dd26af4 100644 --- a/cpu/ixp/serial.c +++ b/drivers/serial/serial_ixp.c diff --git a/include/configs/actux1.h b/include/configs/actux1.h index 58d56ee..adbc399 100644 --- a/include/configs/actux1.h +++ b/include/configs/actux1.h @@ -39,6 +39,7 @@ #define CONFIG_DISPLAY_CPUINFO 1 #define CONFIG_DISPLAY_BOARDINFO 1 +#define CONFIG_IXP_SERIAL #define CONFIG_SYS_IXP425_CONSOLE IXP425_UART2 #define CONFIG_BAUDRATE 115200 #define CONFIG_BOOTDELAY 3 diff --git a/include/configs/actux2.h b/include/configs/actux2.h index 6f59a51..4c579eb 100644 --- a/include/configs/actux2.h +++ b/include/configs/actux2.h @@ -32,6 +32,7 @@ #define CONFIG_DISPLAY_CPUINFO 1 #define CONFIG_DISPLAY_BOARDINFO 1 +#define CONFIG_IXP_SERIAL #define CONFIG_SYS_IXP425_CONSOLE IXP425_UART2 #define CONFIG_BAUDRATE 115200 #define CONFIG_BOOTDELAY 5 diff --git a/include/configs/actux3.h b/include/configs/actux3.h index a7bb38c..694f522 100644 --- a/include/configs/actux3.h +++ b/include/configs/actux3.h @@ -32,6 +32,7 @@ #define CONFIG_DISPLAY_CPUINFO 1 #define CONFIG_DISPLAY_BOARDINFO 1 +#define CONFIG_IXP_SERIAL #define CONFIG_SYS_IXP425_CONSOLE IXP425_UART2 #define CONFIG_BAUDRATE 115200 #define CONFIG_BOOTDELAY 3 diff --git a/include/configs/actux4.h b/include/configs/actux4.h index f2b701f..cdc9956 100644 --- a/include/configs/actux4.h +++ b/include/configs/actux4.h @@ -32,6 +32,7 @@ #define CONFIG_DISPLAY_CPUINFO 1 #define CONFIG_DISPLAY_BOARDINFO 1 +#define CONFIG_IXP_SERIAL #define CONFIG_SYS_IXP425_CONSOLE IXP425_UART1 #define CONFIG_BAUDRATE 115200 #define CONFIG_BOOTDELAY 3 diff --git a/include/configs/ixdp425.h b/include/configs/ixdp425.h index edebb40..70f3987 100644 --- a/include/configs/ixdp425.h +++ b/include/configs/ixdp425.h @@ -135,6 +135,7 @@ /* * select serial console configuration */ +#define CONFIG_IXP_SERIAL #define CONFIG_SYS_IXP425_CONSOLE IXP425_UART1 /* we use UART1 for console */ /* diff --git a/include/configs/ixdpg425.h b/include/configs/ixdpg425.h index 528bccd..193008e 100644 --- a/include/configs/ixdpg425.h +++ b/include/configs/ixdpg425.h @@ -72,6 +72,7 @@ /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE +#define CONFIG_IXP_SERIAL #define CONFIG_BAUDRATE 115200 #define CONFIG_SYS_IXP425_CONSOLE IXP425_UART1 /* we use UART1 for console */ diff --git a/include/configs/pdnb3.h b/include/configs/pdnb3.h index f8aac1a..4da401f 100644 --- a/include/configs/pdnb3.h +++ b/include/configs/pdnb3.h @@ -68,6 +68,7 @@ /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE +#define CONFIG_IXP_SERIAL #define CONFIG_BAUDRATE 115200 #define CONFIG_SYS_IXP425_CONSOLE IXP425_UART1 /* we use UART1 for console */ |