Merge commit 'nbd/master' into xburst

Config.in

@@ -206,13 +206,6 @@ config DEBUG
 	help
 		Adds -g3 to the CFLAGS
 
-config DEBUG_DIR
-	bool "Install debugging binaries into a staging directory"
-	default n
-	help
-		This will install all compiled package binaries into build_dir/target-*/debug-*/,
-		useful for cross-debugging via gdb/gdbserver
-
 config IPV6
         bool
         prompt "Enable IPv6 support in packages"

include/autotools.mk

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2007-2009 OpenWrt.org
+# Copyright (C) 2007-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -13,10 +13,24 @@ define replace
 	
 endef
 
+PKG_LIBTOOL_PATHS?=$(CONFIGURE_PATH)
+
 # replace copies of ltmain.sh with the build system's version
-update_libtool_common=$(call replace,ltmain.sh,$(STAGING_DIR)/host/share/libtool,$(CONFIGURE_PATH)/)$(call replace,libtool.m4,$(STAGING_DIR)/host/share/aclocal,$(CONFIGURE_PATH)/)
+update_libtool_common = \
-update_libtool=$(call replace,libtool,$(STAGING_DIR)/host/bin,$(CONFIGURE_PATH)/)$(call update_libtool_common)
+	$(foreach p,$(LIBTOOL_PATHS), \
-update_libtool_ucxx=$(call replace,libtool,$(STAGING_DIR)/host/bin,$(CONFIGURE_PATH)/,libtool-ucxx)$(call update_libtool_common)
+		$(call replace,ltmain.sh,$(STAGING_DIR)/host/share/libtool,$(p)/) \
+		$(call replace,libtool.m4,$(STAGING_DIR)/host/share/aclocal,$(p)/) \
+	)
+update_libtool = \
+	$(foreach p,$(PKG_LIBTOOL_PATHS), \
+		$(call replace,libtool,$(STAGING_DIR)/host/bin,$(p)/) \
+	) \
+	$(call update_libtool_common)
+update_libtool_ucxx = \
+	$(foreach p,$(PKG_LIBTOOL_PATHS), \
+		$(call replace,libtool,$(STAGING_DIR)/host/bin,$(p)/,libtool-ucxx) \
+	) \
+	$(call update_libtool_common)
 
 
 # prevent libtool from linking against host development libraries
@@ -24,15 +38,12 @@ define libtool_fixup_libdir
 	find $(1) -name '*.la' | $(XARGS) \
 		$(SED) "s,\(^libdir='\| \|-L\|^dependency_libs='\)/usr/lib,\1$(STAGING_DIR)/usr/lib,g" \
 		    -e "s,$(STAGING_DIR)/usr/lib/\(libstdc++\|libsupc++\).la,$(TOOLCHAIN_DIR)/usr/lib/\1.la,g"
-	find $(2) -name '*.la' | $(XARGS) \
-		$(SED) "s,\(^libdir='\| \|-L\|^dependency_libs='\)/usr/lib,\1$(STAGING_DIR)/usr/lib,g" \
-		    -e "s,$(STAGING_DIR)/usr/lib/\(libstdc++\|libsupc++\).la,$(TOOLCHAIN_DIR)/usr/lib/\1.la,g"
 endef
 
 define remove_version_check
 	if [ -f "$(PKG_BUILD_DIR)/$(CONFIGURE_PATH)/configure" ]; then \
 		$(SED) \
-			's,pardus_ltmain_version=.*,pardus_ltmain_version="$$$$pardus_lt_version",' \
+			's,\(gentoo\|pardus\)_ltmain_version=.*,\1_ltmain_version="$$$$\1_lt_version",' \
 			$(PKG_BUILD_DIR)/$(CONFIGURE_PATH)/configure; \
 	fi
 endef

include/download.mk

@@ -1,5 +1,5 @@
-# 
+#
-# Copyright (C) 2007 OpenWrt.org
+# Copyright (C) 2006-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,7 +8,7 @@
 DOWNLOAD_RDEP=$(STAMP_PREPARED) $(HOST_STAMP_PREPARED)
 
 # Try to guess the download method from the URL
