add first batch of enrik's ar7 system code cleanups

[openwrt.git] / openwrt / target / linux / linux-2.4 / config / ar7

diff --git a/openwrt/target/linux/linux-2.4/config/ar7 b/openwrt/target/linux/linux-2.4/config/ar7
index d1b4742..d0ef2f0 100644 (file)
--- a/openwrt/target/linux/linux-2.4/config/ar7
+++ b/openwrt/target/linux/linux-2.4/config/ar7
@@ -25,7 +25,8 @@ CONFIG_AR7=y
 # CONFIG_AR7DB is not set
 # CONFIG_AR7RD is not set
 CONFIG_AR7WRD=y
 # CONFIG_AR7DB is not set
 # CONFIG_AR7RD is not set
 CONFIG_AR7WRD=y

-CONFIG_AR7_FREQUENCY=150
+CONFIG_AR7_CPU=150
+CONFIG_AR7_SYS=125

 CONFIG_AR7_MEMORY=0x14000000
 # CONFIG_MIPS_BOSPORUS is not set
 # CONFIG_MIPS_FICMMP is not set
 CONFIG_AR7_MEMORY=0x14000000
 # CONFIG_MIPS_BOSPORUS is not set
 # CONFIG_MIPS_FICMMP is not set


@@ -88,7 +89,6 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y
 # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
 CONFIG_NONCOHERENT_IO=y
 CONFIG_SWAP_IO_SPACE=y
 # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
 CONFIG_NONCOHERENT_IO=y
 CONFIG_SWAP_IO_SPACE=y

-CONFIG_AR7_PAGING=y

 # CONFIG_MIPS_AU1000 is not set
 
 #
 # CONFIG_MIPS_AU1000 is not set
 
 #


@@ -166,7 +166,7 @@ CONFIG_BINFMT_ELF=y
 # CONFIG_BINFMT_MISC is not set
 # CONFIG_OOM_KILLER is not set
 CONFIG_CMDLINE_BOOL=y
 # CONFIG_BINFMT_MISC is not set
 # CONFIG_OOM_KILLER is not set
 CONFIG_CMDLINE_BOOL=y

-CONFIG_CMDLINE="root=/dev/mtdblock0 rootfstype=squashfs,jffs2 init=/etc/preinit noinitrd"
+CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=squashfs,jffs2 init=/etc/preinit noinitrd"

 
 #
 # Memory Technology Devices (MTD)
 
 #
 # Memory Technology Devices (MTD)


@@ -221,11 +221,11 @@ CONFIG_MTD_CFI_AMDSTD=y
 # Mapping drivers for chip access
 #
 # CONFIG_MTD_PHYSMAP is not set
 # Mapping drivers for chip access
 #
 # CONFIG_MTD_PHYSMAP is not set

-CONFIG_MTD_AVALANCHE=y
-CONFIG_MTD_AVALANCHE_DEFAULTS=y
-CONFIG_MTD_AVALANCHE_START=0x10000000
-CONFIG_MTD_AVALANCHE_LEN=0x400000
-CONFIG_MTD_AVALANCHE_BUSWIDTH=2
+CONFIG_MTD_AR7=y
+CONFIG_MTD_AR7_DEFAULTS=y
+CONFIG_MTD_AR7_START=0x10000000
+CONFIG_MTD_AR7_LEN=0x400000
+CONFIG_MTD_AR7_BUSWIDTH=2

 # CONFIG_MTD_PB1000 is not set
 # CONFIG_MTD_PB1500 is not set
 # CONFIG_MTD_PB1100 is not set
 # CONFIG_MTD_PB1000 is not set
 # CONFIG_MTD_PB1500 is not set
 # CONFIG_MTD_PB1100 is not set


@@ -337,6 +337,7 @@ CONFIG_NET_IPGRE=m
 #   IP: Netfilter Configuration
 #
 CONFIG_IP_NF_CONNTRACK=y
 #   IP: Netfilter Configuration
 #
 CONFIG_IP_NF_CONNTRACK=y

+CONFIG_IP_NF_CONNTRACK_MARK=y

 CONFIG_IP_NF_FTP=y
 CONFIG_IP_NF_AMANDA=m
 CONFIG_IP_NF_TFTP=m
 CONFIG_IP_NF_FTP=y
 CONFIG_IP_NF_AMANDA=m
 CONFIG_IP_NF_TFTP=m


@@ -346,6 +347,17 @@ CONFIG_IP_NF_PPTP=m
 CONFIG_IP_NF_QUEUE=m
 CONFIG_IP_NF_IPTABLES=y
 CONFIG_IP_NF_MATCH_LIMIT=m
 CONFIG_IP_NF_QUEUE=m
 CONFIG_IP_NF_IPTABLES=y
 CONFIG_IP_NF_MATCH_LIMIT=m

