From: Waldemar Brodkorb Date: Thu, 23 Mar 2006 11:48:03 +0000 (+0000) Subject: sync kernel config X-Git-Tag: reboot~30963 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=2da51a3c11cae11179fa537ee781e2c179dce18e;p=openwrt%2Fstaging%2Fxback.git sync kernel config SVN-Revision: 3455 --- diff --git a/openwrt/target/linux/ar531x-2.4/config b/openwrt/target/linux/ar531x-2.4/config index 4a33791bfb..782d1de4c7 100644 --- a/openwrt/target/linux/ar531x-2.4/config +++ b/openwrt/target/linux/ar531x-2.4/config @@ -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 @@ -32,10 +32,10 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set -CONFIG_AR531X=y # CONFIG_MIPS_PB1550 is not set # CONFIG_MIPS_PB1200 is not set # CONFIG_MIPS_HYDROGEN3 is not set +CONFIG_AR531X=y # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set @@ -81,15 +81,13 @@ CONFIG_AR531X=y # CONFIG_HIGHMEM is not set CONFIG_RWSEM_GENERIC_SPINLOCK=y # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set -CONFIG_CPU_VR41XX=y CONFIG_IRQ_CPU=y +CONFIG_CPU_R4X00=y CONFIG_SERIAL=y CONFIG_NEW_IRQ=y CONFIG_NEW_TIME_C=y CONFIG_NONCOHERENT_IO=y CONFIG_EARLY_PRINTK_HACK=y -CONFIG_VENETDEV=y -CONFIG_MARVELL_ENET_PHY=y # CONFIG_SCSI is not set # @@ -102,7 +100,15 @@ CONFIG_AP30=y # CONFIG_AP38 is not set # CONFIG_AP43 is not set # CONFIG_AP48 is not set +# CONFIG_AP51 is not set +# CONFIG_AP30ASK is not set CONFIG_MTD_PHYSMAP_BUSWIDTH=2 + +# +# Flash Selection +# +CONFIG_FLASH_2MB=y +# CONFIG_FLASH_4MB is not set # CONFIG_MIPS_AU1000 is not set # @@ -112,9 +118,9 @@ CONFIG_MTD_PHYSMAP_BUSWIDTH=2 # CONFIG_CPU_MIPS64 is not set # CONFIG_CPU_R3000 is not set # CONFIG_CPU_TX39XX is not set -CONFIG_CPU_VR41XX=y +# CONFIG_CPU_VR41XX is not set # CONFIG_CPU_R4300 is not set -# CONFIG_CPU_R4X00 is not set +CONFIG_CPU_R4X00=y # CONFIG_CPU_TX49XX is not set # CONFIG_CPU_R5000 is not set # CONFIG_CPU_R5432 is not set @@ -128,6 +134,7 @@ CONFIG_CPU_VR41XX=y CONFIG_PAGE_SIZE_4KB=y # CONFIG_PAGE_SIZE_16KB is not set # CONFIG_PAGE_SIZE_64KB is not set +# CONFIG_64BIT_PHYS_ADDR is not set CONFIG_CPU_ADVANCED=y # CONFIG_CPU_HAS_LLSC is not set # CONFIG_CPU_HAS_LLDSCD is not set @@ -176,6 +183,10 @@ CONFIG_MTD_PARTITIONS=y # CONFIG_MTD_CONCAT is not set CONFIG_MTD_REDBOOT_PARTS=y # CONFIG_MTD_CMDLINE_PARTS is not set + +# +# User Modules And Translation Layers +# CONFIG_MTD_CHAR=y CONFIG_MTD_BLOCK=y # CONFIG_FTL is not set @@ -217,8 +228,8 @@ CONFIG_MTD_JEDEC=y # CONFIG_MTD_PHYSMAP=y CONFIG_MTD_PHYSMAP_START=0xbe000000 -CONFIG_MTD_PHYSMAP_LEN=0x800000 -CONFIG_MTD_PHYSMAP_BUSWIDTH=1 +CONFIG_MTD_PHYSMAP_LEN=200000 +CONFIG_MTD_PHYSMAP_BUSWIDTH=2 # CONFIG_MTD_PB1000 is not set # CONFIG_MTD_PB1500 is not set # CONFIG_MTD_PB1100 is not set @@ -242,6 +253,10 @@ CONFIG_MTD_PHYSMAP_BUSWIDTH=1 # 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 @@ -292,6 +307,11 @@ CONFIG_BLK_DEV_RAM_SIZE=3072 CONFIG_BLK_DEV_INITRD=y # CONFIG_BLK_STATS is not set +# +# MIPS initrd options +# +# CONFIG_EMBEDDED_RAMDISK is not set + # # Multi-device support (RAID and LVM) # @@ -346,8 +366,8 @@ CONFIG_IP_NF_MATCH_CONNBYTES=m CONFIG_IP_NF_CT_PROTO_GRE=m CONFIG_IP_NF_PPTP=m CONFIG_IP_NF_H323=m -CONFIG_IP_NF_MMS=m CONFIG_IP_NF_RTSP=m +CONFIG_IP_NF_MMS=m CONFIG_IP_NF_QUEUE=m CONFIG_IP_NF_IPTABLES=y CONFIG_IP_NF_MATCH_LIMIT=m @@ -387,7 +407,6 @@ CONFIG_IP_NF_MATCH_STRING=m CONFIG_IP_NF_MATCH_OWNER=m CONFIG_IP_NF_MATCH_LAYER7=m # CONFIG_IP_NF_MATCH_LAYER7_DEBUG is not set -CONFIG_IP_NF_MATCH_LAYER7_MAXDATALEN=2048 CONFIG_IP_NF_FILTER=y CONFIG_IP_NF_TARGET_REJECT=y CONFIG_IP_NF_TARGET_MIRROR=m @@ -398,10 +417,10 @@ CONFIG_IP_NF_TARGET_REDIRECT=m CONFIG_IP_NF_TARGET_NETMAP=m CONFIG_IP_NF_NAT_PPTP=m CONFIG_IP_NF_NAT_PROTO_GRE=m +CONFIG_IP_NF_NAT_AMANDA=m CONFIG_IP_NF_NAT_H323=m -CONFIG_IP_NF_NAT_MMS=m CONFIG_IP_NF_NAT_RTSP=m -CONFIG_IP_NF_NAT_AMANDA=m +CONFIG_IP_NF_NAT_MMS=m CONFIG_IP_NF_NAT_SNMP_BASIC=m CONFIG_IP_NF_NAT_IRC=y CONFIG_IP_NF_NAT_FTP=y @@ -427,6 +446,10 @@ CONFIG_IP_NF_ARP_MANGLE=m CONFIG_IP_VS=m # CONFIG_IP_VS_DEBUG is not set CONFIG_IP_VS_TAB_BITS=12 + +# +# IPVS scheduler +# CONFIG_IP_VS_RR=m CONFIG_IP_VS_WRR=m CONFIG_IP_VS_LC=m @@ -437,6 +460,10 @@ CONFIG_IP_VS_DH=m CONFIG_IP_VS_SH=m CONFIG_IP_VS_SED=m CONFIG_IP_VS_NQ=m + +# +# IPVS application helper +# CONFIG_IP_VS_FTP=m CONFIG_IPV6=m @@ -472,6 +499,10 @@ CONFIG_IP6_NF_TARGET_IMQ=m # CONFIG_IP_SCTP is not set # CONFIG_ATM is not set CONFIG_VLAN_8021Q=y + +# +# +# # CONFIG_IPX is not set # CONFIG_ATALK is not set # CONFIG_DECNET is not set @@ -536,6 +567,10 @@ CONFIG_IDE=m # IDE, ATA and ATAPI Block devices # CONFIG_BLK_DEV_IDE=m + +# +# 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_IDE_SATA is not set @@ -549,6 +584,10 @@ CONFIG_IDEDISK_STROKE=y # CONFIG_BLK_DEV_IDEFLOPPY is not set # CONFIG_BLK_DEV_IDESCSI is not set # CONFIG_IDE_TASK_IOCTL 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 @@ -596,6 +635,9 @@ CONFIG_NET_RANDOM=y # Ethernet (10 or 100Mbit) # CONFIG_NET_ETHERNET=y +# CONFIG_VENETDEV is not set +# CONFIG_NET_ATHEROS_ETHER is not set +CONFIG_MARVELL_ENET_PHY=y # CONFIG_SUNLANCE is not set # CONFIG_SUNBMAC is not set # CONFIG_SUNQE is not set @@ -646,8 +688,12 @@ CONFIG_NET_RADIO=y # CONFIG_AIRONET4500_NONCS is not set # CONFIG_AIRONET4500_PROC is not set # CONFIG_HERMES is not set + +# +# Prism54 PCI/PCMCIA GT/Duette Driver - 802.11(a/b/g) +# # CONFIG_PRISM54 is not set -CONFIG_NET_WIRELESS=y +# CONFIG_NET_WIRELESS is not set # # Token Ring devices @@ -666,11 +712,19 @@ CONFIG_SHAPER=m # Amateur Radio support # CONFIG_HAMRADIO=y + +# +# Packet Radio protocols +# CONFIG_AX25=m # CONFIG_AX25_DAMA_SLAVE is not set # CONFIG_NETROM is not set # CONFIG_ROSE is not set +# +# AX.25 network device drivers +# + # # AX.25 network device drivers # @@ -714,7 +768,6 @@ CONFIG_SERIAL=y CONFIG_SERIAL_CONSOLE=y # CONFIG_SERIAL_EXTENDED is not set # CONFIG_SERIAL_NONSTANDARD is not set -# CONFIG_VR41XX_KIU is not set CONFIG_UNIX98_PTYS=y CONFIG_UNIX98_PTY_COUNT=128 CONFIG_PRINTER=m @@ -737,6 +790,14 @@ CONFIG_PPDEV=m # Joysticks # # CONFIG_INPUT_GAMEPORT is not set + +# +# Input core support is needed for gameports +# + +# +# Input core support is needed for joysticks +# # CONFIG_QIC02_TAPE is not set # CONFIG_IPMI_HANDLER is not set # CONFIG_IPMI_PANIC_EVENT is not set @@ -962,6 +1023,10 @@ CONFIG_VIDEO_DEV=m # CONFIG_VIDEO_PROC_FS=y # CONFIG_I2C_PARPORT is not set + +# +# Video Adapters +# # CONFIG_VIDEO_BT848 is not set # CONFIG_VIDEO_PMS is not set # CONFIG_VIDEO_BWQCAM is not set