ar71xx: merge DSA switch patch

[openwrt.git] / target / linux / au1000 / au1550 / config-default

diff --git a/target/linux/au1000/au1550/config-default b/target/linux/au1000/au1550/config-default
index 6dc238c..407a256 100644 (file)
--- a/target/linux/au1000/au1550/config-default
+++ b/target/linux/au1000/au1550/config-default
@@ -9,22 +9,21 @@ CONFIG_ARCH_POPULATES_NODE_MAP=y
 CONFIG_ARCH_SUPPORTS_OPROFILE=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_ATMEL=m
 CONFIG_ARCH_SUPPORTS_OPROFILE=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_ATMEL=m

-CONFIG_BASE_SMALL=0

 # CONFIG_BCM47XX is not set
 CONFIG_BITREVERSE=y
 CONFIG_CEVT_R4K=y
 # CONFIG_CFG80211 is not set
 CONFIG_CLASSIC_RCU=y
 # CONFIG_BCM47XX is not set
 CONFIG_BITREVERSE=y
 CONFIG_CEVT_R4K=y
 # CONFIG_CFG80211 is not set
 CONFIG_CLASSIC_RCU=y

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

 # CONFIG_CPU_BIG_ENDIAN is not set
 CONFIG_CPU_HAS_LLSC=y
 CONFIG_CPU_HAS_PREFETCH=y
 CONFIG_CPU_HAS_SYNC=y
 CONFIG_CPU_LITTLE_ENDIAN=y
 # CONFIG_CPU_LOONGSON2 is not set
 # CONFIG_CPU_BIG_ENDIAN is not set
 CONFIG_CPU_HAS_LLSC=y
 CONFIG_CPU_HAS_PREFETCH=y
 CONFIG_CPU_HAS_SYNC=y
 CONFIG_CPU_LITTLE_ENDIAN=y
 # CONFIG_CPU_LOONGSON2 is not set

-CONFIG_CPU_MIPS32=y

 CONFIG_CPU_MIPS32_R1=y
 # CONFIG_CPU_MIPS32_R2 is not set
 CONFIG_CPU_MIPS32_R1=y
 # CONFIG_CPU_MIPS32_R2 is not set

+CONFIG_CPU_MIPS32=y

 # CONFIG_CPU_MIPS64_R1 is not set
 # CONFIG_CPU_MIPS64_R2 is not set
 CONFIG_CPU_MIPSR1=y
 # CONFIG_CPU_MIPS64_R1 is not set
 # CONFIG_CPU_MIPS64_R2 is not set
 CONFIG_CPU_MIPSR1=y


@@ -61,8 +60,8 @@ CONFIG_DMA_NEED_PCI_MAP_STATE=y
 CONFIG_DMA_NONCOHERENT=y
 CONFIG_DUMMY=m
 CONFIG_ELF_CORE=y
 CONFIG_DMA_NONCOHERENT=y
 CONFIG_DUMMY=m
 CONFIG_ELF_CORE=y

-CONFIG_GENERIC_CLOCKEVENTS=y

 CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
 CONFIG_GENERIC_CLOCKEVENTS_BUILD=y

+CONFIG_GENERIC_CLOCKEVENTS=y

 CONFIG_GENERIC_CMOS_UPDATE=y
 # CONFIG_GENERIC_FIND_FIRST_BIT is not set
 CONFIG_GENERIC_FIND_NEXT_BIT=y
 CONFIG_GENERIC_CMOS_UPDATE=y
 # CONFIG_GENERIC_FIND_FIRST_BIT is not set
 CONFIG_GENERIC_FIND_NEXT_BIT=y


@@ -82,20 +81,19 @@ CONFIG_HAVE_IDE=y
 # CONFIG_HAVE_KPROBES is not set
 # CONFIG_HAVE_KRETPROBES is not set
 CONFIG_HAVE_OPROFILE=y
 # CONFIG_HAVE_KPROBES is not set
 # CONFIG_HAVE_KRETPROBES is not set
 CONFIG_HAVE_OPROFILE=y

-CONFIG_HOSTAP=m

 CONFIG_HOSTAP_CS=m
 CONFIG_HOSTAP_CS=m

+CONFIG_HOSTAP=m

 CONFIG_HOSTAP_PCI=m
 CONFIG_HW_HAS_PCI=y
 CONFIG_HW_RANDOM=y
 CONFIG_HOSTAP_PCI=m
 CONFIG_HW_HAS_PCI=y
 CONFIG_HW_RANDOM=y

-CONFIG_HZ=250

 # CONFIG_HZ_100 is not set
 # CONFIG_HZ_100 is not set

+CONFIG_HZ=250

 CONFIG_HZ_250=y
 CONFIG_HZ_250=y

-# CONFIG_I2C is not set

 # CONFIG_IDE is not set
 # CONFIG_IDE is not set

-CONFIG_IEEE80211=m

 CONFIG_IEEE80211_CRYPT_CCMP=m
 CONFIG_IEEE80211_CRYPT_TKIP=m
 CONFIG_IEEE80211_CRYPT_WEP=m
 CONFIG_IEEE80211_CRYPT_CCMP=m
 CONFIG_IEEE80211_CRYPT_TKIP=m
 CONFIG_IEEE80211_CRYPT_WEP=m

