From: Pete P. <pp...@us...> - 2002-09-26 05:39:43
|
Update of /cvsroot/linux-mips/linux/drivers/char In directory usw-pr-cvs1:/tmp/cvs-serv1799/drivers/char Modified Files: Config.in Makefile Added Files: tty_io.c Log Message: Split up the Pb board and Au CPU dependencies properly. Index: Config.in =================================================================== RCS file: /cvsroot/linux-mips/linux/drivers/char/Config.in,v retrieving revision 1.37 retrieving revision 1.38 diff -u -d -r1.37 -r1.38 --- Config.in 31 May 2002 20:12:20 -0000 1.37 +++ Config.in 26 Sep 2002 05:39:39 -0000 1.38 @@ -62,17 +62,19 @@ tristate ' Stallion EasyIO or EC8/32 support' CONFIG_STALLION tristate ' Stallion EC8/64, ONboard, Brumby support' CONFIG_ISTALLION fi + if [ "$CONFIG_CPU_AU1X00" = "y" ]; then + bool ' Enable Au1x00 UART Support' CONFIG_AU1X00_UART + if [ "$CONFIG_AU1X00_UART" = "y" ]; then + bool ' Enable Au1x00 serial console' CONFIG_AU1X00_SERIAL_CONSOLE + fi + dep_tristate ' Au1x00 USB TTY Device support' CONFIG_AU1X00_USB_TTY $CONFIG_AU1X00_USB_DEVICE + if [ "$CONFIG_AU1X00_USB_TTY" != "y" ]; then + dep_tristate ' Au1x00 USB Raw Device support' CONFIG_AU1X00_USB_RAW $CONFIG_AU1X00_USB_DEVICE + fi + fi if [ "$CONFIG_MIPS" = "y" ]; then bool ' TX3912/PR31700 serial port support' CONFIG_SERIAL_TX3912 dep_bool ' Console on TX3912/PR31700 serial port' CONFIG_SERIAL_TX3912_CONSOLE $CONFIG_SERIAL_TX3912 - bool ' Enable Au1000 UART Support' CONFIG_AU1000_UART - if [ "$CONFIG_AU1000_UART" = "y" ]; then - bool ' Enable Au1000 serial console' CONFIG_AU1000_SERIAL_CONSOLE - fi - dep_tristate ' Au1000 USB TTY Device support' CONFIG_AU1000_USB_TTY $CONFIG_AU1000_USB_DEVICE - if [ "$CONFIG_AU1000_USB_TTY" != "y" ]; then - dep_tristate ' Au1000 USB Raw Device support' CONFIG_AU1000_USB_RAW $CONFIG_AU1000_USB_DEVICE - fi bool 'TXx927 SIO support' CONFIG_TXX927_SERIAL if [ "$CONFIG_TXX927_SERIAL" = "y" ]; then bool 'TXx927 SIO Console support' CONFIG_TXX927_SERIAL_CONSOLE @@ -121,10 +123,6 @@ if [ "$CONFIG_MIPS" = "y" ]; then bool ' TMPTX3912/PR31700 serial port support' CONFIG_SERIAL_TX3912 dep_bool ' Console on TMPTX3912/PR31700 serial port' CONFIG_SERIAL_TX3912_CONSOLE $CONFIG_SERIAL_TX3912 - bool ' Enable Au1000 UART Support' CONFIG_AU1000_UART - if [ "$CONFIG_AU1000_UART" = "y" ]; then - bool ' Enable Au1000 serial console' CONFIG_AU1000_SERIAL_CONSOLE - fi fi fi if [ "$CONFIG_MIPS_ITE8172" = "y" ]; then @@ -299,8 +297,8 @@ if [ "$CONFIG_HOTPLUG" = "y" -a "$CONFIG_PCMCIA" != "n" ]; then source drivers/char/pcmcia/Config.in fi -if [ "$CONFIG_MIPS_AU1000" = "y" ]; then - tristate ' Alchemy Au1000 GPIO device support' CONFIG_AU1000_GPIO +if [ "$CONFIG_CPU_AU1X00" = "y" ]; then + tristate ' Alchemy Au1000 GPIO device support' CONFIG_AU1X00_GPIO tristate ' Au1000/ADS7846 touchscreen support' CONFIG_TS_AU1000_ADS7846 fi if [ "$CONFIG_MIPS_ITE8172" = "y" ]; then Index: Makefile =================================================================== RCS file: /cvsroot/linux-mips/linux/drivers/char/Makefile,v retrieving revision 1.32 retrieving revision 1.33 diff -u -d -r1.32 -r1.33 --- Makefile 13 Jun 2002 12:57:33 -0000 1.32 +++ Makefile 26 Sep 2002 05:39:39 -0000 1.33 @@ -220,9 +220,9 @@ obj-$(CONFIG_DS1620) += ds1620.o obj-$(CONFIG_INTEL_RNG) += i810_rng.o obj-$(CONFIG_ITE_GPIO) += ite_gpio.o -obj-$(CONFIG_AU1000_GPIO) += au1000_gpio.o -obj-$(CONFIG_AU1000_USB_TTY) += au1000_usbtty.o -obj-$(CONFIG_AU1000_USB_RAW) += au1000_usbraw.o +obj-$(CONFIG_AU1X00_GPIO) += au1000_gpio.o +obj-$(CONFIG_AU1X00_USB_TTY) += au1000_usbtty.o +obj-$(CONFIG_AU1X00_USB_RAW) += au1000_usbraw.o obj-$(CONFIG_COBALT_LCD) += lcd.o obj-$(CONFIG_QIC02_TAPE) += tpqic02.o |