+CONFIG_IP_NF_SET=m
+CONFIG_IP_NF_SET_MAX=256
+CONFIG_IP_NF_SET_HASHSIZE=1024
+CONFIG_IP_NF_MATCH_SET=m
+CONFIG_IP_NF_TARGET_SET=m
+CONFIG_IP_NF_SET_IPMAP=m
+CONFIG_IP_NF_SET_PORTMAP=m
+CONFIG_IP_NF_SET_MACIPMAP=m
+CONFIG_IP_NF_SET_IPHASH=m
+CONFIG_IP_NF_SET_NETHASH=m
+CONFIG_IP_NF_SET_IPTREE=m

 CONFIG_IP_NF_MATCH_MAC=m
 CONFIG_IP_NF_MATCH_PKTTYPE=m
 CONFIG_IP_NF_MATCH_MARK=y
 CONFIG_IP_NF_MATCH_MAC=m
 CONFIG_IP_NF_MATCH_PKTTYPE=m
 CONFIG_IP_NF_MATCH_MARK=y


@@ -362,12 +374,12 @@ CONFIG_IP_NF_MATCH_TCPMSS=y
 CONFIG_IP_NF_MATCH_HELPER=m
 CONFIG_IP_NF_MATCH_STATE=y
 CONFIG_IP_NF_MATCH_CONNTRACK=m
 CONFIG_IP_NF_MATCH_HELPER=m
 CONFIG_IP_NF_MATCH_STATE=y
 CONFIG_IP_NF_MATCH_CONNTRACK=m

+CONFIG_IP_NF_MATCH_CONNMARK=m

 CONFIG_IP_NF_MATCH_UNCLEAN=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_MATCH_UNCLEAN=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_MATCH_PHYSDEV is not set

 CONFIG_IP_NF_FILTER=y
 CONFIG_IP_NF_TARGET_REJECT=y
 CONFIG_IP_NF_TARGET_MIRROR=m
 CONFIG_IP_NF_FILTER=y
 CONFIG_IP_NF_TARGET_REJECT=y
 CONFIG_IP_NF_TARGET_MIRROR=m


@@ -388,6 +400,7 @@ CONFIG_IP_NF_TARGET_TOS=m
 CONFIG_IP_NF_TARGET_ECN=m
 CONFIG_IP_NF_TARGET_DSCP=m
 CONFIG_IP_NF_TARGET_MARK=y
 CONFIG_IP_NF_TARGET_ECN=m
 CONFIG_IP_NF_TARGET_DSCP=m
 CONFIG_IP_NF_TARGET_MARK=y

+CONFIG_IP_NF_TARGET_CONNMARK=m

 CONFIG_IP_NF_TARGET_LOG=y
 CONFIG_IP_NF_TARGET_TTL=m
 CONFIG_IP_NF_TARGET_ULOG=m
 CONFIG_IP_NF_TARGET_LOG=y
 CONFIG_IP_NF_TARGET_TTL=m
 CONFIG_IP_NF_TARGET_ULOG=m


@@ -430,7 +443,11 @@ CONFIG_IP6_NF_TARGET_MARK=m
 #    SCTP Configuration (EXPERIMENTAL)
 #
 # CONFIG_IP_SCTP is not set
 #    SCTP Configuration (EXPERIMENTAL)
 #
 # CONFIG_IP_SCTP is not set

-# CONFIG_ATM is not set
+CONFIG_ATM=m
+# CONFIG_ATM_CLIP is not set
+# CONFIG_ATM_LANE is not set
+CONFIG_ATM_BR2684=m
+# CONFIG_ATM_BR2684_IPFILTER is not set

 CONFIG_VLAN_8021Q=y
 
 #
 CONFIG_VLAN_8021Q=y
 
 #


@@ -457,6 +474,7 @@ CONFIG_NET_SCH_CBQ=m
 CONFIG_NET_SCH_HTB=m
 CONFIG_NET_SCH_CSZ=m
 CONFIG_NET_SCH_HFSC=m
 CONFIG_NET_SCH_HTB=m
 CONFIG_NET_SCH_CSZ=m
 CONFIG_NET_SCH_HFSC=m

+# CONFIG_NET_SCH_ATM is not set

 CONFIG_NET_SCH_PRIO=m
 CONFIG_NET_SCH_RED=m
 CONFIG_NET_SCH_SFQ=m
 CONFIG_NET_SCH_PRIO=m
 CONFIG_NET_SCH_RED=m
 CONFIG_NET_SCH_SFQ=m


@@ -516,7 +534,7 @@ CONFIG_CHR_DEV_SG=m
 # Some SCSI devices (e.g. CD jukebox) support multiple LUNs
 #
 # CONFIG_SCSI_DEBUG_QUEUES is not set
 # Some SCSI devices (e.g. CD jukebox) support multiple LUNs
 #
 # CONFIG_SCSI_DEBUG_QUEUES is not set