+CONFIG_IEEE80211=m

 CONFIG_IFB=m
 CONFIG_INET_DIAG=m
 CONFIG_INET_TCP_DIAG=m
 CONFIG_IFB=m
 CONFIG_INET_DIAG=m
 CONFIG_INET_TCP_DIAG=m


@@ -126,7 +124,6 @@ CONFIG_MAGIC_SYSRQ=y
 # CONFIG_MFD_CORE is not set
 # CONFIG_MFD_TMIO is not set
 # CONFIG_MIKROTIK_RB532 is not set
 # CONFIG_MFD_CORE is not set
 # CONFIG_MFD_TMIO is not set
 # CONFIG_MIKROTIK_RB532 is not set

-CONFIG_MIPS=y

 CONFIG_MIPS_AU1X00_ENET=y
 # CONFIG_MIPS_BOSPORUS is not set
 # CONFIG_MIPS_COBALT is not set
 CONFIG_MIPS_AU1X00_ENET=y
 # CONFIG_MIPS_BOSPORUS is not set
 # CONFIG_MIPS_COBALT is not set


@@ -139,10 +136,10 @@ CONFIG_MIPS_DISABLE_OBSOLETE_IDE=y
 CONFIG_MIPS_L1_CACHE_SHIFT=5
 # CONFIG_MIPS_MALTA is not set
 # CONFIG_MIPS_MIRAGE is not set
 CONFIG_MIPS_L1_CACHE_SHIFT=5
 # CONFIG_MIPS_MALTA is not set
 # CONFIG_MIPS_MIRAGE is not set

-# CONFIG_MIPS_MTX1 is not set

 CONFIG_MIPS_MT_DISABLED=y
 # CONFIG_MIPS_MT_SMP is not set
 # CONFIG_MIPS_MT_SMTC is not set
 CONFIG_MIPS_MT_DISABLED=y
 # CONFIG_MIPS_MT_SMP is not set
 # CONFIG_MIPS_MT_SMTC is not set

+# CONFIG_MIPS_MTX1 is not set

 # CONFIG_MIPS_PB1000 is not set
 # CONFIG_MIPS_PB1100 is not set
 # CONFIG_MIPS_PB1200 is not set
 # CONFIG_MIPS_PB1000 is not set
 # CONFIG_MIPS_PB1100 is not set
 # CONFIG_MIPS_PB1200 is not set


@@ -150,16 +147,28 @@ CONFIG_MIPS_MT_DISABLED=y
 # CONFIG_MIPS_PB1550 is not set
 # CONFIG_MIPS_SIM is not set
 # CONFIG_MIPS_XXS1500 is not set
 # CONFIG_MIPS_PB1550 is not set
 # CONFIG_MIPS_SIM is not set
 # CONFIG_MIPS_XXS1500 is not set

+CONFIG_MIPS=y

 CONFIG_MODULE_FORCE_UNLOAD=y
 # CONFIG_MTD_ALCHEMY is not set
 # CONFIG_MTD_CFI_INTELEXT is not set
 # CONFIG_MTD_COMPLEX_MAPPINGS is not set
 CONFIG_MTD_CONCAT=y
 CONFIG_MODULE_FORCE_UNLOAD=y
 # CONFIG_MTD_ALCHEMY is not set
 # CONFIG_MTD_CFI_INTELEXT is not set
 # CONFIG_MTD_COMPLEX_MAPPINGS is not set
 CONFIG_MTD_CONCAT=y

-CONFIG_MTD_PHYSMAP=y

 CONFIG_MTD_PHYSMAP_BANKWIDTH=2
 CONFIG_MTD_PHYSMAP_LEN=0
 CONFIG_MTD_PHYSMAP_START=0x8000000
 CONFIG_MTD_PHYSMAP_BANKWIDTH=2
 CONFIG_MTD_PHYSMAP_LEN=0
 CONFIG_MTD_PHYSMAP_START=0x8000000

-# CONFIG_NATSEMI is not set
+CONFIG_MTD_PHYSMAP=y
+CONFIG_NET_ACT_GACT=m
+CONFIG_NET_ACT_IPT=m
+CONFIG_NET_ACT_MIRRED=m
+CONFIG_NET_ACT_PEDIT=m
+CONFIG_NET_CLS_BASIC=m
+CONFIG_NET_CLS_FLOW=m
+CONFIG_NET_CLS_FW=m
+CONFIG_NET_CLS_ROUTE4=m
+CONFIG_NET_CLS_RSVP6=m
+CONFIG_NET_CLS_RSVP=m
+CONFIG_NET_CLS_TCINDEX=m
+CONFIG_NET_CLS_U32=m

 CONFIG_NETFILTER_XTABLES=m
 CONFIG_NETFILTER_XT_MATCH_COMMENT=m
 CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
 CONFIG_NETFILTER_XTABLES=m
 CONFIG_NETFILTER_XT_MATCH_COMMENT=m
 CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m