-define dl_method 
+define dl_method
 $(strip \
   $(if $(2),$(2), \
     $(if $(filter @GNOME/% @GNU/% @KERNEL/% @SF/% ftp://% http://% file://%,$(1)),default, \
@@ -16,9 +16,9 @@ $(strip \
         $(if $(filter svn://%,$(1)),svn, \
           $(if $(filter cvs://%,$(1)),cvs, \
             $(if $(filter hg://%,$(1)),hg, \
-	       unknown \
+              unknown \
-	    ) \
+            ) \
-	  ) \
+          ) \
         ) \
       ) \
     ) \
@@ -26,7 +26,7 @@ $(strip \
 )
 endef
 
-# code for creating tarballs from cvs/svn/git/hg checkouts - useful for mirror support
+# code for creating tarballs from cvs/svn/git/bzr/hg checkouts - useful for mirror support
 dl_pack/bz2=$(TAR) cfj $(1) $(2)
 dl_pack/gz=$(TAR) cfz $(1) $(2)
 dl_pack/unknown=echo "ERROR: Unknown pack format for file $(1)"; false
@@ -49,19 +49,18 @@ endef
 define DownloadMethod/cvs
 	$(call wrap_mirror, \
 		echo "Checking out files from the cvs repository..."; \
-                mkdir -p $(TMP_DIR)/dl && \
+		mkdir -p $(TMP_DIR)/dl && \
-                cd $(TMP_DIR)/dl && \
+		cd $(TMP_DIR)/dl && \
-                rm -rf $(SUBDIR) && \
+		rm -rf $(SUBDIR) && \
-                [ \! -d $(SUBDIR) ] && \
+		[ \! -d $(SUBDIR) ] && \
-                cvs -d $(URL) co $(VERSION) $(SUBDIR) && \
+		cvs -d $(URL) co $(VERSION) $(SUBDIR) && \
-                find $(SUBDIR) -name CVS | xargs rm -rf && \
+		find $(SUBDIR) -name CVS | xargs rm -rf && \
-                echo "Packing checkout..." && \
+		echo "Packing checkout..." && \
-                $(call dl_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \
+		$(call dl_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \
-                mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/; \
+		mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/; \
-        )
+	)
 endef
 
-
 define DownloadMethod/svn
 	$(call wrap_mirror, \
 		echo "Checking out files from the svn repository..."; \
@@ -93,6 +92,21 @@ define DownloadMethod/git
 	)
 endef
 
+define DownloadMethod/bzr
+	$(call wrap_mirror, \
+		echo "Checking out files from the bzr repository..."; \
+		mkdir -p $(TMP_DIR)/dl && \
+		cd $(TMP_DIR)/dl && \
+		rm -rf $(SUBDIR) && \
+		[ \! -d $(SUBDIR) ] && \
+		bzr co --lightweight -r$(VERSION) $(URL) $(SUBDIR) && \
+		find $(SUBDIR) -name .bzr | xargs rm -rf && \
+		echo "Packing checkout..." && \
+		$(call dl_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \
+		mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/; \
+	)
+endef
+
 define DownloadMethod/hg
 	$(call wrap_mirror, \
 		echo "Checking out files from the hg repository..."; \
@@ -111,6 +125,7 @@ endef
 Validate/cvs=VERSION SUBDIR
 Validate/svn=VERSION SUBDIR
 Validate/git=VERSION SUBDIR
+Validate/bzr=VERSION SUBDIR
 Validate/hg=VERSION SUBDIR
 
 define Download/Defaults

include/kernel-build.mk

@@ -106,7 +106,6 @@ define BuildKernel
 	$(_SINGLE)$(MAKE) -C $(LINUX_DIR) $(KERNEL_MAKEOPTS) $$@
 	$(SCRIPT_DIR)/kconfig.pl '>' $(if $(LINUX_SUBCONFIG),'+' $(GENERIC_LINUX_CONFIG) $(LINUX_CONFIG),$(GENERIC_LINUX_CONFIG)) \
 		$(LINUX_DIR)/.config > $(if $(LINUX_SUBCONFIG),$(LINUX_SUBCONFIG),$(LINUX_CONFIG))
-	LC_ALL='' sort $(if $(LINUX_SUBCONFIG),$(LINUX_SUBCONFIG),$(LINUX_CONFIG)) -o $(if $(LINUX_SUBCONFIG),$(LINUX_SUBCONFIG),$(LINUX_CONFIG))
 	$(Kernel/Configure)
 
   install: $(LINUX_DIR)/.image

include/kernel-version.mk

@@ -1,12 +1,12 @@
 # Use the default kernel version if the Makefile doesn't override it
 
 ifeq ($(KERNEL),2.4)
-  LINUX_VERSION?=2.4.37.5
+  LINUX_VERSION?=2.4.37.9
 endif
 LINUX_RELEASE?=1
 
-ifeq ($(LINUX_VERSION),2.4.37.5)
+ifeq ($(LINUX_VERSION),2.4.37.9)
-  LINUX_KERNEL_MD5SUM:=cb221187422acaf6c63a40c646e5e476
+  LINUX_KERNEL_MD5SUM:=b85b8962840c13f17f944e7b1890f8f8
 endif
 ifeq ($(LINUX_VERSION),2.6.25.20)
   LINUX_KERNEL_MD5SUM:=0da698edccf03e2235abc2830a495114

include/netfilter.mk

@@ -91,6 +91,7 @@ $(eval $(if $(NF_KMOD),$(call nf_add,IPT_CONNTRACK,CONFIG_NF_CONNTRACK_IPV4, $(P
 $(eval $(call nf_add,IPT_CONNTRACK,CONFIG_IP_NF_MATCH_STATE, $(P_V4)ipt_state))
 $(eval $(call nf_add,IPT_CONNTRACK,CONFIG_NETFILTER_XT_MATCH_STATE, $(P_XT)xt_state))
 $(eval $(call nf_add,IPT_CONNTRACK,CONFIG_IP_NF_RAW, $(P_V4)iptable_raw))
+$(eval $(call nf_add,IPT_CONNTRACK,CONFIG_IP_NF_TARGET_NOTRACK, $(P_V4)ipt_NOTRACK))
 $(eval $(call nf_add,IPT_CONNTRACK,CONFIG_NETFILTER_XT_TARGET_NOTRACK, $(P_XT)xt_NOTRACK))
 
 

include/package-debug.mk

@@ -1,26 +0,0 @@
-# 
-# Copyright (C) 2006,2007 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-ifeq ($(DUMP),)
-  define BuildTarget/debug
-
-    DEBUG_STAMP_$(1) := $(DEBUG_DIR)/stamp/$(1)
-
-    ifdef Package/$(1)/install
-      ifneq ($(CONFIG_PACKAGE_$(1))$(SDK)$(DEVELOPER),)
-        compile: $$(DEBUG_STAMP_$(1))
-      endif
-    endif
-
-    $$(DEBUG_STAMP_$(1)): $(PKG_BUILD_DIR)/.built
-		mkdir -p $(DEBUG_DIR)/stamp
-		$(call Package/$(1)/install,$(DEBUG_DIR))
-		touch $$(DEBUG_STAMP_$(1))
-
-
-  endef
-endif

include/package.mk

@@ -26,7 +26,6 @@ include $(INCLUDE_DIR)/quilt.mk
 include $(INCLUDE_DIR)/package-defaults.mk
 include $(INCLUDE_DIR)/package-dumpinfo.mk
 include $(INCLUDE_DIR)/package-ipkg.mk
-include $(INCLUDE_DIR)/package-debug.mk
 include $(INCLUDE_DIR)/package-bin.mk
 include $(INCLUDE_DIR)/autotools.mk
 
@@ -179,7 +178,7 @@ endif
     $(Dumpinfo/Package), \
     $(foreach target, \
       $(if $(Package/$(1)/targets),$(Package/$(1)/targets), \
-        $(if $(PKG_TARGETS),$(PKG_TARGETS), ipkg $(if $(CONFIG_DEBUG_DIR),debug)) \
+        $(if $(PKG_TARGETS),$(PKG_TARGETS), ipkg) \
       ), $(BuildTarget/$(target)) \
     ) \
   )

package/busybox/Makefile

@@ -70,6 +70,7 @@ define Build/Compile
 		KBUILD_HAVE_NLS=no \
 		EXTRA_CFLAGS="$(TARGET_CFLAGS)" \
 		ARCH="$(ARCH)" \
+		SKIP_STRIP=y \
 		all
 	rm -rf $(PKG_INSTALL_DIR)
 	$(FIND) $(PKG_BUILD_DIR) -lname "*busybox" -exec rm \{\} \;
@@ -78,7 +79,6 @@ define Build/Compile
 		CROSS_COMPILE="$(TARGET_CROSS)" \
 		EXTRA_CFLAGS="$(TARGET_CFLAGS)" \
 		ARCH="$(ARCH)" \
-		IPKG_ARCH="$(ARCH)" \
 		CONFIG_PREFIX="$(PKG_INSTALL_DIR)" \
 		install
 endef

package/busybox/patches/250-ash_export-n.patch

@@ -1,6 +1,6 @@
 --- a/shell/ash.c
 +++ b/shell/ash.c
-@@ -12360,8 +12360,17 @@ exportcmd(int argc UNUSED_PARAM, char **
+@@ -12351,8 +12351,17 @@ exportcmd(int argc UNUSED_PARAM, char **
  	const char *p;
  	char **aptr;
  	int flag = argv[0][0] == 'r' ? VREADONLY : VEXPORT;
@@ -19,7 +19,7 @@
  		aptr = argptr;
  		name = *aptr;
  		if (name) {
-@@ -12373,10 +12382,12 @@ exportcmd(int argc UNUSED_PARAM, char **
+@@ -12364,10 +12373,12 @@ exportcmd(int argc UNUSED_PARAM, char **
  					vp = *findvar(hashvar(name), name);
  					if (vp) {
  						vp->flags |= flag;

package/busybox/patches/510-awk_include.patch

@@ -34,7 +34,7 @@
  			chain_group();
  			clear_array(ahash);
  
-@@ -2408,7 +2414,8 @@ static var *evaluate(node *op, var *res)
+@@ -2410,7 +2416,8 @@ static var *evaluate(node *op, var *res)
  			break;
  
  		case XC( OC_FUNC ):
@@ -44,7 +44,7 @@
  				syntax_error(EMSG_UNDEF_FUNC);
  
  			X.v = R.v = nvalloc(op->r.f->nargs+1);
-@@ -2425,7 +2432,10 @@ static var *evaluate(node *op, var *res)
+@@ -2427,7 +2434,10 @@ static var *evaluate(node *op, var *res)
  			fnargs = X.v;
  
  			L.s = g_progname;
@@ -56,7 +56,7 @@
  			g_progname = L.s;
  
  			nvfree(fnargs);
-@@ -2788,6 +2798,143 @@ static rstream *next_input_file(void)
+@@ -2790,6 +2800,143 @@ static rstream *next_input_file(void)
  #undef files_happen
  }
  
@@ -200,7 +200,7 @@
  int awk_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
  int awk_main(int argc, char **argv)
  {
-@@ -2853,6 +3000,9 @@ int awk_main(int argc, char **argv)
+@@ -2855,6 +3002,9 @@ int awk_main(int argc, char **argv)
  			*s1 = '=';
  		}
  	}

package/busybox/patches/910-insmod-q-flag.patch

@@ -0,0 +1,33 @@
+--- a/modutils/insmod.c
++++ b/modutils/insmod.c
+@@ -107,7 +107,7 @@ int insmod_main(int argc, char **argv) M
+ int insmod_main(int argc UNUSED_PARAM, char **argv)
+ {
+ 	char *filename;
+-	int rc;
++	int rc, opt;
+ 
+ 	/* Compat note:
+ 	 * 2.6 style insmod has no options and required filename
+@@ -117,10 +117,8 @@ int insmod_main(int argc UNUSED_PARAM, c
+ 	 * or in $MODPATH.
+ 	 */
+ 
+-	IF_FEATURE_2_4_MODULES(
+-		getopt32(argv, INSMOD_OPTS INSMOD_ARGS);
+-		argv += optind - 1;
+-	);
++	opt = getopt32(argv, INSMOD_OPTS, NULL, NULL);
++	argv += optind - 1;
+ 
+ 	filename = *++argv;
+ 	if (!filename)
+@@ -131,7 +129,7 @@ int insmod_main(int argc UNUSED_PARAM, c
+ 			goto done;
+ 
+ 	rc = bb_init_module(g_filename, parse_cmdline_module_options(argv));
+-	if (rc)
++	if (rc && !(opt & INSMOD_OPT_SILENT))
+ 		bb_error_msg("can't insert '%s': %s", filename, moderror(rc));
+ 	free (g_filename);
+ 

package/carl9170/Makefile

@@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=carl9170
-PKG_VERSION:=0.9.9.1
+PKG_VERSION:=1.0.1.1
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@KERNEL/linux/kernel/people/chr/carl9170/$(PKG_VERSION) \
 	@KERNEL/linux/kernel/people/chr/carl9170/old/$(PKG_VERSION)
-PKG_MD5SUM:=122610b254125d93c7f64cc559d3341a
+PKG_MD5SUM:=8abbb4ae09a45a82af6f63cb65c7e2d8
 
 include $(INCLUDE_DIR)/package.mk
 

package/carl9170/patches/120-compile_fix.patch

@@ -0,0 +1,13 @@
+--- a/drivers/net/wireless/ath/carl9170/fw.c
++++ b/drivers/net/wireless/ath/carl9170/fw.c
+@@ -185,8 +185,10 @@ static int ar9170_fw_check(struct ar9170
+ 	if (SUPP(CARL9170FW_WLANTX_CAB))
+ 		ar->hw->wiphy->interface_modes |= BIT(NL80211_IFTYPE_AP);
+ 
++#ifdef CONFIG_CARL9170_WPS_BUTTON
+ 	if (!SUPP(CARL9170FW_GPIO_INTERRUPT))
+ 		ar->has_wps_button = false;
++#endif
+ 
+ #undef SUPPORTED
+ 	return 0;

package/firewall/files/uci_firewall.sh

@@ -355,18 +355,18 @@ fw_redirect() {
 
 	src_port_first=${src_port%-*}
 	src_port_last=${src_port#*-}
-	[ "$src_port_first" -ne "$src_port_last" ] && { \
+	[ "$src_port_first" != "$src_port_last" ] && { \
 		src_port="$src_port_first:$src_port_last"; }
 
 	src_dport_first=${src_dport%-*}
 	src_dport_last=${src_dport#*-}
-	[ "$src_dport_first" -ne "$src_dport_last" ] && { \
+	[ "$src_dport_first" != "$src_dport_last" ] && { \
 		src_dport="$src_dport_first:$src_dport_last"; }
 
 	dest_port2=${dest_port:-$src_dport}
 	dest_port_first=${dest_port2%-*}
 	dest_port_last=${dest_port2#*-}
-	[ "$dest_port_first" -ne "$dest_port_last" ] && { \
+	[ "$dest_port_first" != "$dest_port_last" ] && { \
 		dest_port2="$dest_port_first:$dest_port_last"; }
 
 	add_rule() {

package/hostapd/Makefile

@@ -65,9 +65,9 @@ endif
 ifneq ($(LOCAL_TYPE),hostapd)
   ifdef CONFIG_WPA_SUPPLICANT_NO_TIMESTAMP_CHECK
     TARGET_CFLAGS += -DNO_TIMESTAMP_CHECK
-    DRIVER_MAKEOPTS += \
-		CONFIG_DRIVER_ROBOSWITCH=$(CONFIG_PACKAGE_kmod-switch)
   endif
+  DRIVER_MAKEOPTS += \
+	CONFIG_DRIVER_ROBOSWITCH=$(CONFIG_PACKAGE_kmod-switch)
 endif
 
 define Package/hostapd/Default
@@ -75,7 +75,7 @@ define Package/hostapd/Default
   CATEGORY:=Network
   TITLE:=IEEE 802.1x Authenticator
   URL:=http://hostap.epitest.fi/
-  DEPENDS:=@!TARGET_avr32 @!TARGET_etrax +PACKAGE_kmod-mac80211:libnl-tiny
+  DEPENDS:=@!TARGET_avr32 @!TARGET_etrax +PACKAGE_kmod-mac80211:libnl-tiny +PACKAGE_kmod-mac80211:crda
   MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
 endef
 
@@ -116,7 +116,7 @@ define Package/wpad/Default
   CATEGORY:=Network
   TITLE:=IEEE 802.1x Authenticator/Supplicant
   URL:=http://hostap.epitest.fi/
-  DEPENDS:=@!TARGET_avr32 @!TARGET_etrax +PACKAGE_kmod-mac80211:libnl-tiny
+  DEPENDS:=@!TARGET_avr32 @!TARGET_etrax +PACKAGE_kmod-mac80211:libnl-tiny +PACKAGE_kmod-mac80211:crda
   MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
 endef
 
@@ -146,7 +146,7 @@ define Package/wpa-supplicant
   CATEGORY:=Network
   TITLE:=WPA Supplicant
   URL:=http://hostap.epitest.fi/wpa_supplicant/
-  DEPENDS:=@!TARGET_avr32 @!TARGET_etrax +PACKAGE_kmod-mac80211:libnl-tiny
+  DEPENDS:=@!TARGET_avr32 @!TARGET_etrax +PACKAGE_kmod-mac80211:libnl-tiny +PACKAGE_kmod-mac80211:crda
   VARIANT:=supplicant-full
   MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
 endef
@@ -224,7 +224,8 @@ endef
 define Build/Compile/wpad
 	echo ` \
 		$(call Build/RunMake,hostapd,-s MULTICALL=1 dump_cflags); \
-		$(call Build/RunMake,wpa_supplicant,-s dump_cflags) | sed -e 's,$(TARGET_CFLAGS),,' \
+		$(call Build/RunMake,wpa_supplicant,-s dump_cflags) | \
+		sed -e 's,-n ,,g' -e 's,$(TARGET_CFLAGS),,' \
 	` > $(PKG_BUILD_DIR)/.cflags
 	$(call Build/RunMake,hostapd, \
 		CFLAGS="$$$$(cat $(PKG_BUILD_DIR)/.cflags)" \

package/hostapd/files/hostapd.sh

@@ -68,6 +68,28 @@ hostapd_set_bss_options() {
 			append "$var" "wpa_group_rekey=300" "$N"
 			append "$var" "wpa_gmk_rekey=640" "$N"
 		;;
+		*wep*)
+			config_get key "$vif" key
+			key="${key:-1}"
+			case "$key" in
+				[1234])
+					for idx in 1 2 3 4; do
+						local zidx
+						zidx=$(($idx - 1))
+						config_get ckey "$vif" "key${idx}"
+						[ -n "$ckey" ] && \
+							append "$var" "wep_key${zidx}=$(prepare_key_wep "$ckey")" "$N"
+					done
+					append "$var" "wep_default_key=$((key - 1))"  "$N"
+				;;
+				*)
+					append "$var" "wep_key0=$(prepare_key_wep "$key")" "$N"
+					append "$var" "wep_default_key=0" "$N"
+				;;
+			esac
+			wpa=0
+			crypto=
+		;;
 		*)
 			wpa=0
 			crypto=

package/hostapd/files/wpa_supplicant.sh

@@ -6,7 +6,10 @@ wpa_supplicant_setup_vif() {
 	# wpa_supplicant should use wext for mac80211 cards
 	[ "$driver" = "mac80211" ] && driver='wext'
 
-	# make sure we have the psk
+	# make sure we have the encryption type and the psk
+	[ -n "$enc" ] || {
+		config_get enc "$vif" encryption
+	}
 	[ -n "$key" ] || {
 		config_get key "$vif" key
 	}

package/iproute2/Makefile

@@ -33,6 +33,7 @@ endef
 define Package/tc
 $(call Package/iproute2/Default)
   TITLE:=Traffic control utility
+  DEPENDS:=+kmod-sched
 endef
 
 define Package/genl

package/iptables/Makefile

@@ -68,6 +68,8 @@ define Package/iptables-mod-conntrack/description
  Basic iptables extensions for connection tracking.
  Includes:
  - state
+ - raw
+ - NOTRACK 
 endef
 
 define Package/iptables-mod-conntrack-extra
@@ -210,8 +212,6 @@ define Package/iptables-mod-extra/description
  - libipt_physdev
  - libipt_pkttype
  - libipt_recent
- - iptable_raw
- - libipt_NOTRACK
 endef
 
 define Package/iptables-utils
@@ -254,6 +254,10 @@ TARGET_CPPFLAGS := \
 	-I$(LINUX_DIR)/arch/$(LINUX_KARCH)/include \
 	$(TARGET_CPPFLAGS)
 
+TARGET_CFLAGS := \
+	$(TARGET_CFLAGS) \
+	-DFORCE_MODPROBE_PROGRAM="\\\"/sbin/insmod\\\""
+
 CONFIGURE_ARGS += \
 	--enable-shared \
 	--enable-devel \

package/iptables/patches/010-multiport-linux-2.4-compat.patch

@@ -0,0 +1,265 @@
+--- a/extensions/libxt_multiport.c
++++ b/extensions/libxt_multiport.c
+@@ -14,21 +14,6 @@
+ #include <linux/netfilter/xt_multiport.h>
+ 
+ /* Function which prints out usage message. */
+-static void multiport_help(void)
+-{
+-	printf(
+-"multiport match options:\n"
+-" --source-ports port[,port,port...]\n"
+-" --sports ...\n"
+-"				match source port(s)\n"
+-" --destination-ports port[,port,port...]\n"
+-" --dports ...\n"
+-"				match destination port(s)\n"
+-" --ports port[,port,port]\n"
+-"				match both source and destination port(s)\n"
+-" NOTE: this kernel does not support port ranges in multiport.\n");
+-}
+-
+ static void multiport_help_v1(void)
+ {
+ 	printf(
+@@ -71,26 +56,6 @@
+ 	}
+ }
+ 
+-static unsigned int
+-parse_multi_ports(const char *portstring, u_int16_t *ports, const char *proto)
+-{
+-	char *buffer, *cp, *next;
+-	unsigned int i;
+-
+-	buffer = strdup(portstring);
+-	if (!buffer) xtables_error(OTHER_PROBLEM, "strdup failed");
+-
+-	for (cp=buffer, i=0; cp && i<XT_MULTI_PORTS; cp=next,i++)
+-	{
+-		next=strchr(cp, ',');
+-		if (next) *next++='\0';
+-		ports[i] = xtables_parse_port(cp, proto);
+-	}
+-	if (cp) xtables_error(PARAMETER_PROBLEM, "too many ports specified");
+-	free(buffer);
+-	return i;
+-}
+-
+ static void
+ parse_multi_ports_v1(const char *portstring, 
+ 		     struct xt_multiport_v1 *multiinfo,
+@@ -154,73 +119,6 @@
+ /* Function which parses command options; returns true if it
+    ate an option */
+ static int
+-__multiport_parse(int c, char **argv, int invert, unsigned int *flags,
+-                  struct xt_entry_match **match, u_int16_t pnum,
+-                  u_int8_t invflags)
+-{
+-	const char *proto;
+-	struct xt_multiport *multiinfo
+-		= (struct xt_multiport *)(*match)->data;
+-
+-	switch (c) {
+-	case '1':
+-		xtables_check_inverse(optarg, &invert, &optind, 0, argv);
+-		proto = check_proto(pnum, invflags);
+-		multiinfo->count = parse_multi_ports(optarg,
+-						     multiinfo->ports, proto);
+-		multiinfo->flags = XT_MULTIPORT_SOURCE;
+-		break;
+-
+-	case '2':
+-		xtables_check_inverse(optarg, &invert, &optind, 0, argv);
+-		proto = check_proto(pnum, invflags);
+-		multiinfo->count = parse_multi_ports(optarg,
+-						     multiinfo->ports, proto);
+-		multiinfo->flags = XT_MULTIPORT_DESTINATION;
+-		break;
+-
+-	case '3':
+-		xtables_check_inverse(optarg, &invert, &optind, 0, argv);
+-		proto = check_proto(pnum, invflags);
+-		multiinfo->count = parse_multi_ports(optarg,
+-						     multiinfo->ports, proto);
+-		multiinfo->flags = XT_MULTIPORT_EITHER;
+-		break;
+-
+-	default:
+-		return 0;
+-	}
+-
+-	if (invert)
+-		xtables_error(PARAMETER_PROBLEM,
+-			   "multiport does not support invert");
+-
+-	if (*flags)
+-		xtables_error(PARAMETER_PROBLEM,
+-			   "multiport can only have one option");
+-	*flags = 1;
+-	return 1;
+-}
+-
+-static int
+-multiport_parse(int c, char **argv, int invert, unsigned int *flags,
+-                const void *e, struct xt_entry_match **match)
+-{
+-	const struct ipt_entry *entry = e;
+-	return __multiport_parse(c, argv, invert, flags, match,
+-	       entry->ip.proto, entry->ip.invflags);
+-}
+-
+-static int
+-multiport_parse6(int c, char **argv, int invert, unsigned int *flags,
+-                 const void *e, struct xt_entry_match **match)
+-{
+-	const struct ip6t_entry *entry = e;
+-	return __multiport_parse(c, argv, invert, flags, match,
+-	       entry->ipv6.proto, entry->ipv6.invflags);
+-}
+-
+-static int
+ __multiport_parse_v1(int c, char **argv, int invert, unsigned int *flags,
+                      struct xt_entry_match **match, u_int16_t pnum,
+                      u_int8_t invflags)
+@@ -313,55 +211,6 @@
+ }
+ 
+ /* Prints out the matchinfo. */
+-static void
+-__multiport_print(const struct xt_entry_match *match, int numeric,
+-                  u_int16_t proto)
+-{
+-	const struct xt_multiport *multiinfo
+-		= (const struct xt_multiport *)match->data;
+-	unsigned int i;
+-
+-	printf("multiport ");
+-
+-	switch (multiinfo->flags) {
+-	case XT_MULTIPORT_SOURCE:
+-		printf("sports ");
+-		break;
+-
+-	case XT_MULTIPORT_DESTINATION:
+-		printf("dports ");
+-		break;
+-
+-	case XT_MULTIPORT_EITHER:
+-		printf("ports ");
+-		break;
+-
+-	default:
+-		printf("ERROR ");
+-		break;
+-	}
+-
+-	for (i=0; i < multiinfo->count; i++) {
+-		printf("%s", i ? "," : "");
+-		print_port(multiinfo->ports[i], proto, numeric);
+-	}
+-	printf(" ");
+-}
+-
+-static void multiport_print(const void *ip_void,
+-                            const struct xt_entry_match *match, int numeric)
+-{
+-	const struct ipt_ip *ip = ip_void;
+-	__multiport_print(match, numeric, ip->proto);
+-}
+-
+-static void multiport_print6(const void *ip_void,
+-                             const struct xt_entry_match *match, int numeric)
+-{
+-	const struct ip6t_ip6 *ip = ip_void;
+-	__multiport_print(match, numeric, ip->proto);
+-}
+-
+ static void __multiport_print_v1(const struct xt_entry_match *match,
+                                  int numeric, u_int16_t proto)
+ {
+@@ -418,48 +267,6 @@
+ }
+ 
+ /* Saves the union ipt_matchinfo in parsable form to stdout. */
+-static void __multiport_save(const struct xt_entry_match *match,
+-                             u_int16_t proto)
+-{
+-	const struct xt_multiport *multiinfo
+-		= (const struct xt_multiport *)match->data;
+-	unsigned int i;
+-
+-	switch (multiinfo->flags) {
+-	case XT_MULTIPORT_SOURCE:
+-		printf("--sports ");
+-		break;
+-
+-	case XT_MULTIPORT_DESTINATION:
+-		printf("--dports ");
+-		break;
+-
+-	case XT_MULTIPORT_EITHER:
+-		printf("--ports ");
+-		break;
+-	}
+-
+-	for (i=0; i < multiinfo->count; i++) {
+-		printf("%s", i ? "," : "");
+-		print_port(multiinfo->ports[i], proto, 1);
+-	}
+-	printf(" ");
+-}
+-
+-static void multiport_save(const void *ip_void,
+-                           const struct xt_entry_match *match)
+-{
+-	const struct ipt_ip *ip = ip_void;
+-	__multiport_save(match, ip->proto);
+-}
+-
+-static void multiport_save6(const void *ip_void,
+-                            const struct xt_entry_match *match)
+-{
+-	const struct ip6t_ip6 *ip = ip_void;
+-	__multiport_save(match, ip->proto);
+-}
+-
+ static void __multiport_save_v1(const struct xt_entry_match *match,
+                                 u_int16_t proto)
+ {
+@@ -513,34 +320,6 @@
+ 	{
+ 		.family        = NFPROTO_IPV4,
+ 		.name          = "multiport",
+-		.revision      = 0,
+-		.version       = XTABLES_VERSION,
+-		.size          = XT_ALIGN(sizeof(struct xt_multiport)),
+-		.userspacesize = XT_ALIGN(sizeof(struct xt_multiport)),
+-		.help          = multiport_help,
+-		.parse         = multiport_parse,
+-		.final_check   = multiport_check,
+-		.print         = multiport_print,
+-		.save          = multiport_save,
+-		.extra_opts    = multiport_opts,
+-	},
+-	{
+-		.family        = NFPROTO_IPV6,
+-		.name          = "multiport",
+-		.revision      = 0,
+-		.version       = XTABLES_VERSION,
+-		.size          = XT_ALIGN(sizeof(struct xt_multiport)),
+-		.userspacesize = XT_ALIGN(sizeof(struct xt_multiport)),
+-		.help          = multiport_help,
+-		.parse         = multiport_parse6,
+-		.final_check   = multiport_check,
+-		.print         = multiport_print6,
+-		.save          = multiport_save6,
+-		.extra_opts    = multiport_opts,
+-	},
+-	{
+-		.family        = NFPROTO_IPV4,
+-		.name          = "multiport",
+ 		.version       = XTABLES_VERSION,
+ 		.revision      = 1,
+ 		.size          = XT_ALIGN(sizeof(struct xt_multiport_v1)),

package/iptables/patches/020-iptables-force-modprobe-util.patch

@@ -0,0 +1,20 @@
+--- a/xtables.c
++++ b/xtables.c
+@@ -285,6 +285,7 @@ void *xtables_realloc(void *ptr, size_t 
+ 
+ static char *get_modprobe(void)
+ {
++#ifndef FORCE_MODPROBE_PROGRAM
+ 	int procfile;
+ 	char *ret;
+ 
+@@ -309,6 +310,9 @@ static char *get_modprobe(void)
+ 	free(ret);
+ 	close(procfile);
+ 	return NULL;
++#else
++	return strdup(FORCE_MODPROBE_PROGRAM);
++#endif
+ }
+ 
+ int xtables_insmod(const char *modname, const char *modprobe, bool quiet)

package/kernel/modules/block.mk

@@ -39,6 +39,20 @@ endef
 
 $(eval $(call KernelPackage,ata-ahci))
 
+define KernelPackage/ata-sil
+$(call KernelPackage/ata/Depends,)
+  TITLE:=Silicon Image SATA support
+  KCONFIG:=CONFIG_SATA_SIL
+  FILES:=$(LINUX_DIR)/drivers/ata/sata_sil.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,41,sata_sil)
+endef
+
+define KernelPackage/ata-sil/description
+ Support for Silicon Image Serial ATA controllers.
+endef
+
+$(eval $(call KernelPackage,ata-sil))
+
 
 define KernelPackage/ata-sil24
 $(call KernelPackage/ata/Depends,)
@@ -307,7 +321,7 @@ define KernelPackage/scsi-core
 	CONFIG_SCSI \
 	CONFIG_BLK_DEV_SD
   FILES:= \
-	$(LINUX_DIR)/drivers/scsi/scsi_mod.$(LINUX_KMOD_SUFFIX) \
+	$(if $(findstring y,$(CONFIG_SCSI)),,$(LINUX_DIR)/drivers/scsi/scsi_mod.$(LINUX_KMOD_SUFFIX)) \
 	$(LINUX_DIR)/drivers/scsi/sd_mod.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,20,scsi_mod) $(call AutoLoad,40,sd_mod)
 endef
@@ -375,6 +389,7 @@ define KernelPackage/dm
        CONFIG_DM_MULTIPATH=n \
        CONFIG_DM_ZERO=n \
        CONFIG_DM_SNAPSHOT=n \
+       CONFIG_DM_LOG_USERSPACE=n \
        CONFIG_MD=y \
        CONFIG_BLK_DEV_DM \
        CONFIG_DM_MIRROR

package/kernel/modules/fs.mk

@@ -61,7 +61,7 @@ $(eval $(call KernelPackage,fs-ntfs))
 
 define KernelPackage/fs-mbcache
   SUBMENU:=$(FS_MENU)
-  TITLE:=mbcache (used by ext2/ext3)
+  TITLE:=mbcache (used by ext2/ext3/ext4)
   KCONFIG:=CONFIG_FS_MBCACHE
   ifneq ($(CONFIG_FS_MBCACHE),)
     FILES:=$(LINUX_DIR)/fs/mbcache.$(LINUX_KMOD_SUFFIX)
@@ -115,7 +115,6 @@ define KernelPackage/fs-ext4
   SUBMENU:=$(FS_MENU)
   TITLE:=EXT4 filesystem support
   KCONFIG:= \
-	CONFIG_EXT4DEV_COMPAT=y \
 	CONFIG_EXT4_FS_XATTR=y \
 	CONFIG_EXT4_FS_POSIX_ACL=y \
 	CONFIG_EXT4_FS_SECURITY=y \
@@ -125,7 +124,7 @@ define KernelPackage/fs-ext4
   FILES:= \
 	$(LINUX_DIR)/fs/ext4/ext4.$(LINUX_KMOD_SUFFIX) \
 	$(LINUX_DIR)/fs/jbd2/jbd2.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,30,jbd2 $(EXT4_NAME))
+  AUTOLOAD:=$(call AutoLoad,30,jbd2 ext4)
 endef
 
 define KernelPackage/fs-ext4/description
@@ -214,13 +213,26 @@ define KernelPackage/fs-nfs-common
   AUTOLOAD:=$(call AutoLoad,30,sunrpc lockd)
 endef
 
-define KernelPackage/fs-nfs-common/2.6
+$(eval $(call KernelPackage,fs-nfs-common))
-  KCONFIG+=CONFIG_SUNRPC_GSS
+
+
+define KernelPackage/fs-nfs-common-v4
+  SUBMENU:=$(FS_MENU)
+  TITLE:=Common NFS V4 filesystem modules
+  KCONFIG+=\
+	CONFIG_SUNRPC_GSS\
+	CONFIG_NFS_V4=y\
+	CONFIG_NFSD_V4=y
+  DEPENDS:= @LINUX_2_6 +kmod-fs-nfs-common
   FILES+=$(LINUX_DIR)/net/sunrpc/auth_gss/auth_rpcgss.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD=$(call AutoLoad,30,sunrpc lockd auth_rpcgss)
+  AUTOLOAD=$(call AutoLoad,30,auth_rpcgss)
 endef
 
-$(eval $(call KernelPackage,fs-nfs-common))
+define KernelPackage/fs-nfs-common-v4/description
+ Kernel modules for NFS V4 & NFSD V4 kernel support
+endef
+
+$(eval $(call KernelPackage,fs-nfs-common-v4))
 
 
 define KernelPackage/fs-nfs

package/kernel/modules/netsupport.mk

@@ -568,6 +568,7 @@ define KernelPackage/sched
 	CONFIG_NET_SCH_INGRESS \
 	CONFIG_NET_SCH_PRIO \
 	CONFIG_NET_SCH_RED \
+	CONFIG_NET_SCH_TBF \
 	CONFIG_NET_SCH_SFQ \
 	CONFIG_NET_SCH_TEQL \
 	CONFIG_NET_CLS=y \

package/kernel/modules/other.mk

@@ -7,6 +7,14 @@
 
 OTHER_MENU:=Other modules
 
+define KernelPackage/block2mtd
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=Block device MTD emulation
+  KCONFIG:=CONFIG_MTD_BLOCK2MTD
+  FILES:=$(LINUX_DIR)/drivers/mtd/devices/block2mtd.$(LINUX_KMOD_SUFFIX)
+endef
+$(eval $(call KernelPackage,block2mtd))
+
 define KernelPackage/crc-itu-t
   SUBMENU:=$(OTHER_MENU)
   TITLE:=CRC ITU-T V.41 support

package/kernel/modules/usb.mk

@@ -360,19 +360,19 @@ endef
 $(eval $(call KernelPackage,usb-serial-pl2303))
 
 
-define KernelPackage/usb-serial-cp2101
+define KernelPackage/usb-serial-cp210x
 $(call KernelPackage/usb-serial/Depends,)
-  TITLE:=Support for Silicon Labs cp2101 devices
+  TITLE:=Support for Silicon Labs cp210x devices
-  KCONFIG:=CONFIG_USB_SERIAL_CP2101
+  KCONFIG:=CONFIG_USB_SERIAL_CP210X
-  FILES:=$(LINUX_DIR)/drivers/usb/serial/cp2101.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/drivers/usb/serial/cp210x.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,65,cp2101)
+  AUTOLOAD:=$(call AutoLoad,65,cp210x)
 endef
 
-define KernelPackage/usb-serial-cp2101/description
+define KernelPackage/usb-serial-cp210x/description
- Kernel support for Silicon Labs cp2101 USB-to-Serial converters
+ Kernel support for Silicon Labs cp210x USB-to-Serial converters
 endef
 
-$(eval $(call KernelPackage,usb-serial-cp2101))
+$(eval $(call KernelPackage,usb-serial-cp210x))
 
 
 define KernelPackage/usb-serial-ark3116

package/linux-atm/Makefile

@@ -1,4 +1,4 @@
-# 
+#
 # Copyright (C) 2006 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
@@ -15,12 +15,15 @@ PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz
 PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/l/linux-atm/
 PKG_MD5SUM:=84fef49cc39ff2605204246666f65864
 
+PKG_FIXUP:=libtool
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/linux-atm
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=Linux ATM library
+  DEPENDS:=+kmod-atm
   URL:=http://linux-atm.sourceforge.net/
 endef
 

package/mac80211/Makefile

@@ -10,12 +10,12 @@ include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=mac80211
 
-PKG_VERSION:=2010-02-02
+PKG_VERSION:=2010-02-16
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 PKG_SOURCE_URL:=http://mirror2.openwrt.org/sources
 #	http://www.orbit-lab.org/kernel/compat-wireless-2.6/2010/11 \
 #	http://wireless.kernel.org/download/compat-wireless-2.6
-PKG_MD5SUM:=32602171b840132cbaa62d4b67f32d2c
+PKG_MD5SUM:=190060a705c2b78e9b0bc873a8803b37
 
 PKG_SOURCE:=compat-wireless-$(PKG_VERSION).tar.bz2
 PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/compat-wireless-$(PKG_VERSION)
@@ -182,7 +182,7 @@ endef
 
 define KernelPackage/rt2800-lib
 $(call KernelPackage/rt2x00/Default)
-  DEPENDS+= @(PCI_SUPPORT||USB_SUPPORT) +kmod-rt2x00-lib
+  DEPENDS+= @(PCI_SUPPORT||USB_SUPPORT) +kmod-rt2x00-lib +USB_SUPPORT:kmod-rt2x00-usb
   TITLE+= (rt2800 LIB)
   FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rt2x00/rt2800lib.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,27,rt2800lib)

package/mac80211/files/lib/wifi/mac80211.sh

@@ -234,7 +234,6 @@ enable_mac80211() {
 		}
 		config_set "$vif" ifname "$ifname"
 
-		config_get enc "$vif" encryption
 		config_get mode "$vif" mode
 		config_get ssid "$vif" ssid
 
@@ -288,60 +287,19 @@ enable_mac80211() {
 		[ "$mode" = "ap" ] || ifconfig "$ifname" hw ether "$vif_mac"
 		config_set "$vif" macaddr "$vif_mac"
 
-		# Valid values are:
-		# wpa / wep / none
-		#
 		# !! ap !!
 		#
 		# ALL ap functionality will be passed to hostapd
 		#
-		# !! mesh / adhoc / station !!
+		# !! station !!
-		# none -> NO encryption
 		#
-		# wep + keymgmt = '' -> we use iw to connect to the
+		# ALL station functionality will be passed to wpa_supplicant
-		# network.
 		#
-		# wep + keymgmt = 'NONE' -> wpa_supplicant will be
-		# configured to handle the wep connection
 		if [ ! "$mode" = "ap" ]; then
 			# We attempt to set the channel for all interfaces, although
 			# mac80211 may not support it or the driver might not yet
 			# for ap mode this is handled by hostapd
 			[ -n "$fixed" -a -n "$channel" ] && iw dev "$ifname" set channel "$channel"
-
-			local key keystring
-
-			case "$enc" in
-				*none*)
-					config_get keymgmt "$vif" keymgmt
-				;;
-				*wep*)
-					config_get keymgmt "$vif" keymgmt
-					if [ -z "$keymgmt" ]; then
-						config_get key "$vif" key
-						key="${key:-1}"
-						case "$key" in
-							[1234])
-								for idx in 1 2 3 4; do
-									local zidx
-									zidx=$(($idx - 1))
-									config_get ckey "$vif" "key${idx}"
-									if [ -n "$ckey" ]; then
-										[ $idx -eq $key ] && zidx="d:${zidx}"
-										append keystring "${zidx}:$(prepare_key_wep "$ckey")"
-									fi
-								done
-								;;
-							*)
-								keystring="d:0:$(prepare_key_wep "$key")"
-								;;
-						esac
-					fi
-				;;
-				*psk*|*wpa*)
-					config_get key "$vif" key
-				;;
-			esac
 		fi
 
 		# txpower is not yet implemented in iw
@@ -363,60 +321,26 @@ enable_mac80211() {
 
 		ifconfig "$ifname" up
 
-		[ "$mode" = "ap" ] || mac80211_start_vif "$vif" "$ifname"
+		if [ ! "$mode" = "ap" ]; then
+			mac80211_start_vif "$vif" "$ifname"
 
-		case "$mode" in
+			case "$mode" in
-			adhoc)
+				adhoc)
-				config_get bssid "$vif" bssid
+					config_get bssid "$vif" bssid
-				iw dev "$ifname" ibss join "$ssid" $freq ${fixed:+fixed-freq} $bssid
+					iw dev "$ifname" ibss join "$ssid" $freq ${fixed:+fixed-freq} $bssid
-			;;
+				;;
-			sta|mesh)
+				sta)
-				config_get bssid "$vif" bssid
+					if eval "type wpa_supplicant_setup_vif" 2>/dev/null >/dev/null; then
-				case "$enc" in
+						wpa_supplicant_setup_vif "$vif" wext || {
-					*wep*)
+							echo "enable_mac80211($device): Failed to set up wpa_supplicant for interface $ifname" >&2
-						if [ -z "$keymgmt" ]; then
+							# make sure this wifi interface won't accidentally stay open without encryption
-							[ -n "$keystring" ] &&
+							ifconfig "$ifname" down
-								iw dev "$ifname" connect "$ssid" ${fixed:+$freq} $bssid key $keystring
+							continue
-						else
+						}
-							if eval "type wpa_supplicant_setup_vif" 2>/dev/null >/dev/null; then
+					fi
-								wpa_supplicant_setup_vif "$vif" wext || {
+				;;
-									echo "enable_mac80211($device): Failed to set up wpa_supplicant for interface $ifname" >&2
+			esac
-									# make sure this wifi interface won't accidentally stay open without encryption
+		fi
-									ifconfig "$ifname" down
-									continue
-								}
-							fi
-						fi
-					;;
-					*wpa*|*psk*)
-						config_get key "$vif" key
-						if eval "type wpa_supplicant_setup_vif" 2>/dev/null >/dev/null; then
-							wpa_supplicant_setup_vif "$vif" wext || {
-								echo "enable_mac80211($device): Failed to set up wpa_supplicant for interface $ifname" >&2
-								# make sure this wifi interface won't accidentally stay open without encryption
-								ifconfig "$ifname" down
-								continue
-							}
-						fi
-					;;
-					*)
-						if [ -z "$keymgmt" ]; then
-							iw dev "$ifname" connect "$ssid" ${fixed:+$freq} $bssid
-						else
-							if eval "type wpa_supplicant_setup_vif" 2>/dev/null >/dev/null; then
-								wpa_supplicant_setup_vif "$vif" wext || {
-									echo "enable_mac80211($device): Failed to set up wpa_supplicant for interface $ifname" >&2
-									# make sure this wifi interface won't accidentally stay open without encryption
-									ifconfig "$ifname" down
-									continue
-								}
-							fi
-						fi
-					;;
-				esac
-
-			;;
-		esac
 	done
 
 	local start_hostapd=

package/mac80211/patches/001-disable_b44.patch

@@ -1,16 +1,12 @@
 --- a/config.mk
 +++ b/config.mk
-@@ -283,10 +283,10 @@ endif
+@@ -271,8 +271,8 @@ endif
  
  CONFIG_P54_PCI=m
  
 -CONFIG_B44=m
--CONFIG_B44_PCI_AUTOSELECT=y
--CONFIG_B44_PCICORE_AUTOSELECT=y
 -CONFIG_B44_PCI=y
 +# CONFIG_B44=m
-+# CONFIG_B44_PCI_AUTOSELECT=y
-+# CONFIG_B44_PCICORE_AUTOSELECT=y
 +# CONFIG_B44_PCI=y
  
  CONFIG_RTL8180=m

package/mac80211/patches/002-disable_rfkill.patch

@@ -1,6 +1,6 @@
 --- a/config.mk
 +++ b/config.mk
-@@ -73,7 +73,7 @@ endif # build check
+@@ -72,7 +72,7 @@ endif # build check
  endif # kernel Makefile check
  
  # These both are needed by compat-wireless || compat-bluetooth so enable them
@@ -9,7 +9,7 @@
  
  ifeq ($(CONFIG_MAC80211),y)
  $(error "ERROR: you have MAC80211 compiled into the kernel, CONFIG_MAC80211=y, as such you cannot replace its mac80211 driver. You need this set to CONFIG_MAC80211=m. If you are using Fedora upgrade your kernel as later version should this set as modular. For further information on Fedora see https://bugzilla.redhat.com/show_bug.cgi?id=470143. If you are using your own kernel recompile it and make mac80211 modular")
-@@ -476,8 +476,8 @@ endif
+@@ -461,8 +461,8 @@ endif
  # We need the backported rfkill module on kernel < 2.6.31.
  # In more recent kernel versions use the in kernel rfkill module.
  ifdef CONFIG_COMPAT_KERNEL_31

package/mac80211/patches/003-disable_bt.patch

@@ -1,6 +1,6 @@
 --- a/config.mk
 +++ b/config.mk
-@@ -95,8 +95,8 @@ ifndef CONFIG_COMPAT_KERNEL_27
+@@ -94,8 +94,8 @@ ifndef CONFIG_COMPAT_KERNEL_27
  ifeq ($(CONFIG_BT),y)
  # we'll ignore compiling bluetooth
  else

package/mac80211/patches/007-remove_misc_drivers.patch

@@ -1,6 +1,6 @@
 --- a/config.mk
 +++ b/config.mk
-@@ -316,10 +316,10 @@ CONFIG_PCI_ATMEL=m
+@@ -296,10 +296,10 @@ endif
  CONFIG_MWL8K=m
  
  # Ethernet drivers go here
@@ -15,7 +15,7 @@
  
  endif
  ## end of PCI
-@@ -358,10 +358,10 @@ CONFIG_USB_NET_COMPAT_RNDIS_HOST=n
+@@ -338,10 +338,10 @@ CONFIG_USB_NET_COMPAT_RNDIS_HOST=n
  CONFIG_USB_NET_COMPAT_RNDIS_WLAN=n
  CONFIG_USB_NET_COMPAT_CDCETHER=n
  else

package/mac80211/patches/009-remove_mac80211_module_dependence.patch

@@ -1,6 +1,6 @@
 --- a/config.mk
 +++ b/config.mk
-@@ -44,21 +44,6 @@ $(error "ERROR: Your 2.6.27 kernel has C
+@@ -43,21 +43,6 @@ $(error "ERROR: Your 2.6.27 kernel has C
  endif
  endif
  

package/mac80211/patches/010-b43_config.patch

@@ -1,25 +0,0 @@
---- a/config.mk
-+++ b/config.mk
-@@ -201,9 +201,9 @@ CONFIG_B43_HWRNG=y
- CONFIG_B43_PCI_AUTOSELECT=y
- CONFIG_B43_PCICORE_AUTOSELECT=y
- ifneq ($(CONFIG_PCMCIA),)
--CONFIG_B43_PCMCIA=y
-+# CONFIG_B43_PCMCIA=y
- endif
--CONFIG_B43_PIO=y
-+# CONFIG_B43_PIO=y
- CONFIG_B43_LEDS=y
- CONFIG_B43_PHY_LP=y
- # CONFIG_B43_DEBUG=y
-@@ -258,8 +258,8 @@ CONFIG_SSB_PCIHOST_POSSIBLE=y
- CONFIG_SSB_PCIHOST=y
- CONFIG_SSB_B43_PCI_BRIDGE=y
- ifneq ($(CONFIG_PCMCIA),)
--CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
--CONFIG_SSB_PCMCIAHOST=y
-+# CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
-+# CONFIG_SSB_PCMCIAHOST=y
- endif
- # CONFIG_SSB_DEBUG=y
- CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y

package/mac80211/patches/010-no_pcmcia.patch

@@ -0,0 +1,29 @@
+--- a/config.mk
++++ b/config.mk
+@@ -8,7 +8,7 @@ ifeq ($(wildcard $(KLIB_BUILD)/.config),
+ # These will be ignored by compat autoconf
+  CONFIG_PCI=y
+  CONFIG_USB=y
+- CONFIG_PCMCIA=y
++# CONFIG_PCMCIA=y
+  CONFIG_SSB=m
+ else
+ include $(KLIB_BUILD)/.config
+@@ -197,7 +197,7 @@ CONFIG_B43=m
+ CONFIG_B43_HWRNG=y
+ CONFIG_B43_PCI_AUTOSELECT=y
+ ifneq ($(CONFIG_PCMCIA),)
+-CONFIG_B43_PCMCIA=y
++# CONFIG_B43_PCMCIA=y
+ endif
+ CONFIG_B43_LEDS=y
+ CONFIG_B43_PHY_LP=y
+@@ -248,7 +248,7 @@ CONFIG_SSB_BLOCKIO=y
+ CONFIG_SSB_PCIHOST=y
+ CONFIG_SSB_B43_PCI_BRIDGE=y
+ ifneq ($(CONFIG_PCMCIA),)
+-CONFIG_SSB_PCMCIAHOST=y
++# CONFIG_SSB_PCMCIAHOST=y
+ endif
+ # CONFIG_SSB_DEBUG=y
+ CONFIG_SSB_DRIVER_PCICORE=y

package/mac80211/patches/011-no_sdio.patch

@@ -0,0 +1,13 @@
+--- a/config.mk
++++ b/config.mk
+@@ -382,8 +382,8 @@ endif # end of SPI driver list
+ 
+ ifneq ($(CONFIG_MMC),)
+ 
+-CONFIG_SSB_SDIOHOST=y
+-CONFIG_B43_SDIO=y
++# CONFIG_SSB_SDIOHOST=y
++# CONFIG_B43_SDIO=y
+ CONFIG_WL1251_SDIO=m
+ 
+ ifdef CONFIG_COMPAT_KERNEL_27

package/mac80211/patches/120-linux-2.6.30-compat.patch

@@ -0,0 +1,14 @@
+--- a/net/wireless/nl80211.c
++++ b/net/wireless/nl80211.c
+@@ -5662,7 +5662,11 @@ int nl80211_send_action(struct cfg80211_
+ 		return err;
+ 	}
+ 
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32))
+ 	err = genlmsg_unicast(wiphy_net(&rdev->wiphy), msg, nlpid);
++#else
++	err = genlmsg_unicast(msg, nlpid);
++#endif
+ 	if (err < 0)
+ 		return err;
+ 	return 0;

package/mac80211/patches/404-ath_regd_optional.patch

@@ -10,7 +10,7 @@
  #include "regd_common.h"
  
  /*
-@@ -587,3 +590,5 @@ u32 ath_regd_get_band_ctl(struct ath_reg
+@@ -588,3 +591,5 @@ u32 ath_regd_get_band_ctl(struct ath_reg
  	}
  }
  EXPORT_SYMBOL(ath_regd_get_band_ctl);

package/mac80211/patches/408-ath9k_tweak_rx_intr_mitigation.patch

@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/ath/ath9k/hw.c
 +++ b/drivers/net/wireless/ath/ath9k/hw.c
-@@ -2092,7 +2092,7 @@ int ath9k_hw_reset(struct ath_hw *ah, st
+@@ -2103,7 +2103,7 @@ int ath9k_hw_reset(struct ath_hw *ah, st
  
  	if (ah->config.rx_intr_mitigation) {
  		REG_RMW_FIELD(ah, AR_RIMT, AR_RIMT_LAST, 500);

package/mac80211/patches/409-ath9k-add-wndr3700-antenna-initialization.patch

@@ -17,7 +17,7 @@
  
  	common = ath9k_hw_common(ah);
  	common->ops = &ath9k_common_ops;
-@@ -670,6 +673,24 @@ void ath9k_set_hw_capab(struct ath_softc
+@@ -671,6 +674,24 @@ void ath9k_set_hw_capab(struct ath_softc
  	SET_IEEE80211_PERM_ADDR(hw, common->macaddr);
  }
  
@@ -42,7 +42,7 @@
  int ath9k_init_device(u16 devid, struct ath_softc *sc, u16 subsysid,
  		    const struct ath_bus_ops *bus_ops)
  {
-@@ -688,6 +709,9 @@ int ath9k_init_device(u16 devid, struct 
+@@ -689,6 +710,9 @@ int ath9k_init_device(u16 devid, struct 
  	common = ath9k_hw_common(ah);
  	ath9k_set_hw_capab(sc, hw);
  
@@ -54,7 +54,7 @@
  			      ath9k_reg_notifier);
 --- a/drivers/net/wireless/ath/ath9k/ath9k.h
 +++ b/drivers/net/wireless/ath/ath9k/ath9k.h
-@@ -510,6 +510,8 @@ struct ath_softc {
+@@ -511,6 +511,8 @@ struct ath_softc {
  	struct ath_beacon_config cur_beacon_conf;
  	struct delayed_work tx_complete_work;
  	struct ath_btcoex btcoex;

package/mac80211/patches/410-ath9k-wndr3700-led-pin-fix.patch

@@ -0,0 +1,23 @@
+--- a/drivers/net/wireless/ath/ath9k/gpio.c
++++ b/drivers/net/wireless/ath/ath9k/gpio.c
+@@ -138,7 +138,9 @@ void ath_init_leds(struct ath_softc *sc)
+ 	if (AR_SREV_9100(sc->sc_ah))
+ 		return;
+ 
+-	if (AR_SREV_9287(sc->sc_ah))
++	if (sc->quirk_wndr3700)
++		sc->sc_ah->led_pin = ATH_LED_PIN_WNDR3700;
++	else if (AR_SREV_9287(sc->sc_ah))
+ 		sc->sc_ah->led_pin = ATH_LED_PIN_9287;
+ 	else
+ 		sc->sc_ah->led_pin = ATH_LED_PIN_DEF;
+--- a/drivers/net/wireless/ath/ath9k/ath9k.h
++++ b/drivers/net/wireless/ath/ath9k/ath9k.h
+@@ -379,6 +379,7 @@ void ath9k_btcoex_timer_pause(struct ath
+ 
+ #define ATH_LED_PIN_DEF 		1
+ #define ATH_LED_PIN_9287		8
++#define ATH_LED_PIN_WNDR3700		5
+ #define ATH_LED_ON_DURATION_IDLE	350	/* in msecs */
+ #define ATH_LED_OFF_DURATION_IDLE	250	/* in msecs */
+ 

package/mac80211/patches/520-ath9k_ack_timeout_workaround.patch

@@ -1,20 +0,0 @@
---- a/drivers/net/wireless/ath/ath9k/hw.c
-+++ b/drivers/net/wireless/ath/ath9k/hw.c
-@@ -1233,6 +1233,17 @@ void ath9k_hw_init_global_settings(struc
- 	/* As defined by IEEE 802.11-2007 17.3.8.6 */
- 	slottime = ah->slottime + 3 * ah->coverage_class;
- 	acktimeout = slottime + sifstime;
-+
-+	/*
-+	 * Workaround for early ACK timeouts, add an offset to match the
-+	 * initval's 64us ack timeout value.
-+	 * This was initially only meant to work around an issue with delayed
-+	 * BA frames in some implementations, but it has been found to fix ACK
-+	 * timeout issues in other cases as well.
-+	 */
-+	if (conf->channel && conf->channel->band == IEEE80211_BAND_2GHZ)
-+		acktimeout += 64 - sifstime - ah->slottime;
-+
- 	ath9k_hw_setslottime(ah, slottime);
- 	ath9k_hw_set_ack_timeout(ah, acktimeout);
- 	ath9k_hw_set_cts_timeout(ah, acktimeout);

package/mac80211/patches/520-cfg80211_get_freq.patch

@@ -20,7 +20,7 @@
  }
 --- a/net/wireless/nl80211.c
 +++ b/net/wireless/nl80211.c
-@@ -881,6 +881,11 @@ static int nl80211_send_iface(struct sk_
+@@ -885,6 +885,11 @@ static int nl80211_send_iface(struct sk_
  	NLA_PUT_U32(msg, NL80211_ATTR_WIPHY, rdev->wiphy_idx);
  	NLA_PUT_STRING(msg, NL80211_ATTR_IFNAME, dev->name);
  	NLA_PUT_U32(msg, NL80211_ATTR_IFTYPE, dev->ieee80211_ptr->iftype);

package/mac80211/patches/530-ath9k_rc_fallback.patch

@@ -0,0 +1,55 @@
+--- a/drivers/net/wireless/ath/ath9k/rc.c
++++ b/drivers/net/wireless/ath/ath9k/rc.c
+@@ -668,7 +668,7 @@ static void ath_get_rate(void *priv, str
+ 	struct ieee80211_tx_rate *rates = tx_info->control.rates;
+ 	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
+ 	__le16 fc = hdr->frame_control;
+-	u8 try_per_rate, i = 0, rix, nrix;
++	u8 try_per_rate, i = 0, rix;
+ 	int is_probe = 0;
+ 
+ 	if (rate_control_send_low(sta, priv_sta, txrc))
+@@ -688,26 +688,25 @@ static void ath_get_rate(void *priv, str
+ 
+ 	rate_table = sc->cur_rate_table;
+ 	rix = ath_rc_get_highest_rix(sc, ath_rc_priv, rate_table, &is_probe);
+-	nrix = rix;
+ 
+ 	if (is_probe) {
+ 		/* set one try for probe rates. For the
+ 		 * probes don't enable rts */
+ 		ath_rc_rate_set_series(rate_table, &rates[i++], txrc,
+-				       1, nrix, 0);
++				       1, rix, 0);
+ 
+ 		/* Get the next tried/allowed rate. No RTS for the next series
+ 		 * after the probe rate
+ 		 */
+-		ath_rc_get_lower_rix(rate_table, ath_rc_priv, rix, &nrix);
++		ath_rc_get_lower_rix(rate_table, ath_rc_priv, rix, &rix);
+ 		ath_rc_rate_set_series(rate_table, &rates[i++], txrc,
+-				       try_per_rate, nrix, 0);
++				       try_per_rate, rix, 0);
+ 
+ 		tx_info->flags |= IEEE80211_TX_CTL_RATE_CTRL_PROBE;
+ 	} else {
+ 		/* Set the choosen rate. No RTS for first series entry. */
+ 		ath_rc_rate_set_series(rate_table, &rates[i++], txrc,
+-				       try_per_rate, nrix, 0);
++				       try_per_rate, rix, 0);
+ 	}
+ 
+ 	/* Fill in the other rates for multirate retry */
+@@ -716,10 +715,10 @@ static void ath_get_rate(void *priv, str
+ 		if (i + 1 == 4)
+ 			try_per_rate = 8;
+ 
+-		ath_rc_get_lower_rix(rate_table, ath_rc_priv, rix, &nrix);
++		ath_rc_get_lower_rix(rate_table, ath_rc_priv, rix, &rix);
+ 		/* All other rates in the series have RTS enabled */
+ 		ath_rc_rate_set_series(rate_table, &rates[i], txrc,
+-				       try_per_rate, nrix, 1);
++				       try_per_rate, rix, 1);
+ 	}
+ 
+ 	/*

package/mac80211/patches/540-ath9k_beacon_timer_fix.patch

@@ -0,0 +1,22 @@
+--- a/drivers/net/wireless/ath/ath9k/beacon.c
++++ b/drivers/net/wireless/ath/ath9k/beacon.c
+@@ -526,16 +526,13 @@ static void ath_beacon_config_ap(struct 
+ {
+ 	u32 nexttbtt, intval;
+ 
+-	/* Configure the timers only when the TSF has to be reset */
+-
+-	if (!(sc->sc_flags & SC_OP_TSF_RESET))
+-		return;
+-
+ 	/* NB: the beacon interval is kept internally in TU's */
+ 	intval = conf->beacon_interval & ATH9K_BEACON_PERIOD;
+ 	intval /= ATH_BCBUF;    /* for staggered beacons */
+ 	nexttbtt = intval;
+-	intval |= ATH9K_BEACON_RESET_TSF;
++
++	if (sc->sc_flags & SC_OP_TSF_RESET)
++		intval |= ATH9K_BEACON_RESET_TSF;
+ 
+ 	/*
+ 	 * In AP mode we enable the beacon timers and SWBA interrupts to

package/mac80211/patches/540-ath9k_fix_eap_handling.patch

@@ -1,20 +0,0 @@
---- a/drivers/net/wireless/ath/ath9k/xmit.c
-+++ b/drivers/net/wireless/ath/ath9k/xmit.c
-@@ -1610,7 +1610,7 @@ static int ath_tx_setup_buffer(struct ie
- 		bf->bf_frmlen -= padsize;
- 	}
- 
--	if (conf_is_ht(&hw->conf) && !is_pae(skb))
-+	if (conf_is_ht(&hw->conf))
- 		bf->bf_state.bf_type |= BUF_HT;
- 
- 	bf->bf_flags = setup_tx_flags(sc, skb, txctl->txq);
-@@ -1696,7 +1696,7 @@ static void ath_tx_start_dma(struct ath_
- 			goto tx_done;
- 		}
- 
--		if (tx_info->flags & IEEE80211_TX_CTL_AMPDU) {
-+		if ((tx_info->flags & IEEE80211_TX_CTL_AMPDU) && !is_pae(skb)) {
- 			/*
- 			 * Try aggregation if it's a unicast data frame
- 			 * and the destination is HT capable.

package/mac80211/patches/550-ath9k_rifs_disable.patch

@@ -0,0 +1,31 @@
+--- a/drivers/net/wireless/ath/ath9k/hw.c
++++ b/drivers/net/wireless/ath/ath9k/hw.c
+@@ -1326,6 +1326,16 @@ static void ath9k_hw_override_ini(struct
+ 	 * Necessary to avoid issues on AR5416 2.0
+ 	 */
+ 	REG_WRITE(ah, 0x9800 + (651 << 2), 0x11);
++
++	/*
++	 * Disable RIFS search on some chips to avoid baseband
++	 * hang issues.
++	 */
++	if (AR_SREV_9100(ah) || AR_SREV_9160(ah)) {
++		val = REG_READ(ah, AR_PHY_HEAVY_CLIP_FACTOR_RIFS);
++		val &= ~AR_PHY_RIFS_INIT_DELAY;
++		REG_WRITE(ah, AR_PHY_HEAVY_CLIP_FACTOR_RIFS, val);
++	}
+ }
+ 
+ static u32 ath9k_hw_def_ini_fixup(struct ath_hw *ah,
+--- a/drivers/net/wireless/ath/ath9k/phy.h
++++ b/drivers/net/wireless/ath/ath9k/phy.h
+@@ -384,6 +384,9 @@ bool ath9k_hw_set_rf_regs(struct ath_hw 
+ 
+ #define AR_PHY_HEAVY_CLIP_ENABLE         0x99E0
+ 
++#define AR_PHY_HEAVY_CLIP_FACTOR_RIFS    0x99EC
++#define AR_PHY_RIFS_INIT_DELAY         0x03ff0000
++
+ #define AR_PHY_M_SLEEP      0x99f0
+ #define AR_PHY_REFCLKDLY    0x99f4
+ #define AR_PHY_REFCLKPD     0x99f8

package/madwifi/patches/458-ibss_wpa_none.patch

@@ -0,0 +1,13 @@
+--- a/net80211/ieee80211_crypto_ccmp.c
++++ b/net80211/ieee80211_crypto_ccmp.c
+@@ -273,7 +273,9 @@ ccmp_decap(struct ieee80211_key *k, stru
+ 		tid = ((struct ieee80211_qosframe *)wh)->i_qos[0] & IEEE80211_QOS_TID;
+ 	/* NB: assume IEEE80211_WEP_MINLEN covers the extended IV */
+ 	pn = READ_6(ivp[0], ivp[1], ivp[4], ivp[5], ivp[6], ivp[7]);
+-	if (pn && pn <= k->wk_keyrsc[tid]) {
++	if ((vap->iv_opmode != IEEE80211_M_IBSS) &&
++	    (vap->iv_opmode != IEEE80211_M_AHDEMO) &&
++	    (pn && pn <= k->wk_keyrsc[tid])) {
+ 		/*
+ 		 * Replay violation.
+ 		 */

package/opkg/Makefile

@@ -70,7 +70,7 @@ define Package/opkg/install
 	$(INSTALL_DIR) $(1)/bin
 	$(INSTALL_DIR) $(1)/etc
 	$(INSTALL_DATA) ./files/opkg.conf $(1)/etc/
-	$(SED) 's,$$$$S,$(TARGET),g' $(1)/etc/opkg.conf
+	$(SED) 's,$$$$S,$(PKGARCH),g' $(1)/etc/opkg.conf
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/opkg-cl $(1)/bin/opkg
 endef
 

package/ppp/patches/200-makefile.patch

@@ -1,6 +1,6 @@
 --- a/pppd/Makefile.linux
 +++ b/pppd/Makefile.linux
-@@ -48,21 +48,21 @@ MPPE=y
+@@ -48,7 +48,7 @@ MPPE=y
  # Uncomment the next line to include support for PPP packet filtering.
  # This requires that the libpcap library and headers be installed
  # and that the kernel driver support PPP packet filtering.
@@ -9,10 +9,7 @@
  
  # Uncomment the next line to enable multilink PPP (enabled by default)
  # Linux distributions: Please leave multilink ENABLED in your builds
- # of pppd!
+@@ -58,11 +58,11 @@ HAVE_MULTILINK=y
--HAVE_MULTILINK=y
-+#HAVE_MULTILINK=y
- 
  # Uncomment the next line to enable the TDB database (enabled by default.)
  # If you enable multilink, then TDB is automatically enabled also.
  # Linux distributions: Please leave TDB ENABLED in your builds.

package/r8101/Makefile

@@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2009 OpenWrt.org
+# Copyright (C) 2009-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,19 +9,22 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=r8101
-PKG_VERSION:=1.012.00
+PKG_VERSION:=1.014.00
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=ftp://WebUser:nQJ4P7b@202.65.194.212/cn/nic/
+PKG_SOURCE_URL:= \
-PKG_MD5SUM:=eb0645af023926f3ab8d0d40f68748ef
+	ftp://WebUser:nQJ4P7b@202.134.71.22/cn/nic/ \
+	ftp://WebUser:nQJ4P7b@66.104.77.130/cn/nic/ \
+	ftp://WebUser:nQJ4P7b@61.56.86.122/cn/nic/
+PKG_MD5SUM:=dace75093a1439310750029ccebe2c15
 
 include $(INCLUDE_DIR)/package.mk
 
 define KernelPackage/r8101
   SUBMENU:=Network Devices
   TITLE:=RealTek RTL-8101E PCIe Fast Ethernet Adapter kernel support
-  DEPENDS:=@TARGET_x86 @!LINUX_2_6_31
+  DEPENDS:=@TARGET_x86
   URL:=http://www.realtek.com.tw/
   FILES:= $(PKG_BUILD_DIR)/src/r8101.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,r8101)
@@ -31,12 +34,15 @@ define KernelPackage/r8101/description
  Kernel modules for RealTek RTL-8101E PCI-Express Fast Ethernet adapters.
 endef
 
+include $(INCLUDE_DIR)/kernel-defaults.mk
+
+define Build/Configure
+endef
+
 define Build/Compile
 	chmod u+x $(PKG_BUILD_DIR)/src
-	$(MAKE) -C $(LINUX_DIR) \
+	$(MAKE) $(KERNEL_MAKEOPTS) \
-		SUBDIRS="$(PKG_BUILD_DIR)/src" \
+		M="$(PKG_BUILD_DIR)/src" \
-		ARCH="$(LINUX_KARCH)" \
-		CROSS_COMPILE="$(TARGET_CROSS)" \
 		modules
 endef
 

package/swconfig/src/cli.c

@@ -196,8 +196,6 @@ int main(int argc, char **argv)
 	int err;
 	int i;
 
-	struct switch_port *ports;
-
 	int cmd = CMD_NONE;
 	char *cdev = NULL;
 	int cport = -1;
@@ -255,8 +253,6 @@ int main(int argc, char **argv)
 		return 1;
 	}
 
-	ports = malloc(sizeof(struct switch_port) * dev->ports);
-	memset(ports, 0, sizeof(struct switch_port) * dev->ports);
 	swlib_scan(dev);
 
 	if (cmd == CMD_GET || cmd == CMD_SET) {
@@ -329,7 +325,5 @@ int main(int argc, char **argv)
 
 out:
 	swlib_free_all(dev);
-	free(ports);
-
 	return 0;
 }

package/vsc73x5-ucode/Makefile

@@ -0,0 +1,102 @@
+#
+# Copyright (C) 2010 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=vsc73x5-ucode
+PKG_RELEASE:=1
+
+PKG_SOURCE_URL:=http://www.tp-link.com/GPL
+
+PKG_SOURCE:=WirelessNRouer_AP.tar.gz
+PKG_BUILD_DIR:=$(BUILD_DIR)/vsc73x5-ucode
+
+PKG_MD5SUM:=7dd6069a5f0e44cc9965fc7b43eb3046
+
+UCODE_SRC_DIR:=u-boot/board/ar7100/common
+UCODE_BUILD_DIR:=$(PKG_BUILD_DIR)/$(UCODE_SRC_DIR)
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/vsc73x5-defaults
+  SECTION:=net
+  CATEGORY:=Network
+  DEPENDS:=@TARGET_ar71xx
+  DEFAULT:=n
+  TITLE:=$(1)
+endef
+
+define Package/vsc73x5/install
+	$(INSTALL_DIR) $(1)/lib/firmware
+	$(INSTALL_DATA) $(UCODE_BUILD_DIR)/$(2) $(1)/lib/firmware/$(3)
+endef
+
+define Package/vsc7385-ucode-ap83
+  $(call Package/vsc73x5-defaults,Vitesse VSC7385 microcode for the Atheros AP83 boards)
+endef
+
+define Package/vsc7385-ucode-ap83/description
+  This package contains the Atheros AP83 board specific microcode for
+  the Vitesse VSC7385 ethernet switch.
+endef
+
+define Package/vsc7385-ucode-ap83/install
+  $(call Package/vsc73x5/install,$(1),g5_Plus1_2_31_unmanaged_Atheros_v3.bin,vsc7385_ucode_ap83.bin)
+endef
+
+define Package/vsc7395-ucode-ap83
+  $(call Package/vsc73x5-defaults, Vitesse VSC7395 microcode for the Atheros AP83 boards)
+endef
+
+define Package/vsc7395-ucode-ap83/description
+  This package contains the Atheros AP83 board specific microcode for
+  the Vitesse VSC7395 ethernet switch.
+endef
+
+define Package/vsc7395-ucode-ap83/install
+  $(call Package/vsc73x5/install,$(1),g5_Plus1_2_31_unmanaged_Atheros_v4.bin,vsc7395_ucode_ap83.bin)
+endef
+
+define Package/vsc7385-ucode-pb44
+  $(call Package/vsc73x5-defaults, Vitesse VSC7395 microcode for the Atheros PB44 boards)
+endef
+
+define Package/vsc7385-ucode-pb44/description
+  This package contains the Atheros PB44 board specific microcode for
+  the Vitesse VSC7385 ethernet switch.
+endef
+
+define Package/vsc7385-ucode-pb44/install
+  $(call Package/vsc73x5/install,$(1),g5_Plus1_2_29b_unmanaged_Atheros_v5.bin,vsc7385_ucode_pb44.bin)
+endef
+
+define Package/vsc7395-ucode-pb44
+  $(call Package/vsc73x5-defaults, Vitesse VSC7395 microcode for the Atheros PB44 boards)
+endef
+
+define Package/vsc7395-ucode-pb44/description
+  This package contains the Atheros AP83 board specific microcode for
+  the Vitesse VSC7395 ethernet switch.
+endef
+
+define Package/vsc7395-ucode-pb44/install
+  $(call Package/vsc73x5/install,$(1),g5e_Plus1_2_29a_unmanaged_Atheros_v3.bin,vsc7395_ucode_pb44.bin)
+endef
+
+define Build/Prepare
+	tar -xzf "$(DL_DIR)/$(PKG_SOURCE)" ap-9x-gpl/ap93-u-boot.tar.bz2 -O | tar -C "$(PKG_BUILD_DIR)" -xj $(UCODE_SRC_DIR)
+	cp files/Makefile $(UCODE_BUILD_DIR)
+endef
+
+define Build/Compile
+	$(MAKE) -C $(UCODE_BUILD_DIR) $(TARGET_CONFIGURE_OPTS) all
+endef
+
+$(eval $(call BuildPackage,vsc7385-ucode-ap83))
+$(eval $(call BuildPackage,vsc7395-ucode-ap83))
+$(eval $(call BuildPackage,vsc7385-ucode-pb44))
+$(eval $(call BuildPackage,vsc7395-ucode-pb44))

package/vsc73x5-ucode/files/Makefile

@@ -0,0 +1,20 @@
+#
+# Copyright (C) 2010 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+CC:=gcc
+OBJCOPY:=objcopy
+
+all: g5_Plus1_2_31_unmanaged_Atheros_v3.bin \
+     g5_Plus1_2_31_unmanaged_Atheros_v4.bin \
+     g5_Plus1_2_29b_unmanaged_Atheros_v5.bin \
+     g5e_Plus1_2_29a_unmanaged_Atheros_v3.bin
+
+%.o: %.c
+	$(CC) $(CFLAGS) -c $^ -o $@
+
+%.bin: %.o
+	$(OBJCOPY) -O binary -j .data $^ $@

rules.mk

@@ -80,7 +80,6 @@ STAMP_DIR_HOST=$(BUILD_DIR_HOST)/stamp
 TARGET_ROOTFS_DIR?=$(if $(call qstrip,$(CONFIG_TARGET_ROOTFS_DIR)),$(call qstrip,$(CONFIG_TARGET_ROOTFS_DIR)),$(BUILD_DIR))
 TARGET_DIR:=$(TARGET_ROOTFS_DIR)/root-$(BOARD)
 STAGING_DIR_ROOT:=$(STAGING_DIR)/root-$(BOARD)
-DEBUG_DIR:=$(BUILD_DIR)/debug-$(BOARD)
 BUILD_LOG_DIR:=$(TOPDIR)/logs
 
 TARGET_PATH:=$(STAGING_DIR_HOST)/bin:$(PATH)
@@ -220,6 +219,10 @@ $(call shvar,$(1))=$$(call $(1))
 export $(call shvar,$(1))
 endef
 
+define include_mk
+$(eval -include $(if $(DUMP),,$(STAGING_DIR)/mk/$(strip $(1))))
+endef
+
 # file extension
 ext=$(word $(words $(subst ., ,$(1))),$(subst ., ,$(1)))
 

scripts/remote-gdb

@@ -53,8 +53,9 @@ if( opendir SD, "$Bin/../staging_dir" )
 
 		# Find library paths
 		my $libdirs = join ':', (
-			glob("$Bin/../staging_dir/target-${arch}_${libc}/{usr/,}lib"),
+			glob("$Bin/../staging_dir/target-${arch}_${libc}/root-*/{,usr/}lib/"),
-			glob("$Bin/../staging_dir/toolchain-${arch}_*_${libc}/lib")
+			glob("$Bin/../staging_dir/target-${arch}_${libc}/{,usr/}lib/"),
+			glob("$Bin/../staging_dir/toolchain-${arch}_*_${libc}/lib/")
 		);
 
 		print $fh "set solib-search-path $libdirs\n";

target/linux/adm5120/router_be/config-2.6.30

@@ -1,5 +1,6 @@
 CONFIG_32BIT=y
 # CONFIG_64BIT is not set
+CONFIG_ADM5120=y
 CONFIG_ADM5120_ENET=y
 CONFIG_ADM5120_MACH_5GXI=y
 CONFIG_ADM5120_MACH_P_334WT=y
@@ -14,7 +15,6 @@ CONFIG_ADM5120_OEM_OSBRIDGE=y
 CONFIG_ADM5120_OEM_ZYXEL=y
 CONFIG_ADM5120_SOC_BGA=y
 CONFIG_ADM5120_WDT=y
-CONFIG_ADM5120=y
 # CONFIG_ARCH_HAS_ILOG2_U32 is not set
 # CONFIG_ARCH_HAS_ILOG2_U64 is not set
 CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -30,8 +30,8 @@ CONFIG_BITREVERSE=y
 # CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD is not set
 # CONFIG_CAVIUM_OCTEON_SIMULATOR is not set
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-CONFIG_CEVT_R4K_LIB=y
 CONFIG_CEVT_R4K=y
+CONFIG_CEVT_R4K_LIB=y
 CONFIG_CMDLINE="console=ttyS0,115200 rootfstype=squashfs,jffs2"
 CONFIG_CPU_BIG_ENDIAN=y
 # CONFIG_CPU_CAVIUM_OCTEON is not set
@@ -40,9 +40,9 @@ CONFIG_CPU_HAS_PREFETCH=y
 CONFIG_CPU_HAS_SYNC=y
 # CONFIG_CPU_LITTLE_ENDIAN is not set
 # 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=y
 # CONFIG_CPU_MIPS64_R1 is not set
 # CONFIG_CPU_MIPS64_R2 is not set
 CONFIG_CPU_MIPSR1=y
@@ -64,8 +64,8 @@ CONFIG_CPU_SUPPORTS_HIGHMEM=y
 # CONFIG_CPU_TX39XX is not set
 # CONFIG_CPU_TX49XX is not set
 # CONFIG_CPU_VR41XX is not set
-CONFIG_CSRC_R4K_LIB=y
 CONFIG_CSRC_R4K=y
+CONFIG_CSRC_R4K_LIB=y
 CONFIG_DECOMPRESS_LZMA=y
 CONFIG_DEVPORT=y
 # CONFIG_DM9000 is not set
@@ -76,8 +76,8 @@ CONFIG_ELF_CORE=y
 CONFIG_FIRMWARE_IN_KERNEL=y
 CONFIG_FS_POSIX_ACL=y
 CONFIG_GENERIC_ACL=y
-CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
 CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
 CONFIG_GENERIC_CMOS_UPDATE=y
 CONFIG_GENERIC_FIND_LAST_BIT=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y
@@ -98,20 +98,20 @@ CONFIG_HID=m
 CONFIG_HID_SUPPORT=y
 CONFIG_HW_HAS_PCI=y
 CONFIG_HW_RANDOM=y
-# CONFIG_HZ_100 is not set
 CONFIG_HZ=250
+# CONFIG_HZ_100 is not set
 CONFIG_HZ_250=y
 CONFIG_INITRAMFS_SOURCE=""
-CONFIG_INOTIFY_USER=y
 CONFIG_INOTIFY=y
-# CONFIG_INPUT_GPIO_BUTTONS is not set
+CONFIG_INOTIFY_USER=y
 CONFIG_INPUT=m
+# CONFIG_INPUT_GPIO_BUTTONS is not set
 # CONFIG_INPUT_YEALINK is not set
 CONFIG_IRQ_CPU=y
 CONFIG_LEDS_GPIO=m
 CONFIG_LEDS_TRIGGER_ADM5120_SWITCH=m
-CONFIG_LEGACY_PTY_COUNT=256
 CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
 # CONFIG_LEMOTE_FULONG is not set
 # CONFIG_MACH_ALCHEMY is not set
 # CONFIG_MACH_DECSTATION is not set
@@ -121,8 +121,8 @@ CONFIG_LEGACY_PTYS=y
 # CONFIG_MACH_VR41XX is not set
 CONFIG_MII=m
 # CONFIG_MIKROTIK_RB532 is not set
+CONFIG_MIPS=y
 # CONFIG_MIPS_COBALT is not set
-# CONFIG_MIPS_FPU_EMU is not set
 CONFIG_MIPS_L1_CACHE_SHIFT=5
 CONFIG_MIPS_MACHINE=y
 # CONFIG_MIPS_MALTA is not set
@@ -130,7 +130,6 @@ CONFIG_MIPS_MT_DISABLED=y
 # CONFIG_MIPS_MT_SMP is not set
 # CONFIG_MIPS_MT_SMTC is not set
 # CONFIG_MIPS_SIM is not set
-CONFIG_MIPS=y
 CONFIG_MODULE_FORCE_UNLOAD=y
 CONFIG_MTD_ADM5120=y
 CONFIG_MTD_BLOCK2MTD=y
@@ -154,18 +153,18 @@ CONFIG_PCI_DOMAINS=y
 CONFIG_SCHED_OMIT_FRAME_POINTER=y
 # CONFIG_SCSI_DMA is not set
 # CONFIG_SERIAL_8250 is not set
+CONFIG_SERIAL_AMBA_PL010=y
 CONFIG_SERIAL_AMBA_PL010_CONSOLE=y
 CONFIG_SERIAL_AMBA_PL010_NUMPORTS=2
 CONFIG_SERIAL_AMBA_PL010_PORTNAME="ttyS"
-CONFIG_SERIAL_AMBA_PL010=y
 # CONFIG_SERIAL_AMBA_PL011 is not set
+CONFIG_SERIO=y
 # CONFIG_SERIO_AMBAKMI is not set
 # CONFIG_SERIO_I8042 is not set
 # CONFIG_SERIO_LIBPS2 is not set
 # CONFIG_SERIO_PCIPS2 is not set
 # CONFIG_SERIO_RAW is not set
 CONFIG_SERIO_SERPORT=y
-CONFIG_SERIO=y
 # CONFIG_SGI_IP22 is not set
 # CONFIG_SGI_IP27 is not set
 # CONFIG_SGI_IP28 is not set
@@ -192,10 +191,10 @@ CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
 CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_TRACING_SUPPORT=y
 CONFIG_TRAD_SIGNALS=y
+CONFIG_USB=m
 CONFIG_USB_ADM5120_HCD=m
 CONFIG_USB_DEBUG=y
 CONFIG_USB_EHCI_HCD=m
-CONFIG_USB=m
 # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
 # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
 CONFIG_USB_OHCI_HCD=m

target/linux/adm5120/router_be/config-2.6.32

@@ -1,5 +1,6 @@
 CONFIG_32BIT=y
 # CONFIG_64BIT is not set
+CONFIG_ADM5120=y
 CONFIG_ADM5120_ENET=y
 CONFIG_ADM5120_MACH_5GXI=y
 CONFIG_ADM5120_MACH_P_334WT=y
@@ -14,7 +15,6 @@ CONFIG_ADM5120_OEM_OSBRIDGE=y
 CONFIG_ADM5120_OEM_ZYXEL=y
 CONFIG_ADM5120_SOC_BGA=y
 CONFIG_ADM5120_WDT=y
-CONFIG_ADM5120=y
 # CONFIG_ALCHEMY_GPIO_INDIRECT is not set
 # CONFIG_AR7 is not set
 # CONFIG_ARCH_HAS_ILOG2_U32 is not set
@@ -33,8 +33,8 @@ CONFIG_BITREVERSE=y
 # CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD is not set
 # CONFIG_CAVIUM_OCTEON_SIMULATOR is not set
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-CONFIG_CEVT_R4K_LIB=y
 CONFIG_CEVT_R4K=y
+CONFIG_CEVT_R4K_LIB=y
 CONFIG_CFG80211_DEFAULT_PS_VALUE=0
 CONFIG_CMDLINE="console=ttyS0,115200 rootfstype=squashfs,jffs2"
 CONFIG_CPU_BIG_ENDIAN=y
@@ -43,9 +43,9 @@ CONFIG_CPU_HAS_PREFETCH=y
 CONFIG_CPU_HAS_SYNC=y
 # CONFIG_CPU_LITTLE_ENDIAN is not set
 # CONFIG_CPU_LOONGSON2E is not set
+CONFIG_CPU_MIPS32=y
 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
@@ -67,8 +67,8 @@ CONFIG_CPU_SUPPORTS_HIGHMEM=y
 # CONFIG_CPU_TX39XX is not set
 # CONFIG_CPU_TX49XX is not set
 # CONFIG_CPU_VR41XX is not set
-CONFIG_CSRC_R4K_LIB=y
 CONFIG_CSRC_R4K=y
+CONFIG_CSRC_R4K_LIB=y
 CONFIG_DECOMPRESS_LZMA=y
 CONFIG_DEVPORT=y
 # CONFIG_DM9000 is not set
@@ -79,8 +79,8 @@ CONFIG_ELF_CORE=y
 CONFIG_FIRMWARE_IN_KERNEL=y
 CONFIG_FS_POSIX_ACL=y
 CONFIG_GENERIC_ACL=y
-CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
 CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
 CONFIG_GENERIC_CMOS_UPDATE=y
 CONFIG_GENERIC_FIND_LAST_BIT=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y
@@ -101,20 +101,20 @@ CONFIG_HID=m
 CONFIG_HID_SUPPORT=y
 CONFIG_HW_HAS_PCI=y
 CONFIG_HW_RANDOM=y
-# CONFIG_HZ_100 is not set
 CONFIG_HZ=250
+# CONFIG_HZ_100 is not set
 CONFIG_HZ_250=y
 CONFIG_INITRAMFS_SOURCE=""
-CONFIG_INOTIFY_USER=y
 CONFIG_INOTIFY=y
-# CONFIG_INPUT_GPIO_BUTTONS is not set
+CONFIG_INOTIFY_USER=y
 CONFIG_INPUT=m
+# CONFIG_INPUT_GPIO_BUTTONS is not set
 # CONFIG_INPUT_YEALINK is not set
 CONFIG_IRQ_CPU=y
 CONFIG_LEDS_GPIO=m
 CONFIG_LEDS_TRIGGER_ADM5120_SWITCH=m
-CONFIG_LEGACY_PTY_COUNT=256
 CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
 # CONFIG_MACH_ALCHEMY is not set
 # CONFIG_MACH_DECSTATION is not set
 # CONFIG_MACH_JAZZ is not set
@@ -124,6 +124,7 @@ CONFIG_LEGACY_PTYS=y
 # CONFIG_MACH_VR41XX is not set
 CONFIG_MII=m
 # CONFIG_MIKROTIK_RB532 is not set
+CONFIG_MIPS=y
 # CONFIG_MIPS_COBALT is not set
 CONFIG_MIPS_L1_CACHE_SHIFT=5
 CONFIG_MIPS_MACHINE=y
@@ -132,7 +133,6 @@ CONFIG_MIPS_MT_DISABLED=y
 # CONFIG_MIPS_MT_SMP is not set
 # CONFIG_MIPS_MT_SMTC is not set
 # CONFIG_MIPS_SIM is not set
-CONFIG_MIPS=y
 CONFIG_MODULE_FORCE_UNLOAD=y
 CONFIG_MTD_ADM5120=y
 CONFIG_MTD_BLOCK2MTD=y
@@ -157,18 +157,18 @@ CONFIG_PCI_DOMAINS=y
 CONFIG_SCHED_OMIT_FRAME_POINTER=y
 # CONFIG_SCSI_DMA is not set
 # CONFIG_SERIAL_8250 is not set
+CONFIG_SERIAL_AMBA_PL010=y
 CONFIG_SERIAL_AMBA_PL010_CONSOLE=y
 CONFIG_SERIAL_AMBA_PL010_NUMPORTS=2
 CONFIG_SERIAL_AMBA_PL010_PORTNAME="ttyS"
-CONFIG_SERIAL_AMBA_PL010=y
 # CONFIG_SERIAL_AMBA_PL011 is not set
+CONFIG_SERIO=y
 # CONFIG_SERIO_AMBAKMI is not set
 # CONFIG_SERIO_I8042 is not set
 # CONFIG_SERIO_LIBPS2 is not set
 # CONFIG_SERIO_PCIPS2 is not set
 # CONFIG_SERIO_RAW is not set
 CONFIG_SERIO_SERPORT=y
-CONFIG_SERIO=y
 # CONFIG_SGI_IP22 is not set
 # CONFIG_SGI_IP27 is not set
 # CONFIG_SGI_IP28 is not set
@@ -195,10 +195,10 @@ CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_TRAD_SIGNALS=y
 # CONFIG_TREE_PREEMPT_RCU is not set
 CONFIG_TREE_RCU=y
+CONFIG_USB=m
 CONFIG_USB_ADM5120_HCD=m
 CONFIG_USB_DEBUG=y
 CONFIG_USB_EHCI_HCD=m
-CONFIG_USB=m
 # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
 # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
 CONFIG_USB_OHCI_HCD=m

target/linux/adm5120/router_le/config-2.6.30

@@ -1,9 +1,10 @@
 CONFIG_32BIT=y
 # CONFIG_64BIT is not set
+CONFIG_ADM5120=y
 CONFIG_ADM5120_ENET=y
 CONFIG_ADM5120_MACH_5GXI=y
-CONFIG_ADM5120_MACH_BR_6104KP=y
 CONFIG_ADM5120_MACH_BR_6104K=y
+CONFIG_ADM5120_MACH_BR_6104KP=y
 CONFIG_ADM5120_MACH_BR_61X4WG=y
 CONFIG_ADM5120_MACH_CAS_771=y
 CONFIG_ADM5120_MACH_EASY5120P_ATA=y
@@ -15,8 +16,8 @@ CONFIG_ADM5120_MACH_NP27G=y
 CONFIG_ADM5120_MACH_NP28G=y
 CONFIG_ADM5120_MACH_PMUGW=y
 CONFIG_ADM5120_MACH_RB_11X=y
-CONFIG_ADM5120_MACH_RB_133C=y
 CONFIG_ADM5120_MACH_RB_133=y
+CONFIG_ADM5120_MACH_RB_133C=y
 CONFIG_ADM5120_MACH_RB_150=y
 CONFIG_ADM5120_MACH_RB_153=y
 CONFIG_ADM5120_MACH_RB_192=y
@@ -31,7 +32,6 @@ CONFIG_ADM5120_OEM_OSBRIDGE=y
 # CONFIG_ADM5120_OEM_ZYXEL is not set
 CONFIG_ADM5120_SOC_BGA=y
 CONFIG_ADM5120_WDT=y
-CONFIG_ADM5120=y
 # CONFIG_ARCH_HAS_ILOG2_U32 is not set
 # CONFIG_ARCH_HAS_ILOG2_U64 is not set
 CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -47,8 +47,8 @@ CONFIG_BITREVERSE=y
 # CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD is not set
 # CONFIG_CAVIUM_OCTEON_SIMULATOR is not set
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-CONFIG_CEVT_R4K_LIB=y
 CONFIG_CEVT_R4K=y
+CONFIG_CEVT_R4K_LIB=y
 CONFIG_CMDLINE="console=ttyS0,115200 rootfstype=squashfs,yaffs2,jffs2"
 # CONFIG_CPU_BIG_ENDIAN is not set
 # CONFIG_CPU_CAVIUM_OCTEON is not set
@@ -57,9 +57,9 @@ 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=y
 # CONFIG_CPU_MIPS64_R1 is not set
 # CONFIG_CPU_MIPS64_R2 is not set
 CONFIG_CPU_MIPSR1=y
@@ -84,18 +84,18 @@ CONFIG_CPU_SUPPORTS_HIGHMEM=y
 CONFIG_CRYPTO_AEAD2=y
 CONFIG_CRYPTO_AES=m
 CONFIG_CRYPTO_ARC4=m
-CONFIG_CRYPTO_BLKCIPHER2=y
 CONFIG_CRYPTO_BLKCIPHER=m
+CONFIG_CRYPTO_BLKCIPHER2=y
 CONFIG_CRYPTO_ECB=m
-CONFIG_CRYPTO_HASH2=y
 CONFIG_CRYPTO_HASH=m
-CONFIG_CRYPTO_MANAGER2=y
+CONFIG_CRYPTO_HASH2=y
 CONFIG_CRYPTO_MANAGER=m
+CONFIG_CRYPTO_MANAGER2=y
 CONFIG_CRYPTO_MICHAEL_MIC=m
 CONFIG_CRYPTO_RNG2=y
 CONFIG_CRYPTO_WORKQUEUE=y
-CONFIG_CSRC_R4K_LIB=y
 CONFIG_CSRC_R4K=y
+CONFIG_CSRC_R4K_LIB=y
 CONFIG_DECOMPRESS_LZMA=y
 CONFIG_DEVPORT=y
 # CONFIG_DM9000 is not set
@@ -106,8 +106,8 @@ CONFIG_ELF_CORE=y
 CONFIG_FIRMWARE_IN_KERNEL=y
 CONFIG_FS_POSIX_ACL=y
 CONFIG_GENERIC_ACL=y
-CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
 CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
 CONFIG_GENERIC_CMOS_UPDATE=y
 CONFIG_GENERIC_FIND_LAST_BIT=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y
@@ -127,33 +127,33 @@ CONFIG_HAVE_MLOCK=y
 CONFIG_HAVE_OPROFILE=y
 CONFIG_HID=m
 CONFIG_HID_SUPPORT=y
-# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
-CONFIG_HOSTAP_FIRMWARE=y
 CONFIG_HOSTAP=m
+CONFIG_HOSTAP_FIRMWARE=y
+# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
 CONFIG_HOSTAP_PCI=m
 CONFIG_HW_HAS_PCI=y
 CONFIG_HW_RANDOM=y
-# CONFIG_HZ_100 is not set
 CONFIG_HZ=250
+# CONFIG_HZ_100 is not set
 CONFIG_HZ_250=y
 CONFIG_IMAGE_CMDLINE_HACK=y
 CONFIG_INITRAMFS_SOURCE=""
-CONFIG_INOTIFY_USER=y
 CONFIG_INOTIFY=y
-# CONFIG_INPUT_GPIO_BUTTONS is not set
+CONFIG_INOTIFY_USER=y
 CONFIG_INPUT=m
+# CONFIG_INPUT_GPIO_BUTTONS is not set
 # CONFIG_INPUT_YEALINK is not set
 CONFIG_IRQ_CPU=y
 CONFIG_KEXEC=y
 CONFIG_LEDS_GPIO=m
 CONFIG_LEDS_TRIGGER_ADM5120_SWITCH=m
-CONFIG_LEGACY_PTY_COUNT=256
 CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
 # CONFIG_LEMOTE_FULONG is not set
+CONFIG_LIB80211=m
 CONFIG_LIB80211_CRYPT_CCMP=m
 CONFIG_LIB80211_CRYPT_TKIP=m
 CONFIG_LIB80211_CRYPT_WEP=m
-CONFIG_LIB80211=m
 # CONFIG_MACH_ALCHEMY is not set
 # CONFIG_MACH_DECSTATION is not set
 # CONFIG_MACH_JAZZ is not set
@@ -162,8 +162,8 @@ CONFIG_LIB80211=m
 # CONFIG_MACH_VR41XX is not set
 CONFIG_MII=m
 # CONFIG_MIKROTIK_RB532 is not set
+CONFIG_MIPS=y
 # CONFIG_MIPS_COBALT is not set
-# CONFIG_MIPS_FPU_EMU is not set
 CONFIG_MIPS_L1_CACHE_SHIFT=5
 CONFIG_MIPS_MACHINE=y
 # CONFIG_MIPS_MALTA is not set
@@ -171,7 +171,6 @@ CONFIG_MIPS_MT_DISABLED=y
 # CONFIG_MIPS_MT_SMP is not set
 # CONFIG_MIPS_MT_SMTC is not set
 # CONFIG_MIPS_SIM is not set
-CONFIG_MIPS=y
 CONFIG_MODULE_FORCE_UNLOAD=y
 CONFIG_MTD_ADM5120=y
 CONFIG_MTD_CFI_FIXUP_MACRONIX_BOOTLOC=y
@@ -179,8 +178,8 @@ CONFIG_MTD_CFI_FIXUP_MACRONIX_BOOTLOC=y
 CONFIG_MTD_CMDLINE_PARTS=y
 CONFIG_MTD_JEDECPROBE=y
 CONFIG_MTD_MYLOADER_PARTS=y
-CONFIG_MTD_NAND_PLATFORM=y
 CONFIG_MTD_NAND=y
+CONFIG_MTD_NAND_PLATFORM=y
 CONFIG_MTD_TRXSPLIT=y
 CONFIG_NO_HZ=y
 # CONFIG_NO_IOPORT is not set
@@ -199,18 +198,18 @@ CONFIG_PCI_DOMAINS=y
 CONFIG_SCHED_OMIT_FRAME_POINTER=y
 CONFIG_SCSI=m
 # CONFIG_SERIAL_8250 is not set
+CONFIG_SERIAL_AMBA_PL010=y
 CONFIG_SERIAL_AMBA_PL010_CONSOLE=y
 CONFIG_SERIAL_AMBA_PL010_NUMPORTS=2
 CONFIG_SERIAL_AMBA_PL010_PORTNAME="ttyS"
-CONFIG_SERIAL_AMBA_PL010=y
 # CONFIG_SERIAL_AMBA_PL011 is not set
+CONFIG_SERIO=y
 # CONFIG_SERIO_AMBAKMI is not set
 # CONFIG_SERIO_I8042 is not set
 # CONFIG_SERIO_LIBPS2 is not set
 # CONFIG_SERIO_PCIPS2 is not set
 # CONFIG_SERIO_RAW is not set
 CONFIG_SERIO_SERPORT=y
-CONFIG_SERIO=y
 # CONFIG_SGI_IP22 is not set
 # CONFIG_SGI_IP27 is not set
 # CONFIG_SGI_IP28 is not set
@@ -238,9 +237,9 @@ CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
 CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_TRACING_SUPPORT=y
 CONFIG_TRAD_SIGNALS=y
+CONFIG_USB=m
 CONFIG_USB_ADM5120_HCD=m
 CONFIG_USB_EHCI_HCD=m
-CONFIG_USB=m
 # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
 # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
 CONFIG_USB_OHCI_HCD=m

target/linux/adm5120/router_le/config-2.6.32

@@ -1,9 +1,10 @@
 CONFIG_32BIT=y
 # CONFIG_64BIT is not set
+CONFIG_ADM5120=y
 CONFIG_ADM5120_ENET=y
 CONFIG_ADM5120_MACH_5GXI=y
-CONFIG_ADM5120_MACH_BR_6104KP=y
 CONFIG_ADM5120_MACH_BR_6104K=y
+CONFIG_ADM5120_MACH_BR_6104KP=y
 CONFIG_ADM5120_MACH_BR_61X4WG=y
 CONFIG_ADM5120_MACH_CAS_771=y
 CONFIG_ADM5120_MACH_EASY5120P_ATA=y
@@ -15,8 +16,8 @@ CONFIG_ADM5120_MACH_NP27G=y
 CONFIG_ADM5120_MACH_NP28G=y
 CONFIG_ADM5120_MACH_PMUGW=y
 CONFIG_ADM5120_MACH_RB_11X=y
-CONFIG_ADM5120_MACH_RB_133C=y
 CONFIG_ADM5120_MACH_RB_133=y
+CONFIG_ADM5120_MACH_RB_133C=y
 CONFIG_ADM5120_MACH_RB_150=y
 CONFIG_ADM5120_MACH_RB_153=y
 CONFIG_ADM5120_MACH_RB_192=y
@@ -31,7 +32,6 @@ CONFIG_ADM5120_OEM_OSBRIDGE=y
 # CONFIG_ADM5120_OEM_ZYXEL is not set
 CONFIG_ADM5120_SOC_BGA=y
 CONFIG_ADM5120_WDT=y
-CONFIG_ADM5120=y
 # CONFIG_ALCHEMY_GPIO_INDIRECT is not set
 # CONFIG_AR7 is not set
 # CONFIG_ARCH_HAS_ILOG2_U32 is not set
@@ -50,8 +50,8 @@ CONFIG_BITREVERSE=y
 # CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD is not set
 # CONFIG_CAVIUM_OCTEON_SIMULATOR is not set
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-CONFIG_CEVT_R4K_LIB=y
 CONFIG_CEVT_R4K=y
+CONFIG_CEVT_R4K_LIB=y
 CONFIG_CFG80211_DEFAULT_PS_VALUE=0
 CONFIG_CMDLINE="console=ttyS0,115200 rootfstype=squashfs,yaffs2,jffs2"
 # CONFIG_CPU_BIG_ENDIAN is not set
@@ -60,9 +60,9 @@ CONFIG_CPU_HAS_PREFETCH=y
 CONFIG_CPU_HAS_SYNC=y
 CONFIG_CPU_LITTLE_ENDIAN=y
 # CONFIG_CPU_LOONGSON2E is not set
+CONFIG_CPU_MIPS32=y
 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
@@ -87,18 +87,18 @@ CONFIG_CPU_SUPPORTS_HIGHMEM=y
 CONFIG_CRYPTO_AEAD2=y
 CONFIG_CRYPTO_AES=m
 CONFIG_CRYPTO_ARC4=m
-CONFIG_CRYPTO_BLKCIPHER2=y
 CONFIG_CRYPTO_BLKCIPHER=m
+CONFIG_CRYPTO_BLKCIPHER2=y
 CONFIG_CRYPTO_ECB=m
-CONFIG_CRYPTO_HASH2=y
 CONFIG_CRYPTO_HASH=m
-CONFIG_CRYPTO_MANAGER2=y
+CONFIG_CRYPTO_HASH2=y
 CONFIG_CRYPTO_MANAGER=m
+CONFIG_CRYPTO_MANAGER2=y
 CONFIG_CRYPTO_MICHAEL_MIC=m
 CONFIG_CRYPTO_RNG2=y
 CONFIG_CRYPTO_WORKQUEUE=y
-CONFIG_CSRC_R4K_LIB=y
 CONFIG_CSRC_R4K=y
+CONFIG_CSRC_R4K_LIB=y
 CONFIG_DECOMPRESS_LZMA=y
 CONFIG_DEVPORT=y
 # CONFIG_DM9000 is not set
@@ -109,8 +109,8 @@ CONFIG_ELF_CORE=y
 CONFIG_FIRMWARE_IN_KERNEL=y
 CONFIG_FS_POSIX_ACL=y
 CONFIG_GENERIC_ACL=y
-CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
 CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
 CONFIG_GENERIC_CMOS_UPDATE=y
 CONFIG_GENERIC_FIND_LAST_BIT=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y
@@ -130,32 +130,32 @@ CONFIG_HAVE_IDE=y
 CONFIG_HAVE_OPROFILE=y
 CONFIG_HID=m
 CONFIG_HID_SUPPORT=y
-# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
-CONFIG_HOSTAP_FIRMWARE=y
 CONFIG_HOSTAP=m
+CONFIG_HOSTAP_FIRMWARE=y
+# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
 CONFIG_HOSTAP_PCI=m
 CONFIG_HW_HAS_PCI=y
 CONFIG_HW_RANDOM=y
-# CONFIG_HZ_100 is not set
 CONFIG_HZ=250
+# CONFIG_HZ_100 is not set
 CONFIG_HZ_250=y
 CONFIG_IMAGE_CMDLINE_HACK=y
 CONFIG_INITRAMFS_SOURCE=""
-CONFIG_INOTIFY_USER=y
 CONFIG_INOTIFY=y
-# CONFIG_INPUT_GPIO_BUTTONS is not set
+CONFIG_INOTIFY_USER=y
 CONFIG_INPUT=m
+# CONFIG_INPUT_GPIO_BUTTONS is not set
 # CONFIG_INPUT_YEALINK is not set
 CONFIG_IRQ_CPU=y
 CONFIG_KEXEC=y
 CONFIG_LEDS_GPIO=m
 CONFIG_LEDS_TRIGGER_ADM5120_SWITCH=m
-CONFIG_LEGACY_PTY_COUNT=256
 CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
+CONFIG_LIB80211=m
 CONFIG_LIB80211_CRYPT_CCMP=m
 CONFIG_LIB80211_CRYPT_TKIP=m
 CONFIG_LIB80211_CRYPT_WEP=m
-CONFIG_LIB80211=m
 # CONFIG_MACH_ALCHEMY is not set
 # CONFIG_MACH_DECSTATION is not set
 # CONFIG_MACH_JAZZ is not set
@@ -165,6 +165,7 @@ CONFIG_LIB80211=m
 # CONFIG_MACH_VR41XX is not set
 CONFIG_MII=m
 # CONFIG_MIKROTIK_RB532 is not set
+CONFIG_MIPS=y
 # CONFIG_MIPS_COBALT is not set
 CONFIG_MIPS_L1_CACHE_SHIFT=5
 CONFIG_MIPS_MACHINE=y
@@ -173,7 +174,6 @@ CONFIG_MIPS_MT_DISABLED=y
 # CONFIG_MIPS_MT_SMP is not set
 # CONFIG_MIPS_MT_SMTC is not set
 # CONFIG_MIPS_SIM is not set
-CONFIG_MIPS=y
 CONFIG_MODULE_FORCE_UNLOAD=y
 CONFIG_MTD_ADM5120=y
 CONFIG_MTD_CFI_FIXUP_MACRONIX_BOOTLOC=y
@@ -181,8 +181,8 @@ CONFIG_MTD_CFI_FIXUP_MACRONIX_BOOTLOC=y
 CONFIG_MTD_CMDLINE_PARTS=y
 CONFIG_MTD_JEDECPROBE=y
 CONFIG_MTD_MYLOADER_PARTS=y
-CONFIG_MTD_NAND_PLATFORM=y
 CONFIG_MTD_NAND=y
+CONFIG_MTD_NAND_PLATFORM=y
 CONFIG_MTD_TRXSPLIT=y
 CONFIG_NLS=m
 CONFIG_NO_HZ=y
@@ -202,18 +202,18 @@ CONFIG_PCI_DOMAINS=y
 CONFIG_SCHED_OMIT_FRAME_POINTER=y
 CONFIG_SCSI=m
 # CONFIG_SERIAL_8250 is not set
+CONFIG_SERIAL_AMBA_PL010=y
 CONFIG_SERIAL_AMBA_PL010_CONSOLE=y
 CONFIG_SERIAL_AMBA_PL010_NUMPORTS=2
 CONFIG_SERIAL_AMBA_PL010_PORTNAME="ttyS"
-CONFIG_SERIAL_AMBA_PL010=y
 # CONFIG_SERIAL_AMBA_PL011 is not set
+CONFIG_SERIO=y
 # CONFIG_SERIO_AMBAKMI is not set
 # CONFIG_SERIO_I8042 is not set
 # CONFIG_SERIO_LIBPS2 is not set
 # CONFIG_SERIO_PCIPS2 is not set
 # CONFIG_SERIO_RAW is not set
 CONFIG_SERIO_SERPORT=y
-CONFIG_SERIO=y
 # CONFIG_SGI_IP22 is not set
 # CONFIG_SGI_IP27 is not set
 # CONFIG_SGI_IP28 is not set
@@ -241,9 +241,9 @@ CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_TRAD_SIGNALS=y
 # CONFIG_TREE_PREEMPT_RCU is not set
 CONFIG_TREE_RCU=y
+CONFIG_USB=m
 CONFIG_USB_ADM5120_HCD=m
 CONFIG_USB_EHCI_HCD=m
-CONFIG_USB=m
 # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
 # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
 CONFIG_USB_OHCI_HCD=m

target/linux/ar7/patches-2.6.32/100-board_support.patch

@@ -0,0 +1,28 @@
+--- a/arch/mips/kernel/traps.c
++++ b/arch/mips/kernel/traps.c
+@@ -1256,9 +1256,22 @@ void *set_except_vector(int n, void *add
+ 
+ 	exception_handlers[n] = handler;
+ 	if (n == 0 && cpu_has_divec) {
+-		*(u32 *)(ebase + 0x200) = 0x08000000 |
+-					  (0x03ffffff & (handler >> 2));
+-		local_flush_icache_range(ebase + 0x200, ebase + 0x204);
++		if ((handler ^ (ebase + 4)) & 0xfc000000) {
++			/* lui k0, 0x0000 */
++			*(u32 *)(ebase + 0x200) = 0x3c1a0000 | (handler >> 16);
++			/* ori k0, 0x0000 */
++			*(u32 *)(ebase + 0x204) =
++					0x375a0000 | (handler & 0xffff);
++			/* jr k0 */
++			*(u32 *)(ebase + 0x208) = 0x03400008;
++			/* nop */
++			*(u32 *)(ebase + 0x20C) = 0x00000000;
++			flush_icache_range(ebase + 0x200, ebase + 0x210);
++		} else {
++			*(u32 *)(ebase + 0x200) =
++				0x08000000 | (0x03ffffff & (handler >> 2));
++			flush_icache_range(ebase + 0x200, ebase + 0x204);
++		}
+ 	}
+ 	return (void *)old_handler;
+ }

target/linux/ar71xx/base-files/etc/defconfig/tl-wr1043nd/network

@@ -0,0 +1,31 @@
+config 'interface' 'loopback'
+       option 'ifname'   'lo'
+       option 'proto'    'static'
+       option 'ipaddr'   '127.0.0.1'
+       option 'netmask'  '255.0.0.0'
+
+config 'interface' 'lan'
+        option 'ifname'   'eth0.1'
+        option 'type'     'bridge'
+        option 'proto'    'static'
+        option 'ipaddr'   '192.168.1.1'
+        option 'netmask'  '255.255.255.0'
+
+config 'interface' 'wan'
+        option 'ifname' 'eth0.2'
+        option 'proto' 'dhcp'
+
+config 'switch'
+	option 'name' 'rtl8366rb'
+        option 'reset' '1'
+        option 'enable_vlan' '1'
+
+config 'switch_vlan'
+        option 'device' 'rtl8366rb'
+        option 'vlan' '1'
+        option 'ports' '1 2 3 4 5t'
+
+config 'switch_vlan'
+        option 'device' 'rtl8366rb'
+        option 'vlan' '2'
+        option 'ports' '0 5t'

target/linux/ar71xx/base-files/etc/defconfig/wndr3700/network

@@ -19,8 +19,53 @@ config switch
 	option name	rtl8366s
 	option reset	1
 	option enable_vlan 1
+	# Blinkrate: 0=43ms; 1=84ms; 2=120ms; 3=170ms; 4=340ms; 5=670ms
+	option blinkrate	2
 
 config switch_vlan
 	option device	rtl8366s
 	option vlan 	0
 	option ports	"0 1 2 3 5"
+
+config switch_port
+	# Port 1 controls the GREEN configuration of LEDs for
+	# the switch and the section does not correspond to a real
+	# switch port.
+	#
+	# 0=LED off; 1=Collision/FDX; 2=Link/activity; 3-1000MB/s
+	# 4=100 MB/s; 5=10 MB/s; 6=1000 MB/s+activity; 7=100 MB/s+activity
+	# 8=10 MB/s+activity; 9=10/100 Mb/s+activity; 10: Fiber;
+	# 11: Fault; 12: Link/activity(tx); 13: Link/activity(rx);
+	# 14: Link (master); 15: separate register
+	
+	option device		rtl8366s
+	option port		1
+	option led		9
+	
+config switch_port
+	# Port 2 controls the ORANGE configuration of LEDs for
+	# the switch and the section does not correspond to a real
+	# switch port.
+	#
+	# See the key above for switch port 1 for the meaning of the
+	# 'led' setting below.
+	
+	option device		rtl8366s
+	option port		2
+	option led		6
+
+
+config switch_port                                              
+	# Port 5 controls the configuration of the WAN LED and the
+	# section does not correspond to a real switch port.
+	#
+	# To toggle the use of green or orange LEDs for the WAN port,
+	# see the LED setting for wndr3700:green:wan in /etc/config/system.
+	#
+	# See the key above for switch port 1 for the meaning of the
+	# 'led' setting below.
+
+	option device		rtl8366s
+	option port		5
+	option led		6
+

target/linux/ar71xx/base-files/etc/diag.sh

@@ -91,7 +91,7 @@ get_status_led() {
 		status_led="wp543:green:diag"
 		;;
 	wrt400n)
-		status_led="wrt400n:blue:status"
+		status_led="wrt400n:green:status"
 		;;
 	wrt160nl)
 		status_led="wrt160nl:blue:wps"

target/linux/ar71xx/base-files/etc/uci-defaults/wndr3700

@@ -0,0 +1,22 @@
+#!/bin/sh
+#
+# Copyright (C) 2010 OpenWrt.org
+#
+
+. /lib/ar71xx.sh
+
+board=$(ar71xx_board_name)
+
+wndr3700_set_wan_led() {
+	uci batch <<EOF
+set system.wan_led=led
+set system.wan_led.sysfs='wndr3700:green:wan'
+set system.wan_led.name='WAN LED (green)'
+set system.wan_led.default='0'
+commit system
+EOF
+}
+
+if [ "${board}" == "wndr3700" ]; then
+	wndr3700_set_wan_led
+fi

target/linux/ar71xx/config-2.6.32

@@ -1,10 +1,12 @@
 CONFIG_32BIT=y
 # CONFIG_64BIT is not set
-CONFIG_AG71XX_AR8216_SUPPORT=y
-# CONFIG_AG71XX_DEBUG_FS is not set
-# CONFIG_AG71XX_DEBUG is not set
 CONFIG_AG71XX=y
+CONFIG_AG71XX_AR8216_SUPPORT=y
+# CONFIG_AG71XX_DEBUG is not set
+# CONFIG_AG71XX_DEBUG_FS is not set
 # CONFIG_ALCHEMY_GPIO_INDIRECT is not set
+# CONFIG_AR7 is not set
+CONFIG_AR71XX_DEV_AP91_ETH=y
 CONFIG_AR71XX_DEV_AP91_PCI=y
 CONFIG_AR71XX_DEV_AP94_PCI=y
 CONFIG_AR71XX_DEV_AR913X_WMAC=y
@@ -39,7 +41,6 @@ CONFIG_AR71XX_MACH_WRT400N=y
 CONFIG_AR71XX_MACH_WZR_HP_G300NH=y
 CONFIG_AR71XX_NVRAM=y
 CONFIG_AR71XX_WDT=y
-# CONFIG_AR7 is not set
 # CONFIG_ARCH_HAS_ILOG2_U32 is not set
 # CONFIG_ARCH_HAS_ILOG2_U64 is not set
 CONFIG_ARCH_HIBERNATION_POSSIBLE=y
@@ -55,8 +56,8 @@ CONFIG_BITREVERSE=y
 # CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD is not set
 # CONFIG_CAVIUM_OCTEON_SIMULATOR is not set
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-CONFIG_CEVT_R4K_LIB=y
 CONFIG_CEVT_R4K=y
+CONFIG_CEVT_R4K_LIB=y
 CONFIG_CFG80211_DEFAULT_PS_VALUE=0
 CONFIG_CMDLINE="rootfstype=squashfs,yaffs,jffs2 noinitrd console=ttyS0,115200"
 CONFIG_CPU_BIG_ENDIAN=y
@@ -65,9 +66,9 @@ CONFIG_CPU_HAS_PREFETCH=y
 CONFIG_CPU_HAS_SYNC=y
 # CONFIG_CPU_LITTLE_ENDIAN is not set
 # CONFIG_CPU_LOONGSON2E is not set
+CONFIG_CPU_MIPS32=y
 # CONFIG_CPU_MIPS32_R1 is not set
 CONFIG_CPU_MIPS32_R2=y
-CONFIG_CPU_MIPS32=y
 # CONFIG_CPU_MIPS64_R1 is not set
 # CONFIG_CPU_MIPS64_R2 is not set
 CONFIG_CPU_MIPSR2=y
@@ -89,8 +90,8 @@ CONFIG_CPU_SUPPORTS_HIGHMEM=y
 # CONFIG_CPU_TX39XX is not set
 # CONFIG_CPU_TX49XX is not set
 # CONFIG_CPU_VR41XX is not set
-CONFIG_CSRC_R4K_LIB=y
 CONFIG_CSRC_R4K=y
+CONFIG_CSRC_R4K_LIB=y
 CONFIG_DECOMPRESS_LZMA=y
 CONFIG_DEVPORT=y
 # CONFIG_DM9000 is not set
@@ -98,8 +99,8 @@ CONFIG_DMA_NEED_PCI_MAP_STATE=y
 CONFIG_DMA_NONCOHERENT=y
 CONFIG_EARLY_PRINTK=y
 # CONFIG_FSNOTIFY is not set
-CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
 CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
 CONFIG_GENERIC_CMOS_UPDATE=y
 CONFIG_GENERIC_FIND_LAST_BIT=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y
@@ -119,10 +120,10 @@ CONFIG_HAVE_IDE=y
 CONFIG_HAVE_OPROFILE=y
 CONFIG_HW_HAS_PCI=y
 # CONFIG_HW_RANDOM is not set
+CONFIG_I2C=y
 CONFIG_I2C_ALGOBIT=y
 CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_GPIO=y
-CONFIG_I2C=y
 CONFIG_ICPLUS_PHY=y
 CONFIG_IMAGE_CMDLINE_HACK=y
 # CONFIG_INITRAMFS_COMPRESSION_LZO is not set
@@ -142,6 +143,7 @@ CONFIG_IRQ_CPU=y
 # CONFIG_MACH_VR41XX is not set
 CONFIG_MICREL_PHY=y
 # CONFIG_MIKROTIK_RB532 is not set
+CONFIG_MIPS=y
 # CONFIG_MIPS_COBALT is not set
 CONFIG_MIPS_L1_CACHE_SHIFT=5
 CONFIG_MIPS_MACHINE=y
@@ -150,19 +152,19 @@ CONFIG_MIPS_MT_DISABLED=y
 # CONFIG_MIPS_MT_SMP is not set
 # CONFIG_MIPS_MT_SMTC is not set
 # CONFIG_MIPS_SIM is not set
-CONFIG_MIPS=y
 CONFIG_MTD_AR91XX_FLASH=y
 # CONFIG_MTD_CFI_INTELEXT is not set
 CONFIG_MTD_CMDLINE_PARTS=y
 CONFIG_MTD_JEDECPROBE=y
 CONFIG_MTD_M25P80=y
 CONFIG_MTD_MYLOADER_PARTS=y
-CONFIG_MTD_NAND_RB4XX=y
 CONFIG_MTD_NAND=y
+CONFIG_MTD_NAND_RB4XX=y
 CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-2
 CONFIG_MTD_REDBOOT_PARTS=y
 CONFIG_MTD_WRT160NL_PARTS=y
 CONFIG_MYLOADER=y
+CONFIG_NET_DSA=y
 CONFIG_NET_DSA_MV88E6060=y
 CONFIG_NET_DSA_MV88E6063=y
 # CONFIG_NET_DSA_MV88E6123_61_65 is not set
@@ -172,7 +174,6 @@ CONFIG_NET_DSA_MV88E6063=y
 # CONFIG_NET_DSA_TAG_DSA is not set
 # CONFIG_NET_DSA_TAG_EDSA is not set
 CONFIG_NET_DSA_TAG_TRAILER=y
-CONFIG_NET_DSA=y
 # CONFIG_NO_IOPORT is not set
 # CONFIG_NXP_STB220 is not set
 # CONFIG_NXP_STB225 is not set
@@ -186,8 +187,9 @@ CONFIG_PHYLIB=y
 # CONFIG_PNX8550_STB810 is not set
 # CONFIG_PROBE_INITRD_HEADER is not set
 CONFIG_RTL8306_PHY=y
-CONFIG_RTL8366_SMI=y
+CONFIG_RTL8366RB_PHY=y
 CONFIG_RTL8366S_PHY=y
+CONFIG_RTL8366_SMI=y
 CONFIG_SCHED_OMIT_FRAME_POINTER=y
 # CONFIG_SCSI_DMA is not set
 # CONFIG_SERIAL_8250_EXTENDED is not set
@@ -207,6 +209,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=1
 # CONFIG_SIBYTE_SWARM is not set
 # CONFIG_SLAB is not set
 CONFIG_SLUB=y
+CONFIG_SPI=y
 CONFIG_SPI_AP83=y
 CONFIG_SPI_AR71XX=y
 CONFIG_SPI_BITBANG=y
@@ -215,7 +218,6 @@ CONFIG_SPI_MASTER=y
 CONFIG_SPI_PB44=y
 # CONFIG_SPI_SPIDEV is not set
 # CONFIG_SPI_VSC7385 is not set
-CONFIG_SPI=y
 CONFIG_SWCONFIG=y
 CONFIG_SYS_HAS_CPU_MIPS32_R1=y
 CONFIG_SYS_HAS_CPU_MIPS32_R2=y

target/linux/ar71xx/files/arch/mips/ar71xx/Kconfig

@@ -21,10 +21,12 @@ config AR71XX_MACH_AP83
 
 config AR71XX_MACH_DIR_600_A1
 	bool "D-Link DIR-600 rev. A1 support"
+	select AR71XX_DEV_AP91_ETH
 	select AR71XX_DEV_AP91_PCI if PCI
 	select AR71XX_DEV_M25P80
 	select AR71XX_DEV_GPIO_BUTTONS
 	select AR71XX_DEV_LEDS_GPIO
+	select AR71XX_NVRAM
 	default n
 
 config AR71XX_MACH_DIR_615_C1
@@ -148,6 +150,7 @@ config AR71XX_MACH_MZK_W300NH
 config AR71XX_MACH_TL_WR741ND
 	bool "TP-LINK TL-WR741ND support"
 	select AR71XX_DEV_M25P80
+	select AR71XX_DEV_AP91_ETH
 	select AR71XX_DEV_AP91_PCI if PCI
 	select AR71XX_DEV_GPIO_BUTTONS
 	select AR71XX_DEV_LEDS_GPIO
@@ -207,6 +210,9 @@ config AR71XX_DEV_M25P80
 config AR71XX_DEV_AP91_PCI
 	def_bool n
 
+config AR71XX_DEV_AP91_ETH
+	def_bool n
+
 config AR71XX_DEV_AP94_PCI
 	def_bool n
 

target/linux/ar71xx/files/arch/mips/ar71xx/Makefile

@@ -13,6 +13,7 @@ obj-y	:= prom.o irq.o setup.o devices.o gpio.o ar71xx.o
 obj-$(CONFIG_EARLY_PRINTK)		+= early_printk.o
 obj-$(CONFIG_PCI)			+= pci.o
 
+obj-$(CONFIG_AR71XX_DEV_AP91_ETH)	+= dev-ap91-eth.o
 obj-$(CONFIG_AR71XX_DEV_AP91_PCI)	+= dev-ap91-pci.o
 obj-$(CONFIG_AR71XX_DEV_AP94_PCI)	+= dev-ap94-pci.o
 obj-$(CONFIG_AR71XX_DEV_AR913X_WMAC)	+= dev-ar913x-wmac.o

target/linux/ar71xx/files/arch/mips/ar71xx/dev-ap91-eth.c

@@ -0,0 +1,39 @@
+/*
+ *  Atheros AP91 reference board ethernet initialization
+ *
+ *  Copyright (C) 2010 Gabor Juhos <juhosg@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include "devices.h"
+
+void __init ap91_eth_init(u8 *mac_addr)
+{
+	if (mac_addr)
+		ar71xx_set_mac_base(mac_addr);
+
+	/* WAN port */
+	ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
+	ar71xx_eth0_data.phy_mask = 0x0;
+	ar71xx_eth0_data.speed = SPEED_100;
+	ar71xx_eth0_data.duplex = DUPLEX_FULL;
+	ar71xx_eth0_data.fifo_cfg1 = 0x0fff0000;
+	ar71xx_eth0_data.fifo_cfg2 = 0x00001fff;
+	ar71xx_eth0_data.fifo_cfg3 = 0x008001ff;
+
+	/* LAN ports */
+	ar71xx_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
+	ar71xx_eth1_data.phy_mask = 0x0;
+	ar71xx_eth1_data.speed = SPEED_1000;
+	ar71xx_eth1_data.duplex = DUPLEX_FULL;
+	ar71xx_eth1_data.fifo_cfg1 = 0x0fff0000;
+	ar71xx_eth1_data.fifo_cfg2 = 0x00001fff;
+	ar71xx_eth1_data.fifo_cfg3 = 0x008001ff;
+
+	ar71xx_add_device_mdio(0x0);
+	ar71xx_add_device_eth(1);
+	ar71xx_add_device_eth(0);
+}

target/linux/ar71xx/files/arch/mips/ar71xx/dev-ap91-eth.h

@@ -0,0 +1,21 @@
+/*
+ *  Atheros AP91 reference board ethernet initialization
+ *
+ *  Copyright (C) 2010 Gabor Juhos <juhosg@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#ifndef _AR71XX_DEV_AP91_ETH_H
+#define _AR71XX_DEV_AP91_ETH_H
+
+#if defined(CONFIG_AR71XX_DEV_AP91_ETH)
+void ap91_eth_init(u8 *mac_addr) __init;
+#else
+static inline void ap91_eth_init(u8 *mac_addr) { }
+#endif
+
+#endif /* _AR71XX_DEV_AP91_ETH_H */
+

target/linux/ar71xx/files/arch/mips/ar71xx/mach-dir-600-a1.c

@@ -16,9 +16,11 @@
 #include "machtype.h"
 #include "devices.h"
 #include "dev-m25p80.h"
+#include "dev-ap91-eth.h"
 #include "dev-ap91-pci.h"
 #include "dev-gpio-buttons.h"
 #include "dev-leds-gpio.h"
+#include "nvram.h"
 
 #define DIR_600_A1_GPIO_LED_WPS			0
 #define DIR_600_A1_GPIO_LED_POWER_AMBER		1
@@ -29,6 +31,9 @@
 
 #define DIR_600_A1_BUTTONS_POLL_INTERVAL	20
 
+#define DIR_600_A1_NVRAM_ADDR	0x1f030000
+#define DIR_600_A1_NVRAM_SIZE	0x10000
+
 #ifdef CONFIG_MTD_PARTITIONS
 static struct mtd_partition dir_600_a1_partitions[] = {
 	{
@@ -107,32 +112,14 @@ static struct gpio_button dir_600_a1_gpio_buttons[] __initdata = {
 
 static void __init dir_600_a1_setup(void)
 {
-	u8 *mac = (u8 *) KSEG1ADDR(0x1fff0000);
+	const char *nvram = (char *) KSEG1ADDR(DIR_600_A1_NVRAM_ADDR);
 	u8 *ee = (u8 *) KSEG1ADDR(0x1fff1000);
+	u8 mac_buff[6];
+	u8 *mac = NULL;
 
-	ar71xx_set_mac_base(mac);
+	if (nvram_parse_mac_addr(nvram, DIR_600_A1_NVRAM_SIZE,
-	ar71xx_add_device_mdio(0x0);
+			         "lan_mac=", mac_buff) == 0)
-
+		mac = mac_buff;
-	/* WAN port */
-	ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
-	ar71xx_eth0_data.phy_mask = 0x0;
-	ar71xx_eth0_data.speed = SPEED_100;
-	ar71xx_eth0_data.duplex = DUPLEX_FULL;
-	ar71xx_eth0_data.fifo_cfg1 = 0x0fff0000;
-	ar71xx_eth0_data.fifo_cfg2 = 0x00001fff;
-	ar71xx_eth0_data.fifo_cfg3 = 0x008001ff;
-
-	/* LAN ports */
-	ar71xx_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
-	ar71xx_eth1_data.phy_mask = 0x0;
-	ar71xx_eth1_data.speed = SPEED_1000;
-	ar71xx_eth1_data.duplex = DUPLEX_FULL;
-	ar71xx_eth1_data.fifo_cfg1 = 0x0fff0000;
-	ar71xx_eth1_data.fifo_cfg2 = 0x00001fff;
-	ar71xx_eth1_data.fifo_cfg3 = 0x008001ff;
-
-	ar71xx_add_device_eth(1);
-	ar71xx_add_device_eth(0);
 
 	ar71xx_add_device_m25p80(&dir_600_a1_flash_data);
 
@@ -143,7 +130,8 @@ static void __init dir_600_a1_setup(void)
 					ARRAY_SIZE(dir_600_a1_gpio_buttons),
 					dir_600_a1_gpio_buttons);
 
-	ap91_pci_init(ee, NULL);
+	ap91_eth_init(mac);
+	ap91_pci_init(ee, mac);
 }
 
 MIPS_MACHINE(AR71XX_MACH_DIR_600_A1, "DIR-600-A1", "D-Link DIR-600 rev. A1",

target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr1043nd.c

@@ -10,7 +10,8 @@
 
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
-
+#include <linux/platform_device.h>
+#include <linux/rtl8366rb.h>
 #include <asm/mach-ar71xx/ar71xx.h>
 
 #include "machtype.h"
@@ -29,6 +30,9 @@
 #define TL_WR1043ND_GPIO_BTN_RESET      3
 #define TL_WR1043ND_GPIO_BTN_QSS        7
 
+#define TL_WR1043ND_GPIO_RTL8366_SDA	18
+#define TL_WR1043ND_GPIO_RTL8366_SCK	19
+
 #define TL_WR1043ND_BUTTONS_POLL_INTERVAL     20
 
 #ifdef CONFIG_MTD_PARTITIONS
@@ -104,6 +108,19 @@ static struct gpio_button tl_wr1043nd_gpio_buttons[] __initdata = {
 	}
 };
 
+static struct rtl8366rb_platform_data tl_wr1043nd_rtl8366rb_data = {
+	.gpio_sda        = TL_WR1043ND_GPIO_RTL8366_SDA,
+	.gpio_sck        = TL_WR1043ND_GPIO_RTL8366_SCK,
+};
+
+static struct platform_device tl_wr1043nd_rtl8366rb_device = {
+	.name		= RTL8366RB_DRIVER_NAME,
+	.id		= -1,
+	.dev = {
+		.platform_data	= &tl_wr1043nd_rtl8366rb_data,
+	}
+};
+
 static void __init tl_wr1043nd_setup(void)
 {
 	u8 *mac = (u8 *) KSEG1ADDR(0x1f01fc00);
@@ -111,12 +128,12 @@ static void __init tl_wr1043nd_setup(void)
 
 	ar71xx_set_mac_base(mac);
 
-	ar71xx_add_device_mdio(0x0);
+	ar71xx_eth0_data.mii_bus_dev = &tl_wr1043nd_rtl8366rb_device.dev;
-
 	ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
 	ar71xx_eth0_data.phy_mask = 0x0;
 	ar71xx_eth0_data.speed = SPEED_1000;
 	ar71xx_eth0_data.duplex = DUPLEX_FULL;
+	ar71xx_eth0_pll_data.pll_1000 = 0x1a000000;
 
 	ar71xx_add_device_eth(0);
 
@@ -127,9 +144,12 @@ static void __init tl_wr1043nd_setup(void)
 	ar71xx_add_device_leds_gpio(-1, ARRAY_SIZE(tl_wr1043nd_leds_gpio),
 					tl_wr1043nd_leds_gpio);
 
+	platform_device_register(&tl_wr1043nd_rtl8366rb_device);
+
 	ar71xx_add_device_gpio_buttons(-1, TL_WR1043ND_BUTTONS_POLL_INTERVAL,
 					ARRAY_SIZE(tl_wr1043nd_gpio_buttons),
 					tl_wr1043nd_gpio_buttons);
+
 	ar913x_add_device_wmac(eeprom, mac);
 }
 

target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr741nd.c

@@ -1,7 +1,7 @@
 /*
  *  TP-LINK TL-WR741ND board support
  *
- *  Copyright (C) 2009 Gabor Juhos <juhosg@openwrt.org>
+ *  Copyright (C) 2009-2010 Gabor Juhos <juhosg@openwrt.org>
  *
  *  This program is free software; you can redistribute it and/or modify it
  *  under the terms of the GNU General Public License version 2 as published
@@ -16,6 +16,7 @@
 #include "machtype.h"
 #include "devices.h"
 #include "dev-m25p80.h"
+#include "dev-ap91-eth.h"
 #include "dev-ap91-pci.h"
 #include "dev-gpio-buttons.h"
 #include "dev-leds-gpio.h"
@@ -98,30 +99,6 @@ static void __init tl_wr741nd_setup(void)
 	u8 *mac = (u8 *) KSEG1ADDR(0x1f01fc00);
 	u8 *ee = (u8 *) KSEG1ADDR(0x1fff1000);
 
-	ar71xx_set_mac_base(mac);
-	ar71xx_add_device_mdio(0x0);
-
-	/* WAN port */
-	ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
-	ar71xx_eth0_data.phy_mask = 0x0;
-	ar71xx_eth0_data.speed = SPEED_100;
-	ar71xx_eth0_data.duplex = DUPLEX_FULL;
-	ar71xx_eth0_data.fifo_cfg1 = 0x0fff0000;
-	ar71xx_eth0_data.fifo_cfg2 = 0x00001fff;
-	ar71xx_eth0_data.fifo_cfg3 = 0x008001ff;
-
-	/* LAN ports */
-	ar71xx_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
-	ar71xx_eth1_data.phy_mask = 0x0;
-	ar71xx_eth1_data.speed = SPEED_1000;
-	ar71xx_eth1_data.duplex = DUPLEX_FULL;
-	ar71xx_eth1_data.fifo_cfg1 = 0x0fff0000;
-	ar71xx_eth1_data.fifo_cfg2 = 0x00001fff;
-	ar71xx_eth1_data.fifo_cfg3 = 0x008001ff;
-
-	ar71xx_add_device_eth(1);
-	ar71xx_add_device_eth(0);
-
 	ar71xx_add_device_m25p80(&tl_wr741nd_flash_data);
 
 	ar71xx_add_device_leds_gpio(-1, ARRAY_SIZE(tl_wr741nd_leds_gpio),
@@ -131,7 +108,8 @@ static void __init tl_wr741nd_setup(void)
 					ARRAY_SIZE(tl_wr741nd_gpio_buttons),
 					tl_wr741nd_gpio_buttons);
 
-	ap91_pci_init(ee, NULL);
+	ap91_eth_init(mac);
+	ap91_pci_init(ee, mac);
 }
 MIPS_MACHINE(AR71XX_MACH_TL_WR741ND, "TL-WR741ND", "TP-LINK TL-WR741ND",
 	     tl_wr741nd_setup);

target/linux/ar71xx/files/arch/mips/ar71xx/mach-wndr3700.c

@@ -29,6 +29,7 @@
 #define WNDR3700_GPIO_LED_POWER_ORANGE	1
 #define WNDR3700_GPIO_LED_POWER_GREEN	2
 #define WNDR3700_GPIO_LED_WPS_GREEN	4
+#define WNDR3700_GPIO_LED_WAN_GREEN	6
 
 #define WNDR3700_GPIO_BTN_WPS		3
 #define WNDR3700_GPIO_BTN_RESET		8
@@ -118,6 +119,10 @@ static struct gpio_led wndr3700_leds_gpio[] __initdata = {
 		.name		= "wndr3700:orange:wps",
 		.gpio		= WNDR3700_GPIO_LED_WPS_ORANGE,
 		.active_low	= 1,
+	}, {
+		.name		= "wndr3700:green:wan",
+		.gpio		= WNDR3700_GPIO_LED_WAN_GREEN,
+		.active_low	= 1,
 	}
 };
 
@@ -128,18 +133,21 @@ static struct gpio_button wndr3700_gpio_buttons[] __initdata = {
 		.code		= BTN_0,
 		.threshold	= 3,
 		.gpio		= WNDR3700_GPIO_BTN_RESET,
+		.active_low	= 1,
 	}, {
 		.desc		= "wps",
 		.type		= EV_KEY,
 		.code		= BTN_1,
 		.threshold	= 3,
 		.gpio		= WNDR3700_GPIO_BTN_WPS,
+		.active_low	= 1,
 	} , {
 		.desc		= "wifi",
 		.type		= EV_KEY,
 		.code		= BTN_2,
 		.threshold	= 3,
 		.gpio		= WNDR3700_GPIO_BTN_WIFI,
+		.active_low	= 1,
 	}
 };
 

target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c

@@ -390,7 +390,12 @@ static void ag71xx_hw_init(struct ag71xx *ag)
 	mdelay(100);
 
 	/* setup MAC configuration registers */
-	ag71xx_wr(ag, AG71XX_REG_MAC_CFG1, MAC_CFG1_INIT);
+	if (pdata->is_ar724x)
+		ag71xx_wr(ag, AG71XX_REG_MAC_CFG1,
+			  MAC_CFG1_INIT | MAC_CFG1_TFC | MAC_CFG1_RFC);
+	else
+		ag71xx_wr(ag, AG71XX_REG_MAC_CFG1, MAC_CFG1_INIT);
+
 	ag71xx_sb(ag, AG71XX_REG_MAC_CFG2,
 		  MAC_CFG2_PAD_CRC_EN | MAC_CFG2_LEN_CHECK);
 

target/linux/ar71xx/image/Makefile

@@ -488,6 +488,10 @@ define Image/Build/Profile/TLWR941NDV2
 	$(call Image/Build/Template/$(fs_squash)/$(1),TPLINK,tl-wr941nd-v2,board=TL-WR941ND,TL-WR941NDv2)
 endef
 
+define Image/Build/Profile/TLWR941NDV4
+	$(call Image/Build/Template/$(fs_4k)/$(1),TPLINK,tl-wr941nd-v4,board=TL-WR741ND,TL-WR941NDv4)
+endef
+
 define Image/Build/Profile/TLWR1043NDV1
 	$(call Image/Build/Template/$(fs_squash)/$(1),TPLINK,tl-wr1043nd-v1,board=TL-WR1043ND,TL-WR1043NDv1)
 endef
@@ -530,6 +534,7 @@ define Image/Build/Profile/Default
 	$(call Image/Build/Profile/TLWR841NDV3,$(1))
 	$(call Image/Build/Profile/TLWR841NDV5,$(1))
 	$(call Image/Build/Profile/TLWR941NDV2,$(1))
+	$(call Image/Build/Profile/TLWR941NDV4,$(1))
 	$(call Image/Build/Profile/TLWR1043NDV1,$(1))
 	$(call Image/Build/Profile/UBNT,$(1))
 	$(call Image/Build/Profile/WP543,$(1))

target/linux/ar71xx/patches-2.6.32/101-ksz8041_phy_driver.patch

@@ -14,9 +14,9 @@
  	depends on PHYLIB=y
 --- a/drivers/net/phy/Makefile
 +++ b/drivers/net/phy/Makefile
-@@ -23,6 +23,7 @@ obj-$(CONFIG_RTL8306_PHY)	+= rtl8306.o
+@@ -24,6 +24,7 @@ obj-$(CONFIG_RTL8366_SMI)	+= rtl8366_smi
- obj-$(CONFIG_RTL8366_SMI)	+= rtl8366_smi.o
  obj-$(CONFIG_RTL8366S_PHY)	+= rtl8366s.o
+ obj-$(CONFIG_RTL8366RB_PHY)	+= rtl8366rb.o
  obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
 +obj-$(CONFIG_MICREL)		+= micrel.o
  obj-$(CONFIG_FIXED_PHY)		+= fixed.o

target/linux/ar71xx/patches-2.6.32/960-ar8216-add-register-debug.patch

@@ -1,257 +0,0 @@
---- a/drivers/net/phy/ar8216.c
-+++ b/drivers/net/phy/ar8216.c
-@@ -563,10 +563,227 @@ ar8216_config_aneg(struct phy_device *ph
- 	return 0;
- }
- 
-+#define ar8216_dbg(fmt, args...) printk(KERN_DEBUG "ar8216: " fmt, ## args)
-+
-+static inline const char *ctrl_state_str(u32 ctrl)
-+{
-+	switch (ctrl & AR8216_PORT_CTRL_STATE) {
-+	case AR8216_PORT_STATE_DISABLED:
-+		return "disabled";
-+	case AR8216_PORT_STATE_BLOCK:
-+		return "block";
-+	case AR8216_PORT_STATE_LISTEN:
-+		return "listen";
-+	case AR8216_PORT_STATE_LEARN:
-+		return "learn";
-+	case AR8216_PORT_STATE_FORWARD:
-+		return "forward";
-+	default:
-+		break;
-+	}
-+
-+	return "????";
-+}
-+
-+static inline const char *ctrl_vlanmode_str(u32 ctrl)
-+{
-+	u32 vlan_mode;
-+
-+	vlan_mode = (ctrl & AR8216_PORT_CTRL_VLAN_MODE) >>
-+		    AR8216_PORT_CTRL_VLAN_MODE_S;
-+	switch (vlan_mode)  {
-+	case AR8216_OUT_KEEP:
-+		return "keep";
-+	case AR8216_OUT_STRIP_VLAN:
-+		return "strip vlan";
-+	case AR8216_OUT_ADD_VLAN:
-+		return "add_vlan";
-+	default:
-+		break;
-+	}
-+
-+	return "????";
-+}
-+
-+static inline const char *vlan_vlanmode_str(u32 vlan)
-+{
-+	u32 vlan_mode;
-+
-+	vlan_mode = (vlan & AR8216_PORT_VLAN_MODE) >>
-+		    AR8216_PORT_VLAN_MODE_S;
-+	switch (vlan_mode)  {
-+	case AR8216_IN_PORT_ONLY:
-+		return "port only";
-+	case AR8216_IN_PORT_FALLBACK:
-+		return "port fallback";
-+	case AR8216_IN_VLAN_ONLY:
-+		return "VLAN only";
-+	case AR8216_IN_SECURE:
-+		return "secure";
-+	default:
-+		break;
-+	}
-+
-+	return "????";
-+}
-+
-+static void
-+ar8216_dump_regs(struct ar8216_priv *ap)
-+{
-+	unsigned int i;
-+	u32 t;
-+
-+	t = ar8216_mii_read(ap, AR8216_REG_CTRL);
-+	ar8216_dbg("CTRL\t\t: %08x\n", t);
-+	ar8216_dbg("  version\t: %u\n", (t & 0xff00) >> 8);
-+	ar8216_dbg("  revision\t: %u\n", (t & 0xff));
-+
-+	ar8216_dbg("POWER_ON\t: %08x\n",
-+		   ar8216_mii_read(ap, 0x04));
-+	ar8216_dbg("INT\t\t: %08x\n",
-+		   ar8216_mii_read(ap, 0x10));
-+	ar8216_dbg("INT_MASK\t: %08x\n",
-+		   ar8216_mii_read(ap, 0x14));
-+	ar8216_dbg("MAC_ADDR0\t: %08x\n",
-+		   ar8216_mii_read(ap, 0x20));
-+	ar8216_dbg("MAC_ADDR1\t: %08x\n",
-+		ar8216_mii_read(ap, 0x24));
-+	ar8216_dbg("FLOOD_MASK\t: %08x\n",
-+		ar8216_mii_read(ap, 0x2c));
-+
-+	t = ar8216_mii_read(ap, AR8216_REG_GLOBAL_CTRL);
-+	ar8216_dbg("GLOBAL_CTRL\t: %08x\n", t);
-+	ar8216_dbg("  mtu\t\t: %lu\n", t & AR8216_GCTRL_MTU);
-+
-+	ar8216_dbg("FLOW_CONTROL0\t: %08x\n",
-+		ar8216_mii_read(ap, 0x34));
-+	ar8216_dbg("FLOW_CONTROL1\t: %08x\n",
-+		ar8216_mii_read(ap, 0x38));
-+	ar8216_dbg("QM_CONTROL\t: %08x\n",
-+		ar8216_mii_read(ap, 0x3c));
-+	ar8216_dbg("VLAN_TABLE0\t: %08x\n",
-+		ar8216_mii_read(ap, AR8216_REG_VTU));
-+	ar8216_dbg("VLAN_TABLE1\t: %08x\n",
-+		ar8216_mii_read(ap, AR8216_REG_VTU_DATA));
-+	ar8216_dbg("ADDR_TABLE0\t: %08x\n",
-+		ar8216_mii_read(ap, AR8216_REG_ATU));
-+	ar8216_dbg("ADDR_TABLE1\t: %08x\n",
-+		ar8216_mii_read(ap, AR8216_REG_ATU_DATA));
-+	ar8216_dbg("ADDR_TABLE2\t: %08x\n",
-+		ar8216_mii_read(ap, 0x58));
-+	ar8216_dbg("ADDR_CTRL\t: %08x\n",
-+		ar8216_mii_read(ap, 0x5c));
-+	ar8216_dbg("IP_PRIO0\t: %08x\n",
-+		ar8216_mii_read(ap, 0x60));
-+	ar8216_dbg("IP_PRIO1\t: %08x\n",
-+		ar8216_mii_read(ap, 0x64));
-+	ar8216_dbg("IP_PRIO2\t: %08x\n",
-+		ar8216_mii_read(ap, 0x68));
-+	ar8216_dbg("IP_PRIO3\t: %08x\n",
-+		ar8216_mii_read(ap, 0x6c));
-+	ar8216_dbg("TAG_PRIO\t: %08x\n",
-+		ar8216_mii_read(ap, 0x70));
-+	ar8216_dbg("SERVICE_TAG\t: %08x\n",
-+		ar8216_mii_read(ap, 0x74));
-+	ar8216_dbg("CPU_PORT\t: %08x\n",
-+		ar8216_mii_read(ap, 0x78));
-+	ar8216_dbg("MIB_FUNC\t: %08x\n",
-+		ar8216_mii_read(ap, 0x80));
-+	ar8216_dbg("MDIO\t\t: %08x\n",
-+		ar8216_mii_read(ap, 0x98));
-+	ar8216_dbg("LED0\t\t: %08x\n",
-+		ar8216_mii_read(ap, 0xb0));
-+	ar8216_dbg("LED1\t\t: %08x\n",
-+		ar8216_mii_read(ap, 0xb4));
-+	ar8216_dbg("LED2\t\t: %08x\n",
-+		ar8216_mii_read(ap, 0xb8));
-+
-+	for (i = 0; i < 6; i++) {
-+		u32 reg = 0x100 * (i + 1);
-+
-+		t = ar8216_mii_read(ap, AR8216_REG_PORT_STATUS(i));
-+		ar8216_dbg("PORT%d_STATUS\t: %08x\n", i, t);
-+		ar8216_dbg("  speed\t\t: %s\n",
-+			   (t & AR8216_PORT_STATUS_SPEED) ? "100" : "10");
-+		ar8216_dbg("  speed error\t: %s\n",
-+			   (t & AR8216_PORT_STATUS_SPEED_ERR) ? "yes" : "no");
-+		ar8216_dbg("  txmac\t\t: %d\n",
-+			   (t & AR8216_PORT_STATUS_TXMAC) ? 1 : 0);
-+		ar8216_dbg("  rxmac\t\t: %d\n",
-+			   (t & AR8216_PORT_STATUS_RXMAC) ? 1 : 0);
-+		ar8216_dbg("  tx_flow\t: %s\n",
-+			   (t & AR8216_PORT_STATUS_TXFLOW) ? "on" : "off");
-+		ar8216_dbg("  rx_flow\t: %s\n",
-+			   (t & AR8216_PORT_STATUS_RXFLOW) ? "on" : "off");
-+		ar8216_dbg("  duplex\t: %s\n",
-+			   (t & AR8216_PORT_STATUS_DUPLEX) ? "full" : "half");
-+		ar8216_dbg("  link\t\t: %s\n",
-+			   (t & AR8216_PORT_STATUS_LINK_UP) ? "up" : "down");
-+		ar8216_dbg("  auto\t\t: %s\n",
-+			   (t & AR8216_PORT_STATUS_LINK_AUTO) ? "on" : "off");
-+		ar8216_dbg("  pause\t\t: %s\n",
-+			   (t & AR8216_PORT_STATUS_LINK_PAUSE) ? "on" : "off");
-+
-+		t = ar8216_mii_read(ap, AR8216_REG_PORT_CTRL(i));
-+		ar8216_dbg("PORT%d_CTRL\t: %08x\n", i, t);
-+		ar8216_dbg("  state\t\t: %s\n", ctrl_state_str(t));
-+		ar8216_dbg("  learn lock\t: %s\n",
-+			   (t & AR8216_PORT_CTRL_LEARN_LOCK) ? "on" : "off");
-+		ar8216_dbg("  vlan_mode\t: %s\n", ctrl_vlanmode_str(t));
-+		ar8216_dbg("  igmp_snoop\t: %s\n",
-+			   (t & AR8216_PORT_CTRL_IGMP_SNOOP) ? "on" : "off");
-+		ar8216_dbg("  header\t: %s\n",
-+			   (t & AR8216_PORT_CTRL_HEADER) ? "on" : "off");
-+		ar8216_dbg("  mac_loop\t: %s\n",
-+			   (t & AR8216_PORT_CTRL_MAC_LOOP) ? "on" : "off");
-+		ar8216_dbg("  single_vlan\t: %s\n",
-+			   (t & AR8216_PORT_CTRL_SINGLE_VLAN) ? "on" : "off");
-+		ar8216_dbg("  mirror tx\t: %s\n",
-+			   (t & AR8216_PORT_CTRL_MIRROR_TX) ? "on" : "off");
-+		ar8216_dbg("  mirror rx\t: %s\n",
-+			   (t & AR8216_PORT_CTRL_MIRROR_RX) ? "on" : "off");
-+
-+		t = ar8216_mii_read(ap, AR8216_REG_PORT_VLAN(i));
-+		ar8216_dbg("PORT%d_VLAN\t: %08x\n", i, t);
-+		ar8216_dbg("  default id\t: %lu\n",
-+			   (t & AR8216_PORT_VLAN_DEFAULT_ID));
-+		ar8216_dbg("  dest ports\t: %s%s%s%s%s%s\n",
-+			   (t & 0x010000) ? "0 " : "",
-+			   (t & 0x020000) ? "1 " : "",
-+			   (t & 0x040000) ? "2 " : "",
-+			   (t & 0x080000) ? "3 " : "",
-+			   (t & 0x100000) ? "4 " : "",
-+			   (t & 0x200000) ? "5 " : "");
-+		ar8216_dbg("  tx priority\t: %s\n",
-+			   (t & AR8216_PORT_VLAN_TX_PRIO) ? "on" : "off");
-+		ar8216_dbg("  port priority\t: %lu\n",
-+			   (t & AR8216_PORT_VLAN_PRIORITY) >>
-+			   AR8216_PORT_VLAN_PRIORITY_S);
-+		ar8216_dbg("  ingress mode\t: %s\n", vlan_vlanmode_str(t));
-+
-+		t = ar8216_mii_read(ap, AR8216_REG_PORT_RATE(i));
-+		ar8216_dbg("PORT%d_RATE0\t: %08x\n", i, t);
-+
-+		ar8216_dbg("PORT%d_PRIO\t: %08x\n", i,
-+			   ar8216_mii_read(ap, AR8216_REG_PORT_PRIO(i)));
-+		ar8216_dbg("PORT%d_STORM\t: %08x\n", i,
-+			   ar8216_mii_read(ap, reg + 0x14));
-+		ar8216_dbg("PORT%d_QUEUE\t: %08x\n", i,
-+			   ar8216_mii_read(ap, reg + 0x18));
-+		ar8216_dbg("PORT%d_RATE1\t: %08x\n", i,
-+			   ar8216_mii_read(ap, reg + 0x1c));
-+		ar8216_dbg("PORT%d_RATE2\t: %08x\n", i,
-+			   ar8216_mii_read(ap, reg + 0x20));
-+		ar8216_dbg("PORT%d_RATE3\t: %08x\n", i,
-+			   ar8216_mii_read(ap, reg + 0x24));
-+	}
-+}
-+
- static int
- ar8216_probe(struct phy_device *pdev)
- {
- 	struct ar8216_priv priv;
-+	static int regs_dumped;
- 
- 	u8 id, rev;
- 	u32 val;
-@@ -575,9 +792,14 @@ ar8216_probe(struct phy_device *pdev)
- 	val = ar8216_mii_read(&priv, AR8216_REG_CTRL);
- 	rev = val & 0xff;
- 	id = (val >> 8) & 0xff;
--	if ((id != 1) || (rev != 1))
-+	if ((id != 1) || (rev != 1 && rev != 2))
- 		return -ENODEV;
- 
-+	if (!regs_dumped) {
-+		ar8216_dump_regs(&priv);
-+		regs_dumped++;
-+	}
-+
- 	return 0;
- }
- 
---- a/drivers/net/phy/ar8216.h
-+++ b/drivers/net/phy/ar8216.h
-@@ -27,7 +27,7 @@
- #define   AR8216_CTRL_RESET		BIT(31)
- 
- #define AR8216_REG_GLOBAL_CTRL		0x0030
--#define   AR8216_GCTRL_MTU		BITS(0, 10)
-+#define   AR8216_GCTRL_MTU		BITS(0, 12)
- 
- #define AR8216_REG_VTU			0x0040
- #define   AR8216_VTU_OP			BITS(0, 3)

target/linux/ar71xx/profiles/atheros.mk

@@ -18,7 +18,8 @@ $(eval $(call Profile,AP81))
 
 define Profile/AP83
 	NAME:=Atheros AP83 reference board
-	PACKAGES:=wpad-mini kmod-ath9k kmod-usb-core kmod-usb2
+	PACKAGES:=wpad-mini kmod-ath9k kmod-usb-core kmod-usb2 \
+		  vsc7385-ucode-ap83 vsc7395-ucode-ap83
 endef
 
 define Profile/AP83/Description
@@ -40,7 +41,8 @@ $(eval $(call Profile,PB42))
 
 define Profile/PB44
 	NAME:=Atheros PB44 reference board
-	PACKAGES:=wpad-mini kmod-ath9k kmod-usb-core kmod-usb-ohci kmod-usb2
+	PACKAGES:=wpad-mini kmod-ath9k kmod-usb-core kmod-usb-ohci kmod-usb2 \
+		  vsc7385-ucode-pb44 vsc7395-ucode-pb44
 endef
 
 define Profile/PB44/Description

target/linux/ar71xx/profiles/tp-link.mk

@@ -60,6 +60,17 @@ endef
 
 $(eval $(call Profile,TLWR941NDV2))
 
+define Profile/TLWR941NDV4
+	NAME:=TP-LINK TL-WR941ND v4
+	PACKAGES:=kmod-ath9k wpad-mini
+endef
+
+define Profile/TLWR941NDV4/Description
+	Package set optimized for the TP-LINK TL-WR941ND v4.
+endef
+
+$(eval $(call Profile,TLWR941NDV4))
+
 define Profile/TLWR1043NDV1
 	NAME:=TP-LINK TL-WR1043ND v1
 	PACKAGES:=kmod-ath9k wpad-mini kmod-usb-core kmod-usb2

target/linux/at91/config-2.6.25

@@ -133,10 +133,6 @@ CONFIG_MTD_CMDLINE_PARTS=y
 # CONFIG_PCI is not set
 # CONFIG_PCI_SYSCALL is not set
 CONFIG_PHYLIB=y
-# CONFIG_PPP_MULTILINK is not set
-# CONFIG_PPPOATM is not set
-# CONFIG_PPPOL2TP is not set
-# CONFIG_PPP_SYNC_TTY is not set
 # CONFIG_SCSI_WAIT_SCAN is not set
 # CONFIG_SDIO_UART is not set
 # CONFIG_SERIAL_8250 is not set

target/linux/au1000/Makefile

@@ -12,7 +12,7 @@ BOARDNAME:=RMI/AMD AU1x00
 FEATURES:=jffs2 usb pci
 SUBTARGETS=au1500 au1550
 
-LINUX_VERSION:=2.6.30.10
+LINUX_VERSION:=2.6.32.8
 
 include $(INCLUDE_DIR)/target.mk
 DEFAULT_PACKAGES += wpad-mini yamonenv

target/linux/au1000/au1500/config-2.6.32

@@ -26,9 +26,9 @@ CONFIG_CPU_HAS_PREFETCH=y
 CONFIG_CPU_HAS_SYNC=y
 CONFIG_CPU_LITTLE_ENDIAN=y
 # CONFIG_CPU_LOONGSON2E is not set
+CONFIG_CPU_MIPS32=y
 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
@@ -62,14 +62,15 @@ CONFIG_DMA_NONCOHERENT=y
 CONFIG_DUMMY=m
 CONFIG_ELF_CORE=y
 # CONFIG_FSNOTIFY is not set
-CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
 CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
 CONFIG_GENERIC_CMOS_UPDATE=y
 CONFIG_GENERIC_FIND_LAST_BIT=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y
 CONFIG_GENERIC_GPIO=y
 CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
 CONFIG_GPIOLIB=y
+CONFIG_GPIO_SYSFS=y
 # CONFIG_HAMRADIO is not set
 CONFIG_HARDWARE_WATCHPOINTS=y
 CONFIG_HAS_DMA=y
@@ -81,15 +82,15 @@ CONFIG_HAVE_IDE=y
 CONFIG_HAVE_OPROFILE=y
 CONFIG_HW_HAS_PCI=y
 CONFIG_HW_RANDOM=y
-# CONFIG_HZ_100 is not set
 CONFIG_HZ=250
+# CONFIG_HZ_100 is not set
 CONFIG_HZ_250=y
+CONFIG_I2C=m
 CONFIG_I2C_ALGOBIT=m
 CONFIG_I2C_ALGOPCA=m
 CONFIG_I2C_ALGOPCF=m
 CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_CHARDEV=m
-CONFIG_I2C=m
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_IRQ_CPU=y
 CONFIG_KEXEC=y
@@ -103,6 +104,7 @@ CONFIG_MACH_ALCHEMY=y
 # CONFIG_MACH_VR41XX is not set
 CONFIG_MAGIC_SYSRQ=y
 # 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
@@ -115,10 +117,10 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5
 # CONFIG_MIPS_MACHINE is not set
 # CONFIG_MIPS_MALTA is not set
 # CONFIG_MIPS_MIRAGE is not set
+CONFIG_MIPS_MTX1=y
 CONFIG_MIPS_MT_DISABLED=y
 # CONFIG_MIPS_MT_SMP is not set
 # CONFIG_MIPS_MT_SMTC is not set
-CONFIG_MIPS_MTX1=y
 # CONFIG_MIPS_PB1000 is not set
 # CONFIG_MIPS_PB1100 is not set
 # CONFIG_MIPS_PB1200 is not set
@@ -126,7 +128,6 @@ CONFIG_MIPS_MTX1=y
 # 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

target/linux/avr32/config-default

@@ -78,6 +78,7 @@ CONFIG_NO_HZ=y
 CONFIG_NR_QUICK=2
 # CONFIG_OWNERSHIP_TRACE is not set
 CONFIG_PAGEFLAGS_EXTENDED=y
+# CONFIG_PATA_AT32 is not set
 CONFIG_PERFORMANCE_COUNTERS=y
 CONFIG_PHYLIB=y
 CONFIG_PHYS_OFFSET=0x10000000

target/linux/brcm-2.4/patches/004-flash.patch

@@ -1,8 +1,8 @@
---- a/arch/mips/bcm947xx/Makefile	
+--- a/arch/mips/bcm947xx/Makefile
-+++ b/arch/mips/bcm947xx/Makefile	
++++ b/arch/mips/bcm947xx/Makefile
-@@ -11,6 +11,7 @@
+@@ -11,6 +11,7 @@ export-objs     := export.o
  obj-y		:= prom.o setup.o time.o sbmips.o gpio.o
- obj-y		+= nvram.o nvram_linux.o cfe_env.o hndpmu.o
+ obj-y		+= nvram.o cfe_env.o hndpmu.o
  obj-y		+= sbutils.o utils.o bcmsrom.o hndchipc.o
 +obj-y		+= sflash.o
  obj-$(CONFIG_PCI) += sbpci.o pcibios.o

target/linux/brcm47xx/patches-2.6.30/220-bcm5354.patch

@@ -31,7 +31,7 @@
  	}
 --- a/drivers/ssb/main.c
 +++ b/drivers/ssb/main.c
-@@ -1010,6 +1010,8 @@ u32 ssb_clockspeed(struct ssb_bus *bus)
+@@ -1012,6 +1012,8 @@ u32 ssb_clockspeed(struct ssb_bus *bus)
  
  	if (bus->chip_id == 0x5365) {
  		rate = 100000000;

target/linux/brcm47xx/patches-2.6.30/700-ssb-gigabit-ethernet-driver.patch

@@ -98,7 +98,7 @@
  	/* Workaround for unstable PLL clock */
 -	if ((GET_CHIP_REV(tp->pci_chip_rev_id) == CHIPREV_5750_AX) ||
 -	    (GET_CHIP_REV(tp->pci_chip_rev_id) == CHIPREV_5750_BX)) {
-+	if ((tp->phy_id & PHY_ID_MASK != PHY_ID_BCM5750_2) &&
++	if ((tp->phy_id & PHY_ID_MASK) != PHY_ID_BCM5750_2 &&
 +				/* !!! FIXME !!! */
 +	    ((GET_CHIP_REV(tp->pci_chip_rev_id) == CHIPREV_5750_AX) ||
 +	    (GET_CHIP_REV(tp->pci_chip_rev_id) == CHIPREV_5750_BX))) {
@@ -252,14 +252,6 @@
  	if (tp->tg3_flags & TG3_FLAG_EEPROM_WRITE_PROT) {
  		tw32_f(GRC_LOCAL_CTRL, tp->grc_local_ctrl &
  		       ~GRC_LCLCTRL_GPIO_OUTPUT1);
-@@ -12063,7 +12133,6 @@ static int __devinit tg3_get_invariants(
- 		tp->write32 = tg3_write_flush_reg32;
- 	}
- 
--
- 	if ((tp->tg3_flags & TG3_FLAG_TXD_MBOX_HWBUG) ||
- 	    (tp->tg3_flags & TG3_FLAG_MBOX_WRITE_REORDER)) {
- 		tp->write32_tx_mbox = tg3_write32_tx_mbox;
 @@ -12099,6 +12168,11 @@ static int __devinit tg3_get_invariants(
  	      GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5701)))
  		tp->tg3_flags |= TG3_FLAG_SRAM_USE_CONFIG;

target/linux/brcm47xx/patches-2.6.30/800-fix_cfe_detection.patch

@@ -90,7 +90,7 @@
  {
  	char buf[CL_SIZE];
  
-@@ -146,9 +122,12 @@ static __init void prom_init_mem(void)
+@@ -154,9 +130,12 @@ static __init void prom_init_mem(void)
  
  void __init prom_init(void)
  {

target/linux/brcm47xx/patches-2.6.31/100-board_support.patch

@@ -15,7 +15,7 @@
  extern char *system_type;
 --- a/include/linux/pci_ids.h
 +++ b/include/linux/pci_ids.h
-@@ -2085,6 +2085,7 @@
+@@ -2089,6 +2089,7 @@
  #define PCI_DEVICE_ID_TIGON3_5906M	0x1713
  #define PCI_DEVICE_ID_BCM4401		0x4401
  #define PCI_DEVICE_ID_BCM4401B0		0x4402

target/linux/brcm47xx/patches-2.6.31/210-b44_phy_fix.patch

@@ -9,7 +9,7 @@
  }
  
  static void __b44_set_flow_ctrl(struct b44 *bp, u32 pause_flags)
-@@ -2221,6 +2221,10 @@ static int __devinit b44_init_one(struct
+@@ -2217,6 +2217,10 @@ static int __devinit b44_init_one(struct
  	 */
  	b44_chip_reset(bp, B44_CHIP_RESET_FULL);
  

target/linux/brcm47xx/patches-2.6.31/220-bcm5354.patch

@@ -31,7 +31,7 @@
  	}
 --- a/drivers/ssb/main.c
 +++ b/drivers/ssb/main.c
-@@ -1010,6 +1010,8 @@ u32 ssb_clockspeed(struct ssb_bus *bus)
+@@ -1012,6 +1012,8 @@ u32 ssb_clockspeed(struct ssb_bus *bus)
  
  	if (bus->chip_id == 0x5365) {
  		rate = 100000000;

target/linux/brcm47xx/patches-2.6.31/270-ehci-ssb.patch

@@ -29,7 +29,7 @@
  	depends on USB
 --- a/drivers/usb/host/ehci-hcd.c
 +++ b/drivers/usb/host/ehci-hcd.c
-@@ -1117,8 +1117,16 @@ MODULE_LICENSE ("GPL");
+@@ -1119,8 +1119,16 @@ MODULE_LICENSE ("GPL");
  #define	PLATFORM_DRIVER		ixp4xx_ehci_driver
  #endif
  

target/linux/brcm47xx/patches-2.6.31/700-ssb-gigabit-ethernet-driver.patch

@@ -98,7 +98,7 @@
  	/* Workaround for unstable PLL clock */
 -	if ((GET_CHIP_REV(tp->pci_chip_rev_id) == CHIPREV_5750_AX) ||
 -	    (GET_CHIP_REV(tp->pci_chip_rev_id) == CHIPREV_5750_BX)) {
-+	if ((tp->phy_id & PHY_ID_MASK != PHY_ID_BCM5750_2) &&
++	if ((tp->phy_id & PHY_ID_MASK) != PHY_ID_BCM5750_2 &&
 +				/* !!! FIXME !!! */
 +	    ((GET_CHIP_REV(tp->pci_chip_rev_id) == CHIPREV_5750_AX) ||
 +	    (GET_CHIP_REV(tp->pci_chip_rev_id) == CHIPREV_5750_BX))) {
@@ -252,14 +252,6 @@
  	if (tp->tg3_flags & TG3_FLAG_EEPROM_WRITE_PROT) {
  		tw32_f(GRC_LOCAL_CTRL, tp->grc_local_ctrl &
  		       ~GRC_LCLCTRL_GPIO_OUTPUT1);
-@@ -12100,7 +12170,6 @@ static int __devinit tg3_get_invariants(
- 		tp->write32 = tg3_write_flush_reg32;
- 	}
- 
--
- 	if ((tp->tg3_flags & TG3_FLAG_TXD_MBOX_HWBUG) ||
- 	    (tp->tg3_flags & TG3_FLAG_MBOX_WRITE_REORDER)) {
- 		tp->write32_tx_mbox = tg3_write32_tx_mbox;
 @@ -12136,6 +12205,11 @@ static int __devinit tg3_get_invariants(
  	      GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5701)))
  		tp->tg3_flags |= TG3_FLAG_SRAM_USE_CONFIG;

target/linux/brcm47xx/patches-2.6.31/800-fix_cfe_detection.patch

@@ -90,7 +90,7 @@
  {
  	char buf[CL_SIZE];
  
-@@ -146,9 +122,12 @@ static __init void prom_init_mem(void)
+@@ -154,9 +130,12 @@ static __init void prom_init_mem(void)
  
  void __init prom_init(void)
  {

target/linux/brcm47xx/patches-2.6.32/100-board_support.patch

@@ -1,8 +1,8 @@
 --- a/arch/mips/include/asm/bootinfo.h
 +++ b/arch/mips/include/asm/bootinfo.h
-@@ -57,6 +57,12 @@
+@@ -69,6 +69,12 @@
- #define	MACH_MIKROTIK_RB532	0	/* Mikrotik RouterBoard 532 	*/
+ #define MACH_DEXXON_GDIUM2F10  5
- #define MACH_MIKROTIK_RB532A	1	/* Mikrotik RouterBoard 532A 	*/
+ #define MACH_LOONGSON_END      6
  
 +/*
 + * Valid machtype for group Broadcom
@@ -15,7 +15,7 @@
  extern char *system_type;
 --- a/include/linux/pci_ids.h
 +++ b/include/linux/pci_ids.h
-@@ -2106,6 +2106,7 @@
+@@ -2101,6 +2101,7 @@
  #define PCI_DEVICE_ID_TIGON3_5906M	0x1713
  #define PCI_DEVICE_ID_BCM4401		0x4401
  #define PCI_DEVICE_ID_BCM4401B0		0x4402

target/linux/brcm47xx/patches-2.6.32/110-flash_map.patch

@@ -1,6 +1,6 @@
 --- a/drivers/mtd/maps/Kconfig
 +++ b/drivers/mtd/maps/Kconfig
-@@ -343,6 +343,12 @@ config MTD_CFI_FLAGADM
+@@ -327,6 +327,12 @@ config MTD_CFI_FLAGADM
  	  Mapping for the Flaga digital module. If you don't have one, ignore
  	  this setting.
  
@@ -15,7 +15,7 @@
  	depends on MTD_CFI && ( REDWOOD_4 || REDWOOD_5 || REDWOOD_6 )
 --- a/drivers/mtd/maps/Makefile
 +++ b/drivers/mtd/maps/Makefile
-@@ -29,6 +29,7 @@ obj-$(CONFIG_MTD_PMC_MSP_RAMROOT)+= pmcm
+@@ -28,6 +28,7 @@ obj-$(CONFIG_MTD_PMC_MSP_EVM)   += pmcms
  obj-$(CONFIG_MTD_PCMCIA)	+= pcmciamtd.o
  obj-$(CONFIG_MTD_RPXLITE)	+= rpxlite.o
  obj-$(CONFIG_MTD_TQM8XXL)	+= tqm8xxl.o

target/linux/brcm47xx/patches-2.6.32/130-remove_scache.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -195,7 +195,6 @@ config MIPS_MALTA
+@@ -216,7 +216,6 @@ config MIPS_MALTA
  	select I8259
  	select MIPS_BOARDS_GEN
  	select MIPS_BONITO64
@@ -8,7 +8,7 @@
  	select PCI_GT64XXX_PCI0
  	select MIPS_MSC
  	select SWAP_IO_SPACE
-@@ -1473,13 +1472,6 @@ config IP22_CPU_SCACHE
+@@ -1523,13 +1522,6 @@ config IP22_CPU_SCACHE
  	bool
  	select BOARD_SCACHE
  
@@ -24,7 +24,7 @@
  	select BOARD_SCACHE
 --- a/arch/mips/kernel/cpu-probe.c
 +++ b/arch/mips/kernel/cpu-probe.c
-@@ -753,6 +753,8 @@ static inline void cpu_probe_mips(struct
+@@ -748,6 +748,8 @@ static inline void cpu_probe_mips(struct
  	case PRID_IMP_25KF:
  		c->cputype = CPU_25KF;
  		__cpu_name[cpu] = "MIPS 25Kc";
@@ -35,7 +35,7 @@
  		c->cputype = CPU_34K;
 --- a/arch/mips/mm/Makefile
 +++ b/arch/mips/mm/Makefile
-@@ -32,6 +32,5 @@ obj-$(CONFIG_CPU_CAVIUM_OCTEON)	+= c-oct
+@@ -33,6 +33,5 @@ obj-$(CONFIG_CPU_CAVIUM_OCTEON)	+= c-oct
  obj-$(CONFIG_IP22_CPU_SCACHE)	+= sc-ip22.o
  obj-$(CONFIG_R5000_CPU_SCACHE)  += sc-r5k.o
  obj-$(CONFIG_RM7000_CPU_SCACHE)	+= sc-rm7k.o
@@ -44,7 +44,7 @@
  EXTRA_CFLAGS += -Werror
 --- a/arch/mips/mm/c-r4k.c
 +++ b/arch/mips/mm/c-r4k.c
-@@ -1135,7 +1135,6 @@ static void __init loongson2_sc_init(voi
+@@ -1148,7 +1148,6 @@ static void __init loongson2_sc_init(voi
  
  extern int r5k_sc_init(void);
  extern int rm7k_sc_init(void);
@@ -52,7 +52,7 @@
  
  static void __cpuinit setup_scache(void)
  {
-@@ -1189,29 +1188,17 @@ static void __cpuinit setup_scache(void)
+@@ -1202,29 +1201,17 @@ static void __cpuinit setup_scache(void)
  #endif
  
  	default: