Menu
▾
▴
[Linux-mips-commits]CVS: linux/arch/mips/configs defconfig-pb1000,1.25,1.26 defconfig-pb1100,1.9,1.10 defconfig-pb1500,1.8,1.9
|
From: Pete P. <pp...@us...> - 2002-09-26 05:39:43
|
Update of /cvsroot/linux-mips/linux/arch/mips/configs In directory usw-pr-cvs1:/tmp/cvs-serv1799/arch/mips/configs Modified Files: defconfig-pb1000 defconfig-pb1100 defconfig-pb1500 Log Message: Split up the Pb board and Au CPU dependencies properly. Index: defconfig-pb1000 =================================================================== RCS file: /cvsroot/linux-mips/linux/arch/mips/configs/defconfig-pb1000,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- defconfig-pb1000 25 Sep 2002 07:38:58 -0000 1.25 +++ defconfig-pb1000 26 Sep 2002 05:39:39 -0000 1.26 @@ -65,14 +65,13 @@ # CONFIG_HIGHMEM is not set CONFIG_RWSEM_GENERIC_SPINLOCK=y # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set -CONFIG_MIPS_AU1000=y +CONFIG_CPU_AU1000=y CONFIG_NEW_IRQ=y CONFIG_PCI=y CONFIG_NEW_PCI=y CONFIG_NONCOHERENT_IO=y CONFIG_PC_KEYB=y CONFIG_SWAP_IO_SPACE=y -# CONFIG_AU1000_USB_DEVICE is not set # # CPU selection @@ -96,6 +95,17 @@ CONFIG_CPU_MIPS32=y # CONFIG_CPU_MIPS64 is not set # CONFIG_CPU_RC32300 is not set +# CONFIG_CPU_GENERIC is not set +CONFIG_CPU_AU1000=y +# CONFIG_CPU_AU1500 is not set +# CONFIG_CPU_AU1100 is not set +CONFIG_CPU_AU1X00=y +CONFIG_64BIT_PHYS_ADDR=y +# CONFIG_VTAG_ICACHE is not set +CONFIG_CPU_HAS_LLSC=y +# CONFIG_CPU_HAS_LLDSCD is not set +CONFIG_CPU_HAS_WB=y +# CONFIG_CPU_HAS_PREFETCH is not set CONFIG_CPU_HAS_PREFETCH=y # CONFIG_VTAG_ICACHE is not set CONFIG_64BIT_PHYS_ADDR=y @@ -111,7 +121,7 @@ # CONFIG_CPU_R5900_CONTEXT is not set # CONFIG_VR4131_CACHE_FIX is not set CONFIG_NET=y -CONFIG_PCI_NAMES=y +# CONFIG_PCI_NAMES is not set # CONFIG_ISA is not set # CONFIG_EISA is not set # CONFIG_TC is not set @@ -122,13 +132,13 @@ # # PCMCIA/CardBus support # -CONFIG_PCMCIA=y +CONFIG_PCMCIA=m # CONFIG_CARDBUS is not set # CONFIG_I82092 is not set # CONFIG_I82365 is not set # CONFIG_PCMCIA_IRQ_REMAP is not set # CONFIG_TCIC is not set -CONFIG_PCMCIA_AU1000=m +CONFIG_PCMCIA_AU1X00=m CONFIG_PCMCIA_PB1X00=y # CONFIG_PCMCIA_HYD1100 is not set @@ -366,7 +376,7 @@ # Ethernet (10 or 100Mbit) # CONFIG_NET_ETHERNET=y -CONFIG_MIPS_AU1000_ENET=y +CONFIG_MIPS_AU1X00_ENET=y # CONFIG_SUNLANCE is not set # CONFIG_HAPPYMEAL is not set # CONFIG_SUNBMAC is not set @@ -492,12 +502,12 @@ # CONFIG_SX is not set # CONFIG_RIO is not set # CONFIG_STALDRV is not set +CONFIG_AU1X00_UART=y +CONFIG_AU1X00_SERIAL_CONSOLE=y +# CONFIG_AU1X00_USB_TTY is not set +# CONFIG_AU1X00_USB_RAW is not set # CONFIG_SERIAL_TX3912 is not set # CONFIG_SERIAL_TX3912_CONSOLE is not set -CONFIG_AU1000_UART=y -CONFIG_AU1000_SERIAL_CONSOLE=y -# CONFIG_AU1000_USB_TTY is not set -# CONFIG_AU1000_USB_RAW is not set # CONFIG_TXX927_SERIAL is not set CONFIG_UNIX98_PTYS=y CONFIG_UNIX98_PTY_COUNT=256 @@ -567,7 +577,7 @@ # PCMCIA character devices # # CONFIG_PCMCIA_SERIAL_CS is not set -CONFIG_AU1000_GPIO=y +CONFIG_AU1X00_GPIO=y # CONFIG_TS_AU1000_ADS7846 is not set # @@ -733,8 +743,7 @@ # CONFIG_SOUND_RME96XX is not set # CONFIG_SOUND_SONICVIBES is not set # CONFIG_SOUND_HAL2 is not set -CONFIG_SOUND_AU1000=y -# CONFIG_SOUND_AU1I2S is not set +CONFIG_SOUND_AU1X00=y # CONFIG_SOUND_TRIDENT is not set # CONFIG_SOUND_MSNDCLAS is not set # CONFIG_SOUND_MSNDPIN is not set Index: defconfig-pb1100 =================================================================== RCS file: /cvsroot/linux-mips/linux/arch/mips/configs/defconfig-pb1100,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- defconfig-pb1100 25 Sep 2002 07:38:58 -0000 1.9 +++ defconfig-pb1100 26 Sep 2002 05:39:39 -0000 1.10 @@ -1,5 +1,5 @@ # -# Automatically generated by make menuconfig: don't edit +# Automatically generated make config: don't edit # CONFIG_MIPS=y CONFIG_MIPS32=y @@ -64,7 +64,7 @@ # CONFIG_HIGHMEM is not set CONFIG_RWSEM_GENERIC_SPINLOCK=y # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set -CONFIG_MIPS_AU1000=y +CONFIG_CPU_AU1100=y CONFIG_NEW_IRQ=y CONFIG_PCI=y # CONFIG_PCI_AUTO is not set @@ -72,7 +72,6 @@ CONFIG_NONCOHERENT_IO=y CONFIG_PC_KEYB=y CONFIG_SWAP_IO_SPACE=y -# CONFIG_AU1000_USB_DEVICE is not set # # CPU selection @@ -96,6 +95,17 @@ CONFIG_CPU_MIPS32=y # CONFIG_CPU_MIPS64 is not set # CONFIG_CPU_RC32300 is not set +# CONFIG_CPU_GENERIC is not set +# CONFIG_CPU_AU1000 is not set +# CONFIG_CPU_AU1500 is not set +CONFIG_CPU_AU1100=y +CONFIG_CPU_AU1X00=y +CONFIG_64BIT_PHYS_ADDR=y +# CONFIG_VTAG_ICACHE is not set +CONFIG_CPU_HAS_LLSC=y +# CONFIG_CPU_HAS_LLDSCD is not set +CONFIG_CPU_HAS_WB=y +# CONFIG_CPU_HAS_PREFETCH is not set CONFIG_CPU_HAS_PREFETCH=y # CONFIG_VTAG_ICACHE is not set CONFIG_64BIT_PHYS_ADDR=y @@ -111,7 +121,7 @@ # CONFIG_CPU_R5900_CONTEXT is not set # CONFIG_VR4131_CACHE_FIX is not set CONFIG_NET=y -CONFIG_PCI_NAMES=y +# CONFIG_PCI_NAMES is not set # CONFIG_ISA is not set # CONFIG_EISA is not set # CONFIG_TC is not set @@ -128,7 +138,7 @@ # CONFIG_I82365 is not set # CONFIG_PCMCIA_IRQ_REMAP is not set # CONFIG_TCIC is not set -CONFIG_PCMCIA_AU1000=m +CONFIG_PCMCIA_AU1X00=m CONFIG_PCMCIA_PB1X00=y # CONFIG_PCMCIA_HYD1100 is not set @@ -156,6 +166,10 @@ # CONFIG_MTD_DEBUG is not set CONFIG_MTD_PARTITIONS=y # CONFIG_MTD_REDBOOT_PARTS is not set + +# +# User Modules And Translation Layers +# CONFIG_MTD_CHAR=y CONFIG_MTD_BLOCK=y # CONFIG_FTL is not set @@ -197,6 +211,10 @@ # CONFIG_MTD_SLRAM is not set # CONFIG_MTD_MTDRAM is not set # CONFIG_MTD_BLKMTD is not set + +# +# Disk-On-Chip Device Drivers +# # CONFIG_MTD_DOC1000 is not set # CONFIG_MTD_DOC2000 is not set # CONFIG_MTD_DOC2001 is not set @@ -280,6 +298,10 @@ # CONFIG_KHTTPD is not set # CONFIG_ATM is not set # CONFIG_VLAN_8021Q is not set + +# +# +# # CONFIG_IPX is not set # CONFIG_ATALK is not set # CONFIG_DECNET is not set @@ -314,6 +336,10 @@ # IDE, ATA and ATAPI Block devices # CONFIG_BLK_DEV_IDE=y + +# +# Please see Documentation/ide.txt for help/info on IDE drives +# # CONFIG_BLK_DEV_HD_IDE is not set # CONFIG_BLK_DEV_HD is not set # CONFIG_BLK_DEV_IDEDISK is not set @@ -332,6 +358,10 @@ # CONFIG_BLK_DEV_IDETAPE is not set # CONFIG_BLK_DEV_IDEFLOPPY is not set # CONFIG_BLK_DEV_IDESCSI is not set + +# +# IDE chipset support/bugfixes +# # CONFIG_BLK_DEV_CMD640 is not set # CONFIG_BLK_DEV_CMD640_ENHANCED is not set # CONFIG_BLK_DEV_ISAPNP is not set @@ -379,7 +409,7 @@ # Ethernet (10 or 100Mbit) # CONFIG_NET_ETHERNET=y -CONFIG_MIPS_AU1000_ENET=y +CONFIG_MIPS_AU1X00_ENET=y # CONFIG_SUNLANCE is not set # CONFIG_HAPPYMEAL is not set # CONFIG_SUNBMAC is not set @@ -490,12 +520,12 @@ # CONFIG_SX is not set # CONFIG_RIO is not set # CONFIG_STALDRV is not set +CONFIG_AU1X00_UART=y +CONFIG_AU1X00_SERIAL_CONSOLE=y +# CONFIG_AU1X00_USB_TTY is not set +# CONFIG_AU1X00_USB_RAW is not set # CONFIG_SERIAL_TX3912 is not set # CONFIG_SERIAL_TX3912_CONSOLE is not set -CONFIG_AU1000_UART=y -CONFIG_AU1000_SERIAL_CONSOLE=y -# CONFIG_AU1000_USB_TTY is not set -# CONFIG_AU1000_USB_RAW is not set # CONFIG_TXX927_SERIAL is not set CONFIG_UNIX98_PTYS=y CONFIG_UNIX98_PTY_COUNT=256 @@ -522,6 +552,10 @@ # CONFIG_INPUT_EMU10K1 is not set # CONFIG_INPUT_SERIO is not set # CONFIG_INPUT_SERPORT is not set + +# +# Joysticks +# # CONFIG_INPUT_ANALOG is not set # CONFIG_INPUT_A3D is not set # CONFIG_INPUT_ADI is not set @@ -565,7 +599,7 @@ # PCMCIA character devices # # CONFIG_PCMCIA_SERIAL_CS is not set -# CONFIG_AU1000_GPIO is not set +# CONFIG_AU1X00_GPIO is not set # CONFIG_TS_AU1000_ADS7846 is not set # @@ -774,8 +808,7 @@ # CONFIG_SOUND_RME96XX is not set # CONFIG_SOUND_SONICVIBES is not set # CONFIG_SOUND_HAL2 is not set -CONFIG_SOUND_AU1000=y -# CONFIG_SOUND_AU1I2S is not set +CONFIG_SOUND_AU1X00=y # CONFIG_SOUND_TRIDENT is not set # CONFIG_SOUND_MSNDCLAS is not set # CONFIG_SOUND_MSNDPIN is not set @@ -789,15 +822,31 @@ # CONFIG_USB=y CONFIG_USB_DEBUG=y + +# +# Miscellaneous USB options +# CONFIG_USB_DEVICEFS=y # CONFIG_USB_BANDWIDTH is not set # CONFIG_USB_LONG_TIMEOUT is not set + +# +# USB Controllers +# # CONFIG_USB_UHCI is not set # CONFIG_USB_UHCI_ALT is not set CONFIG_USB_OHCI=y CONFIG_USB_NON_PCI_OHCI=y + +# +# USB Device Class drivers +# # CONFIG_USB_AUDIO is not set # CONFIG_USB_BLUETOOTH is not set + +# +# SCSI support is needed for USB Storage +# # CONFIG_USB_STORAGE is not set # CONFIG_USB_STORAGE_DEBUG is not set # CONFIG_USB_STORAGE_DATAFAB is not set @@ -809,19 +858,43 @@ # CONFIG_USB_STORAGE_JUMPSHOT is not set # CONFIG_USB_ACM is not set # CONFIG_USB_PRINTER is not set + +# +# USB Human Interface Devices (HID) +# CONFIG_USB_HID=y # CONFIG_USB_HIDDEV is not set # CONFIG_USB_WACOM is not set + +# +# USB Imaging devices +# # CONFIG_USB_DC2XX is not set # CONFIG_USB_MDC800 is not set # CONFIG_USB_SCANNER is not set # CONFIG_USB_MICROTEK is not set # CONFIG_USB_HPUSBSCSI is not set + +# +# USB Multimedia devices +# + +# +# Video4Linux support is needed for USB Multimedia device support +# + +# +# USB Network adaptors +# # CONFIG_USB_PEGASUS is not set # CONFIG_USB_KAWETH is not set # CONFIG_USB_CATC is not set # CONFIG_USB_CDCETHER is not set # CONFIG_USB_USBNET is not set + +# +# USB port drivers +# # CONFIG_USB_USS720 is not set # @@ -854,6 +927,10 @@ # CONFIG_USB_SERIAL_CYBERJACK is not set # CONFIG_USB_SERIAL_XIRCOM is not set # CONFIG_USB_SERIAL_OMNINET is not set + +# +# USB Miscellaneous drivers +# # CONFIG_USB_RIO500 is not set # Index: defconfig-pb1500 =================================================================== RCS file: /cvsroot/linux-mips/linux/arch/mips/configs/defconfig-pb1500,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- defconfig-pb1500 25 Sep 2002 07:38:58 -0000 1.8 +++ defconfig-pb1500 26 Sep 2002 05:39:39 -0000 1.9 @@ -64,14 +64,13 @@ # CONFIG_HIGHMEM is not set CONFIG_RWSEM_GENERIC_SPINLOCK=y # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set -CONFIG_MIPS_AU1000=y +CONFIG_CPU_AU1500=y CONFIG_NEW_IRQ=y CONFIG_PCI=y CONFIG_NEW_PCI=y CONFIG_PCI_AUTO=y CONFIG_NONCOHERENT_IO=y CONFIG_PC_KEYB=y -# CONFIG_AU1000_USB_DEVICE is not set # # CPU selection @@ -95,6 +94,17 @@ CONFIG_CPU_MIPS32=y # CONFIG_CPU_MIPS64 is not set # CONFIG_CPU_RC32300 is not set +# CONFIG_CPU_GENERIC is not set +# CONFIG_CPU_AU1000 is not set +CONFIG_CPU_AU1500=y +# CONFIG_CPU_AU1100 is not set +CONFIG_CPU_AU1X00=y +CONFIG_64BIT_PHYS_ADDR=y +# CONFIG_VTAG_ICACHE is not set +CONFIG_CPU_HAS_LLSC=y +# CONFIG_CPU_HAS_LLDSCD is not set +CONFIG_CPU_HAS_WB=y +# CONFIG_CPU_HAS_PREFETCH is not set CONFIG_CPU_HAS_PREFETCH=y # CONFIG_VTAG_ICACHE is not set CONFIG_64BIT_PHYS_ADDR=y @@ -121,13 +131,7 @@ # # PCMCIA/CardBus support # -CONFIG_PCMCIA=y -CONFIG_CARDBUS=y -# CONFIG_I82092 is not set -# CONFIG_I82365 is not set -# CONFIG_PCMCIA_IRQ_REMAP is not set -# CONFIG_TCIC is not set -# CONFIG_PCMCIA_AU1000 is not set +# CONFIG_PCMCIA is not set # # PCI Hotplug Support @@ -324,7 +328,7 @@ # CONFIG_BLK_DEV_IDEDISK_WD is not set # CONFIG_BLK_DEV_COMMERIAL is not set # CONFIG_BLK_DEV_TIVO is not set -CONFIG_BLK_DEV_IDECS=m +# CONFIG_BLK_DEV_IDECS is not set # CONFIG_BLK_DEV_IDECD is not set # CONFIG_BLK_DEV_IDETAPE is not set # CONFIG_BLK_DEV_IDEFLOPPY is not set @@ -407,7 +411,7 @@ # Ethernet (10 or 100Mbit) # CONFIG_NET_ETHERNET=y -CONFIG_MIPS_AU1000_ENET=y +CONFIG_MIPS_AU1X00_ENET=y # CONFIG_SUNLANCE is not set # CONFIG_HAPPYMEAL is not set # CONFIG_SUNBMAC is not set @@ -488,8 +492,6 @@ # CONFIG_AIRO is not set CONFIG_HERMES=m # CONFIG_PLX_HERMES is not set -CONFIG_PCMCIA_HERMES=m -# CONFIG_AIRO_CS is not set CONFIG_NET_WIRELESS=y # @@ -506,24 +508,6 @@ # CONFIG_WAN is not set # -# PCMCIA network device support -# -CONFIG_NET_PCMCIA=y -# CONFIG_PCMCIA_3C589 is not set -# CONFIG_PCMCIA_3C574 is not set -# CONFIG_PCMCIA_FMVJ18X is not set -# CONFIG_PCMCIA_PCNET is not set -# CONFIG_PCMCIA_AXNET is not set -# CONFIG_PCMCIA_NMCLAN is not set -# CONFIG_PCMCIA_SMC91C92 is not set -# CONFIG_PCMCIA_XIRC2PS is not set -# CONFIG_ARCNET_COM20020_CS is not set -# CONFIG_PCMCIA_IBMTR is not set -# CONFIG_PCMCIA_XIRCOM is not set -# CONFIG_PCMCIA_XIRTULIP is not set -# CONFIG_NET_PCMCIA_RADIO is not set - -# # Amateur Radio support # # CONFIG_HAMRADIO is not set @@ -562,12 +546,12 @@ # CONFIG_SX is not set # CONFIG_RIO is not set # CONFIG_STALDRV is not set +CONFIG_AU1X00_UART=y +CONFIG_AU1X00_SERIAL_CONSOLE=y +# CONFIG_AU1X00_USB_TTY is not set +# CONFIG_AU1X00_USB_RAW is not set # CONFIG_SERIAL_TX3912 is not set # CONFIG_SERIAL_TX3912_CONSOLE is not set -CONFIG_AU1000_UART=y -CONFIG_AU1000_SERIAL_CONSOLE=y -# CONFIG_AU1000_USB_TTY is not set -# CONFIG_AU1000_USB_RAW is not set # CONFIG_TXX927_SERIAL is not set CONFIG_UNIX98_PTYS=y CONFIG_UNIX98_PTY_COUNT=256 @@ -632,12 +616,7 @@ # CONFIG_FTAPE is not set # CONFIG_AGP is not set # CONFIG_DRM is not set - -# -# PCMCIA character devices -# -# CONFIG_PCMCIA_SERIAL_CS is not set -# CONFIG_AU1000_GPIO is not set +CONFIG_AU1X00_GPIO=y # CONFIG_TS_AU1000_ADS7846 is not set # @@ -847,8 +826,7 @@ # CONFIG_SOUND_RME96XX is not set # CONFIG_SOUND_SONICVIBES is not set # CONFIG_SOUND_HAL2 is not set -CONFIG_SOUND_AU1000=y -# CONFIG_SOUND_AU1I2S is not set +CONFIG_SOUND_AU1X00=y # CONFIG_SOUND_TRIDENT is not set # CONFIG_SOUND_MSNDCLAS is not set # CONFIG_SOUND_MSNDPIN is not set |