-# CONFIG_SCSI_MULTI_LUN is not set
+CONFIG_SCSI_MULTI_LUN=y

 # CONFIG_SCSI_CONSTANTS is not set
 # CONFIG_SCSI_LOGGING is not set
 
 # CONFIG_SCSI_CONSTANTS is not set
 # CONFIG_SCSI_LOGGING is not set
 


@@ -648,6 +666,7 @@ CONFIG_PPP_DEFLATE=m
 CONFIG_PPP_BSDCOMP=m
 CONFIG_PPP_MPPE_MPPC=m
 CONFIG_PPPOE=m
 CONFIG_PPP_BSDCOMP=m
 CONFIG_PPP_MPPE_MPPC=m
 CONFIG_PPPOE=m

+CONFIG_PPPOATM=m

 # CONFIG_SLIP is not set
 
 #
 # CONFIG_SLIP is not set
 
 #


@@ -681,6 +700,12 @@ CONFIG_SHAPER=m
 #
 # CONFIG_WAN is not set
 
 #
 # CONFIG_WAN is not set
 

+#
+# ATM drivers
+#
+# CONFIG_ATM_TCP is not set
+CONFIG_MIPS_SANGAM_ATM=m
+

 #
 # Amateur Radio support
 #
 #
 # Amateur Radio support
 #


@@ -714,8 +739,13 @@ CONFIG_SERIAL=y
 CONFIG_SERIAL_CONSOLE=y
 # CONFIG_SERIAL_EXTENDED is not set
 # CONFIG_SERIAL_NONSTANDARD is not set
 CONFIG_SERIAL_CONSOLE=y
 # CONFIG_SERIAL_EXTENDED is not set
 # CONFIG_SERIAL_NONSTANDARD is not set

+CONFIG_AR7_LED=y

 CONFIG_UNIX98_PTYS=y
 CONFIG_UNIX98_PTY_COUNT=128
 CONFIG_UNIX98_PTYS=y
 CONFIG_UNIX98_PTY_COUNT=128

+CONFIG_AR7_VLYNQ=y
+CONFIG_VLYNQ_CLK_LOCAL=y
+CONFIG_AR7_VLYNQ_PORTS=2
+CONFIG_AR7_ADAM2=y

 
 #
 # I2C support
 
 #
 # I2C support


@@ -827,6 +857,7 @@ CONFIG_JFFS2_BBC_LZARI=y
 # CONFIG_JFFS2_BBC_LZSS is not set
 # CONFIG_CRAMFS is not set
 CONFIG_SQUASHFS=y
 # CONFIG_JFFS2_BBC_LZSS is not set
 # CONFIG_CRAMFS is not set
 CONFIG_SQUASHFS=y

+# CONFIG_SQUASHFS_EMBEDDED is not set

 CONFIG_TMPFS=y
 CONFIG_RAMFS=y
 CONFIG_ISO9660_FS=m
 CONFIG_TMPFS=y
 CONFIG_RAMFS=y
 CONFIG_ISO9660_FS=m


@@ -977,7 +1008,29 @@ CONFIG_NLS_DEFAULT="iso8859-1"
 #
 # Bluetooth support
 #
 #
 # Bluetooth support
 #

-# CONFIG_BLUEZ is not set
+CONFIG_BLUEZ=m
+CONFIG_BLUEZ_L2CAP=m
+CONFIG_BLUEZ_SCO=m
+CONFIG_BLUEZ_RFCOMM=m
+CONFIG_BLUEZ_RFCOMM_TTY=y
+CONFIG_BLUEZ_BNEP=m
+CONFIG_BLUEZ_BNEP_MC_FILTER=y
+CONFIG_BLUEZ_BNEP_PROTO_FILTER=y
+
+#
+# Bluetooth device drivers
+#
+# CONFIG_BLUEZ_HCIUSB is not set
+CONFIG_BLUEZ_HCIUART=m
+CONFIG_BLUEZ_HCIUART_H4=y
+CONFIG_BLUEZ_HCIUART_BCSP=y
+CONFIG_BLUEZ_HCIUART_BCSP_TXCRC=y
+# CONFIG_BLUEZ_HCIBFUSB is not set
+# CONFIG_BLUEZ_HCIDTL1 is not set
+# CONFIG_BLUEZ_HCIBT3C is not set
+# CONFIG_BLUEZ_HCIBLUECARD is not set
+# CONFIG_BLUEZ_HCIBTUART is not set
+# CONFIG_BLUEZ_HCIVHCI is not set

 
 #
 # Kernel hacking
 
 #
 # Kernel hacking