Menu
▾
▴
[Gc-linux-cvs] linux/drivers/serial Kconfig, 1.8, 1.9 Makefile, 1.7, 1.8
|
From: Albert H. <he...@us...> - 2009-10-25 18:45:44
|
Update of /cvsroot/gc-linux/linux/drivers/serial In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv29988/drivers/serial Modified Files: Kconfig Makefile Log Message: Forward to v.2.6.30. Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/serial/Makefile,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Makefile 25 Oct 2009 18:33:47 -0000 1.7 --- Makefile 25 Oct 2009 18:45:36 -0000 1.8 *************** *** 44,47 **** --- 44,48 ---- obj-$(CONFIG_SERIAL_S3C24A0) += s3c24a0.o obj-$(CONFIG_SERIAL_S3C6400) += s3c6400.o + obj-$(CONFIG_SERIAL_MAX3100) += max3100.o obj-$(CONFIG_SERIAL_IP22_ZILOG) += ip22zilog.o obj-$(CONFIG_SERIAL_MUX) += mux.o Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/serial/Kconfig,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Kconfig 25 Oct 2009 18:33:47 -0000 1.8 --- Kconfig 25 Oct 2009 18:45:36 -0000 1.9 *************** *** 534,537 **** --- 534,544 ---- SoCs + config SERIAL_MAX3100 + tristate "MAX3100 support" + depends on SPI + select SERIAL_CORE + help + MAX3100 chip support + config SERIAL_DZ bool "DECstation DZ serial driver" *************** *** 629,633 **** config SERIAL_PXA bool "PXA serial port support" ! depends on ARM && ARCH_PXA select SERIAL_CORE help --- 636,640 ---- config SERIAL_PXA bool "PXA serial port support" ! depends on ARCH_PXA || ARCH_MMP select SERIAL_CORE help *************** *** 701,705 **** config SERIAL_BFIN_DMA bool "DMA mode" ! depends on !DMA_UNCACHED_NONE && !KGDB_UART help This driver works under DMA mode. If this option is selected, the --- 708,712 ---- config SERIAL_BFIN_DMA bool "DMA mode" ! depends on !DMA_UNCACHED_NONE && KGDB_SERIAL_CONSOLE=n help This driver works under DMA mode. If this option is selected, the *************** *** 728,744 **** config UART0_CTS_PIN int "UART0 CTS pin" ! depends on BFIN_UART0_CTSRTS default 23 help The default pin is GPIO_GP7. ! Refer to ./include/asm-blackfin/gpio.h to see the GPIO map. config UART0_RTS_PIN int "UART0 RTS pin" ! depends on BFIN_UART0_CTSRTS default 22 help The default pin is GPIO_GP6. ! Refer to ./include/asm-blackfin/gpio.h to see the GPIO map. config SERIAL_BFIN_UART1 --- 735,751 ---- config UART0_CTS_PIN int "UART0 CTS pin" ! depends on BFIN_UART0_CTSRTS && !BF548 default 23 help The default pin is GPIO_GP7. ! Refer to arch/blackfin/mach-*/include/mach/gpio.h to see the GPIO map. config UART0_RTS_PIN int "UART0 RTS pin" ! depends on BFIN_UART0_CTSRTS && !BF548 default 22 help The default pin is GPIO_GP6. ! Refer to arch/blackfin/mach-*/include/mach/gpio.h to see the GPIO map. config SERIAL_BFIN_UART1 *************** *** 757,775 **** config UART1_CTS_PIN int "UART1 CTS pin" ! depends on BFIN_UART1_CTSRTS && !BF54x default -1 help ! Refer to ./include/asm-blackfin/gpio.h to see the GPIO map. config UART1_RTS_PIN int "UART1 RTS pin" ! depends on BFIN_UART1_CTSRTS && !BF54x default -1 help ! Refer to ./include/asm-blackfin/gpio.h to see the GPIO map. config SERIAL_BFIN_UART2 bool "Enable UART2" ! depends on SERIAL_BFIN && (BF54x) help Enable UART2 --- 764,782 ---- config UART1_CTS_PIN int "UART1 CTS pin" ! depends on BFIN_UART1_CTSRTS && !BF548 default -1 help ! Refer to arch/blackfin/mach-*/include/mach/gpio.h to see the GPIO map. config UART1_RTS_PIN int "UART1 RTS pin" ! depends on BFIN_UART1_CTSRTS && !BF548 default -1 help ! Refer to arch/blackfin/mach-*/include/mach/gpio.h to see the GPIO map. config SERIAL_BFIN_UART2 bool "Enable UART2" ! depends on SERIAL_BFIN && (BF54x || BF538 || BF539) help Enable UART2 *************** *** 784,798 **** config UART2_CTS_PIN int "UART2 CTS pin" ! depends on BFIN_UART2_CTSRTS default -1 help ! Refer to ./include/asm-blackfin/gpio.h to see the GPIO map. config UART2_RTS_PIN int "UART2 RTS pin" ! depends on BFIN_UART2_CTSRTS default -1 help ! Refer to ./include/asm-blackfin/gpio.h to see the GPIO map. config SERIAL_BFIN_UART3 --- 791,805 ---- config UART2_CTS_PIN int "UART2 CTS pin" ! depends on BFIN_UART2_CTSRTS && !BF548 default -1 help ! Refer to arch/blackfin/mach-*/include/mach/gpio.h to see the GPIO map. config UART2_RTS_PIN int "UART2 RTS pin" ! depends on BFIN_UART2_CTSRTS && !BF548 default -1 help ! Refer to arch/blackfin/mach-*/include/mach/gpio.h to see the GPIO map. config SERIAL_BFIN_UART3 *************** *** 809,812 **** --- 816,833 ---- signal. + config UART3_CTS_PIN + int "UART3 CTS pin" + depends on BFIN_UART3_CTSRTS && !BF548 + default -1 + help + Refer to arch/blackfin/mach-*/include/mach/gpio.h to see the GPIO map. + + config UART3_RTS_PIN + int "UART3 RTS pin" + depends on BFIN_UART3_CTSRTS && !BF548 + default -1 + help + Refer to arch/blackfin/mach-*/include/mach/gpio.h to see the GPIO map. + config SERIAL_IMX bool "IMX serial port support" *************** *** 834,838 **** config SERIAL_UARTLITE tristate "Xilinx uartlite serial port support" ! depends on PPC32 select SERIAL_CORE help --- 855,859 ---- config SERIAL_UARTLITE tristate "Xilinx uartlite serial port support" ! depends on PPC32 || MICROBLAZE select SERIAL_CORE help *************** *** 1320,1324 **** config SERIAL_OF_PLATFORM tristate "Serial port on Open Firmware platform bus" ! depends on PPC_OF depends on SERIAL_8250 || SERIAL_OF_PLATFORM_NWPSERIAL help --- 1341,1345 ---- config SERIAL_OF_PLATFORM tristate "Serial port on Open Firmware platform bus" ! depends on PPC_OF || MICROBLAZE depends on SERIAL_8250 || SERIAL_OF_PLATFORM_NWPSERIAL help *************** *** 1375,1379 **** select SERIAL_CORE help ! Enble support SPORT emulate UART on Blackfin series. To compile this driver as a module, choose M here: the --- 1396,1400 ---- select SERIAL_CORE help ! Enable SPORT emulate UART on Blackfin series. To compile this driver as a module, choose M here: the |