@@ -180,27 +189,15 @@ CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
 CONFIG_NETFILTER_XT_TARGET_RATEEST=m
 CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
 CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
 CONFIG_NETFILTER_XT_TARGET_RATEEST=m
 CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
 CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m

-CONFIG_NET_ACT_GACT=m
-CONFIG_NET_ACT_IPT=m
-CONFIG_NET_ACT_MIRRED=m
-CONFIG_NET_ACT_PEDIT=m
-CONFIG_NET_CLS_BASIC=m
-CONFIG_NET_CLS_FLOW=m
-CONFIG_NET_CLS_FW=m
-CONFIG_NET_CLS_ROUTE4=m
-CONFIG_NET_CLS_RSVP=m
-CONFIG_NET_CLS_RSVP6=m
-CONFIG_NET_CLS_TCINDEX=m
-CONFIG_NET_CLS_U32=m

 CONFIG_NET_SCH_CBQ=m
 CONFIG_NET_SCH_CBQ=m

-CONFIG_NF_CONNTRACK=m

 CONFIG_NF_CONNTRACK_FTP=m
 CONFIG_NF_CONNTRACK_IPV4=m
 CONFIG_NF_CONNTRACK_IRC=m
 CONFIG_NF_CONNTRACK_FTP=m
 CONFIG_NF_CONNTRACK_IPV4=m
 CONFIG_NF_CONNTRACK_IRC=m

+CONFIG_NF_CONNTRACK=m

 CONFIG_NF_CONNTRACK_TFTP=m
 CONFIG_NF_CONNTRACK_TFTP=m

-CONFIG_NF_NAT=m

 CONFIG_NF_NAT_FTP=m
 CONFIG_NF_NAT_IRC=m
 CONFIG_NF_NAT_FTP=m
 CONFIG_NF_NAT_IRC=m

+CONFIG_NF_NAT=m

 CONFIG_NF_NAT_TFTP=m
 # CONFIG_NO_IOPORT is not set
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_NF_NAT_TFTP=m
 # CONFIG_NO_IOPORT is not set
 CONFIG_PAGEFLAGS_EXTENDED=y


@@ -210,24 +207,23 @@ CONFIG_PAGE_SIZE_4KB=y
 # CONFIG_PAGE_SIZE_8KB is not set
 CONFIG_PCCARD=m
 CONFIG_PCCARD_NONSTATIC=m
 # CONFIG_PAGE_SIZE_8KB is not set
 CONFIG_PCCARD=m
 CONFIG_PCCARD_NONSTATIC=m

-CONFIG_PCI=y

 CONFIG_PCI_DOMAINS=y
 CONFIG_PCI_DOMAINS=y

-CONFIG_PCMCIA=m

 CONFIG_PCMCIA_AU1X00=m
 CONFIG_PCMCIA_IOCTL=y
 CONFIG_PCMCIA_LOAD_CIS=y
 CONFIG_PCMCIA_AU1X00=m
 CONFIG_PCMCIA_IOCTL=y
 CONFIG_PCMCIA_LOAD_CIS=y

+CONFIG_PCMCIA=m

 CONFIG_PCSPKR_PLATFORM=y
 CONFIG_PHYLIB=y
 # CONFIG_PMC_MSP is not set
 # CONFIG_PMC_YOSEMITE is not set
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
 CONFIG_PCSPKR_PLATFORM=y
 CONFIG_PHYLIB=y
 # CONFIG_PMC_MSP is not set
 # CONFIG_PMC_YOSEMITE is not set
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set

-CONFIG_PPP=m
-CONFIG_PPPOE=m
-CONFIG_PPPOL2TP=m

 CONFIG_PPP_ASYNC=m
 CONFIG_PPP_BSDCOMP=m
 CONFIG_PPP_DEFLATE=m
 CONFIG_PPP_ASYNC=m
 CONFIG_PPP_BSDCOMP=m
 CONFIG_PPP_DEFLATE=m

+CONFIG_PPP=m
+CONFIG_PPPOE=m
+CONFIG_PPPOL2TP=m

 # CONFIG_PREVENT_FIRMWARE_BUILD is not set
 # CONFIG_PROBE_INITRD_HEADER is not set
 # CONFIG_R6040 is not set
 # CONFIG_PREVENT_FIRMWARE_BUILD is not set
 # CONFIG_PROBE_INITRD_HEADER is not set
 # CONFIG_R6040 is not set


@@ -272,7 +268,6 @@ CONFIG_TCP_CONG_SCALABLE=m
 CONFIG_TCP_CONG_VENO=m
 CONFIG_TCP_CONG_WESTWOOD=m
 CONFIG_TCP_CONG_YEAH=m
 CONFIG_TCP_CONG_VENO=m
 CONFIG_TCP_CONG_WESTWOOD=m
 CONFIG_TCP_CONG_YEAH=m

-CONFIG_TICK_ONESHOT=y

 CONFIG_TRAD_SIGNALS=y
 CONFIG_USB_SUPPORT=y
 # CONFIG_VGASTATE is not set
 CONFIG_TRAD_SIGNALS=y
 CONFIG_USB_SUPPORT=y
 # CONFIG_VGASTATE is not set