From e164bac87a809f0c73d50359db59f5a3ecf3185d Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Sat, 26 Jul 2014 16:11:27 +0200 Subject: [PATCH] Switch to Barrier Breaker --- Makefile | 7 +- include/Makefile.image | 8 +- include/config | 3 +- include/gluon.mk | 2 +- include/toplevel.mk | 21 +- include/verbose.mk | 6 + modules | 6 +- ...le-fix-host-tools-build-dependencies.patch | 24 +- .../0002-Make-Unifi-images-flashable.patch | 19 - ...ort-for-alternative-rc.d-directories.patch | 107 + ...ndencies-from-Barrier-Breaker-r41888.patch | 379 --- ...-odhcp6c-from-Barrier-Breaker-r41830.patch | 283 --- ...ge-base-files-change-sysctl-handling.patch | 22 - .../0006-Fix-ping6-sender-address.patch | 39 - ...nel-support-for-the-TL-WDR3500-board.patch | 246 -- ...r-space-support-for-TL-WDR3500-board.patch | 48 - ...build-image-for-the-TL-WDR3500-board.patch | 55 - ...tch-configuration-for-the-TL-WDR3500.patch | 23 - ...-add-diag-support-for-the-TL-WDR3500.patch | 20 - ...ric-suffix-of-the-TL-WDR3500-USB-LED.patch | 53 - ...fix-USB-power-GPIO-on-the-TL-WDR3500.patch | 21 - ...LED-configuration-for-the-WL-WRD3500.patch | 27 - ...-fix-ethernet-LEDs-on-the-TL-WDR3500.patch | 42 - ...GPIO-output-select-values-for-AR934x.patch | 38 - ...-hostapd-from-Barrier-Breaker-r41029.patch | 2201 ----------------- ...8-ar71xx-add-support-for-QCA953x-SoC.patch | 546 ---- ...port-for-the-TP-LINK-TL-WR841N-ND-v9.patch | 297 --- ...rt-for-TL-WR842N-v2-and-TL-MR3420-v2.patch | 427 ---- .../0021-x86-add-grub2-iso-support.patch | 110 - ...relying-on-build-time-defaults-12821.patch | 24 - ...grub-editenv-for-target-installation.patch | 57 - .../0024-x86-Fix-CONFIG_X86_GRUB_SERIAL.patch | 37 - ...x-10.9-support-and-many-other-things.patch | 218 -- ...mapper-fix-build-when-it-s-available.patch | 20 - ...isable-mkfont-fix-build-on-Archlinux.patch | 20 - ...1xx-add-support-for-dlink-dir-615-e1.patch | 155 -- ...ed-libip6t_-.so-in-ip6tables-package.patch | 19 - ...030-mac80211-add-another-ath9k-patch.patch | 73 - ...educe-fw3-log-spam-in-netifd-scripts.patch | 30 - targets/ar71xx-generic/kernel-config | 1337 +++++++--- targets/ar71xx-generic/kernel-vermagic | 2 +- targets/ar71xx-generic/profiles.mk | 4 +- targets/targets.mk | 2 +- targets/x86-generic/kernel-config | 1386 +++++++---- targets/x86-generic/kernel-vermagic | 2 +- 45 files changed, 2069 insertions(+), 6397 deletions(-) delete mode 100644 patches/openwrt/0002-Make-Unifi-images-flashable.patch create mode 100644 patches/openwrt/0002-procd-add-support-for-alternative-rc.d-directories.patch delete mode 100644 patches/openwrt/0003-Update-netifd-and-its-dependencies-from-Barrier-Breaker-r41888.patch delete mode 100644 patches/openwrt/0004-Update-odhcp6c-from-Barrier-Breaker-r41830.patch delete mode 100644 patches/openwrt/0005-package-base-files-change-sysctl-handling.patch delete mode 100644 patches/openwrt/0006-Fix-ping6-sender-address.patch delete mode 100644 patches/openwrt/0007-ar71xx-add-kernel-support-for-the-TL-WDR3500-board.patch delete mode 100644 patches/openwrt/0008-ar71xx-add-user-space-support-for-TL-WDR3500-board.patch delete mode 100644 patches/openwrt/0009-ar71xx-build-image-for-the-TL-WDR3500-board.patch delete mode 100644 patches/openwrt/0010-ar71xx-add-default-switch-configuration-for-the-TL-WDR3500.patch delete mode 100644 patches/openwrt/0011-ar71xx-add-diag-support-for-the-TL-WDR3500.patch delete mode 100644 patches/openwrt/0012-ar71xx-remove-numeric-suffix-of-the-TL-WDR3500-USB-LED.patch delete mode 100644 patches/openwrt/0013-ar71xx-fix-USB-power-GPIO-on-the-TL-WDR3500.patch delete mode 100644 patches/openwrt/0014-ar71xx-add-default-LED-configuration-for-the-WL-WRD3500.patch delete mode 100644 patches/openwrt/0015-ar71xx-fix-ethernet-LEDs-on-the-TL-WDR3500.patch delete mode 100644 patches/openwrt/0016-ar71xx-add-GPIO-output-select-values-for-AR934x.patch delete mode 100644 patches/openwrt/0017-Backport-hostapd-from-Barrier-Breaker-r41029.patch delete mode 100644 patches/openwrt/0018-ar71xx-add-support-for-QCA953x-SoC.patch delete mode 100644 patches/openwrt/0019-ar71xx-add-support-for-the-TP-LINK-TL-WR841N-ND-v9.patch delete mode 100644 patches/openwrt/0020-Backport-support-for-TL-WR842N-v2-and-TL-MR3420-v2.patch delete mode 100644 patches/openwrt/0021-x86-add-grub2-iso-support.patch delete mode 100644 patches/openwrt/0022-x86-explicitely-pass-staging-directory-to-grub-mkimage-instead-of-relying-on-build-time-defaults-12821.patch delete mode 100644 patches/openwrt/0023-grub2-Add-sub-package-grub-editenv-for-target-installation.patch delete mode 100644 patches/openwrt/0024-x86-Fix-CONFIG_X86_GRUB_SERIAL.patch delete mode 100644 patches/openwrt/0025-grub2-update-to-2.02-beta2-fixes-mac-os-x-10.9-support-and-many-other-things.patch delete mode 100644 patches/openwrt/0026-grub2-disable-libdevmapper-fix-build-when-it-s-available.patch delete mode 100644 patches/openwrt/0027-grub2-disable-mkfont-fix-build-on-Archlinux.patch delete mode 100644 patches/openwrt/0028-ar71xx-add-support-for-dlink-dir-615-e1.patch delete mode 100644 patches/openwrt/0029-iptables-avoid-file-conflicts-due-to-unneeded-libip6t_-.so-in-ip6tables-package.patch delete mode 100644 patches/openwrt/0030-mac80211-add-another-ath9k-patch.patch delete mode 100644 patches/openwrt/0031-Reduce-fw3-log-spam-in-netifd-scripts.patch diff --git a/Makefile b/Makefile index 7cc76854..f3391391 100644 --- a/Makefile +++ b/Makefile @@ -153,8 +153,9 @@ include $(INCLUDE_DIR)/target.mk prereq: FORCE +$(NO_TRACE_MAKE) prereq -package/lua/host/install: tools/sed/install -gluon-tools: package/lua/host/install +gluon-tools: FORCE + +$(GLUONMAKE_EARLY) tools/sed/install + +$(GLUONMAKE_EARLY) package/lua/host/install prepare-tmpinfo: FORCE mkdir -p tmp/info @@ -187,7 +188,7 @@ prepare-target: FORCE for dir in build_dir dl staging_dir tmp; do \ mkdir -p $(GLUON_ORIGOPENWRTDIR)/$$dir; \ done - for link in build_dir Config.in dl include Makefile package rules.mk scripts staging_dir target tmp toolchain tools; do \ + for link in build_dir config Config.in dl include Makefile package rules.mk scripts staging_dir target tmp toolchain tools; do \ ln -sf $(GLUON_ORIGOPENWRTDIR)/$$link $(GLUON_OPENWRTDIR); \ done +$(GLUONMAKE_EARLY) feeds diff --git a/include/Makefile.image b/include/Makefile.image index eb110339..d6a627c6 100644 --- a/include/Makefile.image +++ b/include/Makefile.image @@ -1,7 +1,7 @@ -override BuildImage := +override define BuildImage +prepare: FORCE + $(call Image/Prepare) +endef # The Makefile included here is $(TOPDIR)/target/linux/$(BOARD)/image/Makefile include Makefile - -prepare: FORCE - $(call Image/Prepare) diff --git a/include/config b/include/config index 43fd8def..dd5ac283 100644 --- a/include/config +++ b/include/config @@ -1,3 +1,4 @@ +CONFIG_BUSYBOX_CUSTOM=y CONFIG_BUSYBOX_CONFIG_SHA512SUM=y # CONFIG_BUSYBOX_CONFIG_FEATURE_PREFER_IPV4_ADDRESS is not set CONFIG_BUSYBOX_CONFIG_IP=y @@ -11,4 +12,4 @@ CONFIG_BUSYBOX_CONFIG_FEATURE_IP_SHORT_FORMS=y CONFIG_ATH_USER_REGD=y CONFIG_PACKAGE_ATH_DEBUG=y -CONFIG_PACKAGE_luci-lib-core_srcdiet=y +CONFIG_PACKAGE_luci-base_srcdiet=y diff --git a/include/gluon.mk b/include/gluon.mk index 9fac5f1c..e5cc164b 100644 --- a/include/gluon.mk +++ b/include/gluon.mk @@ -28,7 +28,7 @@ export GLUON_VERSION ifeq ($(OPENWRT_BUILD),1) ifeq ($(GLUON_TOOLS),1) -CONFIG_VERSION_REPO := $(shell $(GLUONDIR)/scripts/site.sh opkg_repo || echo http://downloads.openwrt.org/attitude_adjustment/12.09/%S/packages) +CONFIG_VERSION_REPO := $(shell $(GLUONDIR)/scripts/site.sh opkg_repo || echo http://downloads.openwrt.org/barrier_breaker/14.07-rc2/%S/packages) export CONFIG_VERSION_REPO GLUON_SITE_CODE := $(shell $(GLUONDIR)/scripts/site.sh site_code) diff --git a/include/toplevel.mk b/include/toplevel.mk index af7ff5cb..74a95997 100644 --- a/include/toplevel.mk +++ b/include/toplevel.mk @@ -1,15 +1,17 @@ # Makefile for OpenWrt # -# Copyright (C) 2007-2011 OpenWrt.org -# Copyright (C) 2013 Project Gluon +# Copyright (C) 2007-2012 OpenWrt.org +# Copyright (C) 2013-2014 Project Gluon # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # -RELEASE:=Attitude Adjustment +RELEASE:=Barrier Breaker PREP_MK= OPENWRT_BUILD= QUIET=0 +export IS_TTY=$(shell tty -s && echo 1 || echo 0) + include $(GLUONDIR)/include/verbose.mk REVISION:=$(shell [ -d $(TOPDIR) ] && cd $(TOPDIR) && ./scripts/getver.sh 2>/dev/null) @@ -39,11 +41,24 @@ unexport LPATH # make sure that a predefined CFLAGS variable does not disturb packages export CFLAGS= +ifneq ($(shell $(HOSTCC) 2>&1 | grep clang),) + export HOSTCC_REAL?=$(HOSTCC) + export HOSTCC_WRAPPER:=$(TOPDIR)/scripts/clang-gcc-wrapper +else + export HOSTCC_WRAPPER:=$(HOSTCC) +endif + +ifeq ($(FORCE),) + .config scripts/config/conf scripts/config/mconf: tmp/.prereq-build +endif + SCAN_COOKIE?=$(shell echo $$$$) export SCAN_COOKIE SUBMAKE:=umask 022; $(SUBMAKE) +ULIMIT_FIX=_limit=`ulimit -n`; [ "$$_limit" = "unlimited" -o "$$_limit" -ge 1024 ] || ulimit -n 1024; + FORCE: ; .PHONY: FORCE diff --git a/include/verbose.mk b/include/verbose.mk index 2e8ace44..d34f55fc 100644 --- a/include/verbose.mk +++ b/include/verbose.mk @@ -27,6 +27,7 @@ endif ifeq ($(IS_TTY),1) ifneq ($(strip $(NO_COLOR)),1) _Y:=\\033[33m + _R:=\\033[31m _N:=\\033[m endif endif @@ -36,6 +37,10 @@ ifeq ($(findstring s,$(OPENWRT_VERBOSE)),) printf "$(_Y)%s$(_N)\n" "$(1)" >&8 endef + define ERROR_MESSAGE + printf "$(_R)%s$(_N)\n" "$(1)" >&8 + endef + ifeq ($(QUIET),1) ifneq ($(CURDIR),$(TOPDIR)) _DIR:=$(patsubst $(TOPDIR)/%,%,${CURDIR}) @@ -58,4 +63,5 @@ else define MESSAGE printf "%s\n" "$(1)" endef + ERROR_MESSAGE=$(MESSAGE) endif diff --git a/modules b/modules index d337b41f..8e408217 100644 --- a/modules +++ b/modules @@ -1,14 +1,14 @@ GLUON_FEEDS='openwrt gluon routing luci' -OPENWRT_REPO=git://git.openwrt.org/12.09/openwrt.git -OPENWRT_COMMIT=b0a05d4f7c194c7db43c3c5f1818449e4ecfe653 +OPENWRT_REPO=git://git.openwrt.org/14.07/openwrt.git +OPENWRT_COMMIT=79465bfe7633bb92e7ea3468e9cec8bf5d4c0190 PACKAGES_OPENWRT_REPO=git://github.com/openwrt/packages.git PACKAGES_OPENWRT_COMMIT=a5944176bc761a3fd233c59bad1af96165e5b60f PACKAGES_OPENWRT_BRANCH=for-14.07 PACKAGES_GLUON_REPO=git://github.com/freifunk-gluon/packages.git -PACKAGES_GLUON_COMMIT=1eff492575007ff8d7eb7d079a6cbd2c8979c6b7 +PACKAGES_GLUON_COMMIT=2d49f5770480d7bd612e0fa89065c52c8db7b957 PACKAGES_ROUTING_REPO=git://github.com/openwrt-routing/packages.git PACKAGES_ROUTING_COMMIT=9d3c311fdd7dc15fd5e333b55c259fc2cf661ea2 diff --git a/patches/openwrt/0001-tools-Makefile-fix-host-tools-build-dependencies.patch b/patches/openwrt/0001-tools-Makefile-fix-host-tools-build-dependencies.patch index ac06d9a0..cf01ba60 100644 --- a/patches/openwrt/0001-tools-Makefile-fix-host-tools-build-dependencies.patch +++ b/patches/openwrt/0001-tools-Makefile-fix-host-tools-build-dependencies.patch @@ -1,20 +1,12 @@ From: Matthias Schiffer -Date: Wed, 7 May 2014 22:57:10 +0200 +Date: Sat, 26 Jul 2014 06:10:23 +0200 Subject: tools/Makefile: fix host tools build dependencies diff --git a/tools/Makefile b/tools/Makefile -index 6658f8c..26a3fb1 100644 +index 75d2b0d..ff1d299 100644 --- a/tools/Makefile +++ b/tools/Makefile -@@ -75,6 +75,7 @@ endif - $(curdir)/builddirs := $(tools-y) $(tools-dep) $(tools-) - $(curdir)/builddirs-default := $(tools-y) - -+ - ifndef DUMP_TARGET_DB - define PrepareStaging - @for dir in $(1); do ( \ -@@ -86,10 +87,16 @@ define PrepareStaging +@@ -95,10 +95,16 @@ define PrepareStaging endef # preparatory work @@ -31,7 +23,7 @@ index 6658f8c..26a3fb1 100644 $(STAGING_DIR_HOST)/.prepared: $(TMP_DIR)/.build $(call PrepareStaging,$(STAGING_DIR_HOST)) -@@ -101,7 +108,7 @@ $(STAGING_DIR_HOST)/.prepared: $(TMP_DIR)/.build +@@ -110,7 +116,7 @@ $(STAGING_DIR_HOST)/.prepared: $(TMP_DIR)/.build define PrepareCommand @@ -40,7 +32,7 @@ index 6658f8c..26a3fb1 100644 @mkdir -p "$$(dir $$@)"; rm -f "$$@" @export FILE="$$$$(which $(2) 2>/dev/null | grep -v 'not found' | head -n1)"; [ -n "$$$$FILE" ] || { \ echo "Command $(1) not found."; false; \ -@@ -110,7 +117,7 @@ $(STAGING_DIR_HOST)/bin/$(1): $(STAGING_DIR)/.prepared +@@ -119,7 +125,7 @@ $(STAGING_DIR_HOST)/bin/$(1): $(STAGING_DIR)/.prepared endef endif @@ -49,10 +41,10 @@ index 6658f8c..26a3fb1 100644 @rm -f $@ @if stat --version > /dev/null 2>&1; then \ ln -s `which stat` $@; \ -@@ -128,8 +135,8 @@ $(eval $(call PrepareCommand,seq,gseq seq)) - $(eval $(call PrepareCommand,python,python2 python)) +@@ -143,8 +149,8 @@ $(eval $(call PrepareCommand,tar,gtar tar)) + $(eval $(call PrepareCommand,diff,gdiff diff)) - $(curdir)/cmddeps = $(patsubst %,$(STAGING_DIR_HOST)/bin/%,find md5sum cp stat seq python) + $(curdir)/cmddeps = $(patsubst %,$(STAGING_DIR_HOST)/bin/%,md5sum cp stat seq python awk getopt grep tar diff) -$(curdir)//prepare = $(STAGING_DIR)/.prepared $(STAGING_DIR_HOST)/.prepared $($(curdir)/cmddeps) -$(curdir)//compile = $(STAGING_DIR)/.prepared $(STAGING_DIR_HOST)/.prepared $($(curdir)/cmddeps) +$(curdir)//prepare = $(staging_prepared) $(STAGING_DIR_HOST)/.prepared $($(curdir)/cmddeps) diff --git a/patches/openwrt/0002-Make-Unifi-images-flashable.patch b/patches/openwrt/0002-Make-Unifi-images-flashable.patch deleted file mode 100644 index 2b7c8c62..00000000 --- a/patches/openwrt/0002-Make-Unifi-images-flashable.patch +++ /dev/null @@ -1,19 +0,0 @@ -From: Matthias Schiffer -Date: Fri, 27 Dec 2013 18:48:19 +0100 -Subject: Make Unifi images flashable - -diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile -index 9ebe486..8e82f7f 100644 ---- a/target/linux/ar71xx/image/Makefile -+++ b/target/linux/ar71xx/image/Makefile -@@ -896,8 +896,8 @@ $(eval $(call SingleProfile,UBNTXM,$(fs_64k),UBNTAIRROUTER,ubnt-airrouter,UBNT-A - $(eval $(call SingleProfile,UBNTXM,$(fs_64k),UBNTBULLETM,ubnt-bullet-m,UBNT-BM,ttyS0,115200,XM,XM,ar7240)) - $(eval $(call SingleProfile,UBNTXM,$(fs_64k),UBNTROCKETM,ubnt-rocket-m,UBNT-RM,ttyS0,115200,XM,XM,ar7240)) - $(eval $(call SingleProfile,UBNTXM,$(fs_64k),UBNTNANOM,ubnt-nano-m,UBNT-NM,ttyS0,115200,XM,XM,ar7240)) --$(eval $(call SingleProfile,UBNTXM,$(fs_64k),UBNTUNIFI,ubnt-unifi,UBNT-UF,ttyS0,115200,XM,XM,ar7240)) --$(eval $(call SingleProfile,UBNTXM,$(fs_64k),UBNTUNIFIOUTDOOR,ubnt-unifi-outdoor,UBNT-U20,ttyS0,115200,XM,XM,ar7240)) -+$(eval $(call SingleProfile,UBNTXM,$(fs_64k),UBNTUNIFI,ubnt-unifi,UBNT-UF,ttyS0,115200,XM,BZ,ar7240)) -+$(eval $(call SingleProfile,UBNTXM,$(fs_64k),UBNTUNIFIOUTDOOR,ubnt-unifi-outdoor,UBNT-U20,ttyS0,115200,XM,BZ,ar7240)) - - $(eval $(call SingleProfile,WHRHPG300N,$(fs_64k),WHRG301N,whr-g301n,WHR-G301N,ttyS0,115200,$$(whrhpg300n_mtdlayout),WHR-G301N)) - $(eval $(call SingleProfile,WHRHPG300N,$(fs_64k),WHRHPG300N,whr-hp-g300n,WHR-HP-G300N,ttyS0,115200,$$(whrhpg300n_mtdlayout),WHR-HP-G300N)) diff --git a/patches/openwrt/0002-procd-add-support-for-alternative-rc.d-directories.patch b/patches/openwrt/0002-procd-add-support-for-alternative-rc.d-directories.patch new file mode 100644 index 00000000..ced85fed --- /dev/null +++ b/patches/openwrt/0002-procd-add-support-for-alternative-rc.d-directories.patch @@ -0,0 +1,107 @@ +From: Matthias Schiffer +Date: Wed, 6 Aug 2014 19:12:00 +0200 +Subject: procd: add support for alternative rc.d directories + +diff --git a/package/system/procd/patches/0001-Add-support-for-alternative-rc.d-directories.patch b/package/system/procd/patches/0001-Add-support-for-alternative-rc.d-directories.patch +new file mode 100644 +index 0000000..bc24342 +--- /dev/null ++++ b/package/system/procd/patches/0001-Add-support-for-alternative-rc.d-directories.patch +@@ -0,0 +1,97 @@ ++From 03a2bc70e4260ec9f669391c47b9a7a9ecd0b75d Mon Sep 17 00:00:00 2001 ++Message-Id: <03a2bc70e4260ec9f669391c47b9a7a9ecd0b75d.1407329621.git.mschiffer@universe-factory.net> ++From: Matthias Schiffer ++Date: Wed, 6 Aug 2014 14:51:49 +0200 ++Subject: [PATCH] Add support for alternative rc.d directories ++ ++--- ++ initd/preinit.c | 38 ++++++++++++++++++++++++++++++++++++++ ++ rcS.c | 2 +- ++ 2 files changed, 39 insertions(+), 1 deletion(-) ++ ++diff --git a/initd/preinit.c b/initd/preinit.c ++index fb94527..8b832a7 100644 ++--- a/initd/preinit.c +++++ b/initd/preinit.c ++@@ -12,6 +12,8 @@ ++ * GNU General Public License for more details. ++ */ ++ +++#define _GNU_SOURCE +++ ++ #include ++ #include ++ #include ++@@ -46,6 +48,35 @@ check_dbglvl(void) ++ debug = lvl; ++ } ++ +++static char* +++get_rc_d(void) +++{ +++ size_t n = 0; +++ ssize_t len; +++ char *ret = NULL; +++ +++ FILE *fp = fopen("/tmp/rc_d_path", "r"); +++ +++ if (!fp) +++ return NULL; +++ +++ len = getline(&ret, &n, fp); +++ +++ fclose(fp); +++ +++ unlink("/tmp/rc_d_path"); +++ +++ if (len <= 0) { +++ free(ret); +++ return NULL; +++ } +++ +++ if (ret[len-1] == '\n') +++ ret[len-1] = 0; +++ +++ return ret; +++} +++ ++ static void ++ spawn_procd(struct uloop_process *proc, int ret) ++ { ++@@ -53,6 +84,7 @@ spawn_procd(struct uloop_process *proc, int ret) ++ char *argv[] = { "/sbin/procd", NULL}; ++ struct stat s; ++ char dbg[2]; +++ char *rc_d_path; ++ ++ if (plugd_proc.pid > 0) ++ kill(plugd_proc.pid, SIGKILL); ++@@ -72,6 +104,12 @@ spawn_procd(struct uloop_process *proc, int ret) ++ setenv("DBGLVL", dbg, 1); ++ } ++ +++ rc_d_path = get_rc_d(); +++ if (rc_d_path) { +++ setenv("RC_D_PATH", rc_d_path, 1); +++ free(rc_d_path); +++ } +++ ++ execvp(argv[0], argv); ++ } ++ ++diff --git a/rcS.c b/rcS.c ++index 0e1b0ba..1b00831 100644 ++--- a/rcS.c +++++ b/rcS.c ++@@ -150,7 +150,7 @@ int rcS(char *pattern, char *param, void (*q_empty)(struct runqueue *)) ++ q.empty_cb = q_empty; ++ q.max_running_tasks = 1; ++ ++- return _rc(&q, "/etc/rc.d", pattern, "*", param); +++ return _rc(&q, getenv("RC_D_PATH") ?: "/etc/rc.d", pattern, "*", param); ++ } ++ ++ int rc(const char *file, char *param) ++-- ++2.0.4 ++ diff --git a/patches/openwrt/0003-Update-netifd-and-its-dependencies-from-Barrier-Breaker-r41888.patch b/patches/openwrt/0003-Update-netifd-and-its-dependencies-from-Barrier-Breaker-r41888.patch deleted file mode 100644 index 9fa3a0b3..00000000 --- a/patches/openwrt/0003-Update-netifd-and-its-dependencies-from-Barrier-Breaker-r41888.patch +++ /dev/null @@ -1,379 +0,0 @@ -From: Matthias Schiffer -Date: Sat, 11 Jan 2014 11:47:31 +0100 -Subject: Update netifd and its dependencies from Barrier Breaker (r41888) - -diff --git a/package/libubox/Makefile b/package/libubox/Makefile -index bcf4481..6cbfc08 100644 ---- a/package/libubox/Makefile -+++ b/package/libubox/Makefile -@@ -1,13 +1,13 @@ - include $(TOPDIR)/rules.mk - - PKG_NAME:=libubox --PKG_VERSION:=2013-10-19 -+PKG_VERSION:=2014-07-16 - PKG_RELEASE=$(PKG_SOURCE_VERSION) - - PKG_SOURCE_PROTO:=git --PKG_SOURCE_URL:=git://nbd.name/luci2/libubox.git -+PKG_SOURCE_URL:=http://git.openwrt.org/project/libubox.git - PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) --PKG_SOURCE_VERSION:=734d28eb1a46358743cf8837c91e5d46695c3b91 -+PKG_SOURCE_VERSION:=bd388d2b6c2c151bf513c1e449417d18ce02d10b - PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz - PKG_MIRROR_MD5SUM:= - CMAKE_INSTALL:=1 -@@ -26,6 +26,7 @@ define Package/libubox - SECTION:=libs - CATEGORY:=Libraries - TITLE:=Basic utility library -+ ABI_VERSION:=$(PKG_VERSION) - DEPENDS:= - endef - -@@ -54,6 +55,13 @@ define Package/libjson-script - TITLE:=Minimalistic JSON based scripting engine - endef - -+define Package/libubox-lua -+ SECTION:=libs -+ CATEGORY:=Libraries -+ DEPENDS:=+libubox +liblua -+ TITLE:=Lua binding for the OpenWrt Basic utility library -+endef -+ - TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include - CMAKE_OPTIONS = \ - -DLUAPATH=/usr/lib/lua -@@ -79,7 +87,13 @@ define Package/libjson-script/install - $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libjson_script.so $(1)/lib/ - endef - -+define Package/libubox-lua/install -+ $(INSTALL_DIR) $(1)/usr/lib/lua -+ $(CP) $(PKG_BUILD_DIR)/lua/uloop.so $(1)/usr/lib/lua/ -+endef -+ - $(eval $(call BuildPackage,libubox)) - $(eval $(call BuildPackage,libblobmsg-json)) - $(eval $(call BuildPackage,jshn)) - $(eval $(call BuildPackage,libjson-script)) -+$(eval $(call BuildPackage,libubox-lua)) -diff --git a/package/netifd/Makefile b/package/netifd/Makefile -index 5f2ee03..faf3e09 100644 ---- a/package/netifd/Makefile -+++ b/package/netifd/Makefile -@@ -1,13 +1,13 @@ - include $(TOPDIR)/rules.mk - - PKG_NAME:=netifd --PKG_VERSION:=2013-07-16 -+PKG_VERSION:=2014-07-29 - PKG_RELEASE=$(PKG_SOURCE_VERSION) - - PKG_SOURCE_PROTO:=git --PKG_SOURCE_URL:=git://nbd.name/luci2/netifd.git -+PKG_SOURCE_URL:=http://git.openwrt.org/project/netifd.git - PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) --PKG_SOURCE_VERSION:=2674941b06c1ec67f1aff1bff9212e1372106641 -+PKG_SOURCE_VERSION:=4bf89afc22b43d5bd155d32d3998348a77179c1a - PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz - PKG_MAINTAINER:=Felix Fietkau - # PKG_MIRROR_MD5SUM:= -@@ -24,7 +24,7 @@ include $(INCLUDE_DIR)/cmake.mk - define Package/netifd - SECTION:=base - CATEGORY:=Base system -- DEPENDS:=+libuci +libnl-tiny +libubus +ubus +ubusd +jshn -+ DEPENDS:=+libuci +libnl-tiny +libubus +ubus +ubusd +jshn +libubox - TITLE:=OpenWrt Network Interface Configuration Daemon - endef - -@@ -40,7 +40,7 @@ define Package/netifd/install - $(INSTALL_DIR) $(1)/sbin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/netifd $(1)/sbin/ - $(CP) ./files/* $(1)/ -- $(CP) $(PKG_BUILD_DIR)/dummy/netifd-proto.sh $(1)/lib/netifd/ -+ $(CP) $(PKG_BUILD_DIR)/scripts/* $(1)/lib/netifd/ - endef - - $(eval $(call BuildPackage,netifd)) -diff --git a/package/netifd/files/etc/hotplug.d/iface/00-netstate b/package/netifd/files/etc/hotplug.d/iface/00-netstate -index c50cda6..023025c 100644 ---- a/package/netifd/files/etc/hotplug.d/iface/00-netstate -+++ b/package/netifd/files/etc/hotplug.d/iface/00-netstate -@@ -1,6 +1,5 @@ - [ ifup = "$ACTION" ] && { - uci_toggle_state network "$INTERFACE" up 1 -- uci_toggle_state network "$INTERFACE" connect_time $(sed -ne 's![^0-9].*$!!p' /proc/uptime) - [ -n "$DEVICE" ] && { - uci_toggle_state network "$INTERFACE" device "$(uci -q get network.$INTERFACE.ifname)" - uci_toggle_state network "$INTERFACE" ifname "$DEVICE" -diff --git a/package/netifd/files/lib/netifd/dhcp.script b/package/netifd/files/lib/netifd/dhcp.script -index 50163da..db3fc01 100755 ---- a/package/netifd/files/lib/netifd/dhcp.script -+++ b/package/netifd/files/lib/netifd/dhcp.script -@@ -33,9 +33,15 @@ setup_interface () { - for domain in $domain; do - proto_add_dns_search "$domain" - done -+ -+ proto_add_data -+ [ -n "$ZONE" ] && json_add_string zone "$ZONE" -+ proto_close_data -+ - proto_send_update "$INTERFACE" - -- if [ -n "$IFACE6RD" -a -n "$ip6rd" ]; then -+ -+ if [ "$IFACE6RD" != 0 -a -n "$ip6rd" ]; then - local v4mask="${ip6rd%% *}" - ip6rd="${ip6rd#* }" - local ip6rdprefixlen="${ip6rd%% *}" -@@ -44,19 +50,24 @@ setup_interface () { - ip6rd="${ip6rd#* }" - local ip6rdbr="${ip6rd%% *}" - --uci -q batch <<-EOF >/dev/null --set network.$IFACE6RD.proto=6rd --set network.$IFACE6RD.auto=0 --set network.$IFACE6RD.peeraddr=$ip6rdbr --set network.$IFACE6RD.ip4prefixlen=$v4mask --set network.$IFACE6RD.ip6prefix=$ip6rdprefix --set network.$IFACE6RD.ip6prefixlen=$ip6rdprefixlen --commit network --EOF -- -- ifdown "$IFACE6RD" -- /etc/init.d/network reload -- ifup "$IFACE6RD" -+ [ -n "$ZONE" ] || ZONE=$(fw3 network $INTERFACE) -+ [ -z "$IFACE6RD" -o "$IFACE6RD" = 1 ] && IFACE6RD=${INTERFACE}_6rd -+ -+ json_init -+ json_add_string name "$IFACE6RD" -+ json_add_string ifname "@$INTERFACE" -+ json_add_string proto "6rd" -+ json_add_string peeraddr "$ip6rdbr" -+ json_add_int ip4prefixlen "$v4mask" -+ json_add_string ip6prefix "$ip6rdprefix" -+ json_add_int ip6prefixlen "$ip6rdprefixlen" -+ json_add_string tunlink "$INTERFACE" -+ [ -n "$IFACE6RD_DELEGATE" ] && json_add_boolean delegate "$IFACE6RD_DELEGATE" -+ [ -n "$ZONE6RD" ] || ZONE6RD=$ZONE -+ [ -n "$ZONE6RD" ] && json_add_string zone "$ZONE6RD" -+ json_close_object -+ -+ ubus call network add_dynamic "$(json_dump)" - fi - - # TODO -diff --git a/package/netifd/files/lib/netifd/proto/dhcp.sh b/package/netifd/files/lib/netifd/proto/dhcp.sh -index a270c68..b14f7be 100755 ---- a/package/netifd/files/lib/netifd/proto/dhcp.sh -+++ b/package/netifd/files/lib/netifd/proto/dhcp.sh -@@ -5,31 +5,44 @@ - init_proto "$@" - - proto_dhcp_init_config() { -- proto_config_add_string "ipaddr" -- proto_config_add_string "netmask" -- proto_config_add_string "hostname" -- proto_config_add_string "clientid" -- proto_config_add_string "vendorid" -- proto_config_add_boolean "broadcast" -- proto_config_add_string "reqopts" -- proto_config_add_string "iface6rd" -+ renew_handler=1 -+ -+ proto_config_add_string 'ipaddr:ipaddr' -+ proto_config_add_string 'hostname:hostname' -+ proto_config_add_string clientid -+ proto_config_add_string vendorid -+ proto_config_add_boolean 'broadcast:bool' -+ proto_config_add_string 'reqopts:list(string)' -+ proto_config_add_string iface6rd -+ proto_config_add_string sendopts -+ proto_config_add_boolean delegate -+ proto_config_add_string zone6rd -+ proto_config_add_string zone - } - - proto_dhcp_setup() { - local config="$1" - local iface="$2" - -- local ipaddr hostname clientid vendorid broadcast reqopts iface6rd -- json_get_vars ipaddr hostname clientid vendorid broadcast reqopts iface6rd -+ local ipaddr hostname clientid vendorid broadcast reqopts iface6rd sendopts delegate zone6rd zone -+ json_get_vars ipaddr hostname clientid vendorid broadcast reqopts iface6rd sendopts delegate zone6rd zone - - local opt dhcpopts - for opt in $reqopts; do - append dhcpopts "-O $opt" - done - -+ for opt in $sendopts; do -+ append dhcpopts "-x $opt" -+ done -+ - [ "$broadcast" = 1 ] && broadcast="-B" || broadcast= - [ -n "$clientid" ] && clientid="-x 0x3d:${clientid//:/}" || clientid="-C" - [ -n "$iface6rd" ] && proto_export "IFACE6RD=$iface6rd" -+ [ -n "$iface6rd" ] && append dhcpopts "-O 212" -+ [ -n "$zone6rd" ] && proto_export "ZONE6RD=$zone6rd" -+ [ -n "$zone" ] && proto_export "ZONE=$zone" -+ [ "$delegate" = "0" ] && proto_export "IFACE6RD_DELEGATE=0" - - proto_export "INTERFACE=$config" - proto_run_command "$config" udhcpc \ -@@ -42,10 +55,16 @@ proto_dhcp_setup() { - $clientid $broadcast $dhcpopts - } - -+proto_dhcp_renew() { -+ local interface="$1" -+ # SIGUSR1 forces udhcpc to renew its lease -+ local sigusr1="$(kill -l SIGUSR1)" -+ [ -n "$sigusr1" ] && proto_kill_command "$interface" $sigusr1 -+} -+ - proto_dhcp_teardown() { - local interface="$1" - proto_kill_command "$interface" - } - - add_protocol dhcp -- -diff --git a/package/netifd/patches/001-musl_af_inet_include.patch b/package/netifd/patches/001-musl_af_inet_include.patch -new file mode 100644 -index 0000000..510ee05 ---- /dev/null -+++ b/package/netifd/patches/001-musl_af_inet_include.patch -@@ -0,0 +1,11 @@ -+diff -urN netifd-2012-10-29/utils.c netifd-2012-10-29.new/utils.c -+--- netifd-2012-10-29/utils.c 2012-11-23 17:15:39.000000000 +0100 -++++ netifd-2012-10-29.new/utils.c 2012-11-23 17:16:53.409244361 +0100 -+@@ -17,6 +17,7 @@ -+ -+ #include -+ #include -++#include -+ -+ void -+ __vlist_simple_init(struct vlist_simple_tree *tree, int offset) -diff --git a/package/netifd/patches/002-fix_compile_with_old_includes.patch b/package/netifd/patches/002-fix_compile_with_old_includes.patch -new file mode 100644 -index 0000000..361b2d1 ---- /dev/null -+++ b/package/netifd/patches/002-fix_compile_with_old_includes.patch -@@ -0,0 +1,34 @@ -+--- a/system-linux.c -++++ b/system-linux.c -+@@ -43,6 +43,31 @@ -+ #define RTN_FAILED_POLICY 12 -+ #endif -+ -++ -++#ifndef IFLA_IPTUN_MAX -++enum { -++ IFLA_IPTUN_UNSPEC, -++ IFLA_IPTUN_LINK, -++ IFLA_IPTUN_LOCAL, -++ IFLA_IPTUN_REMOTE, -++ IFLA_IPTUN_TTL, -++ IFLA_IPTUN_TOS, -++ IFLA_IPTUN_ENCAP_LIMIT, -++ IFLA_IPTUN_FLOWINFO, -++ IFLA_IPTUN_FLAGS, -++ IFLA_IPTUN_PROTO, -++ IFLA_IPTUN_PMTUDISC, -++ IFLA_IPTUN_6RD_PREFIX, -++ IFLA_IPTUN_6RD_RELAY_PREFIX, -++ IFLA_IPTUN_6RD_PREFIXLEN, -++ IFLA_IPTUN_6RD_RELAY_PREFIXLEN, -++ __IFLA_IPTUN_MAX, -++}; -++#define IFLA_IPTUN_MAX (__IFLA_IPTUN_MAX - 1) -++#endif -++ -++ -++ -+ #include -+ #include -+ #include -diff --git a/package/ubus/Makefile b/package/ubus/Makefile -index be18fb5..ba96b3b 100644 ---- a/package/ubus/Makefile -+++ b/package/ubus/Makefile -@@ -1,13 +1,13 @@ - include $(TOPDIR)/rules.mk - - PKG_NAME:=ubus --PKG_VERSION:=2013-08-08 -+PKG_VERSION:=2014-07-03 - PKG_RELEASE=$(PKG_SOURCE_VERSION) - - PKG_SOURCE_PROTO:=git - PKG_SOURCE_URL:=git://nbd.name/luci2/ubus.git - PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) --PKG_SOURCE_VERSION:=b20a8a01c7faea5bcc9d34d10dcf7736589021b8 -+PKG_SOURCE_VERSION:=f688c7ad0b2435a89bfd13f5496cabf596b54c8f - PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz - PKG_MIRROR_MD5SUM:= - CMAKE_INSTALL:=1 -@@ -38,6 +38,7 @@ define Package/libubus - SECTION:=libs - CATEGORY:=Libraries - DEPENDS:=+libubox -+ ABI_VERSION:=$(PKG_VERSION) - TITLE:=OpenWrt RPC client library - endef - -@@ -66,7 +67,7 @@ endef - - define Package/libubus/install - $(INSTALL_DIR) $(1)/lib -- $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/lib/ -+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so $(1)/lib/ - endef - - define Package/libubus-lua/install -@@ -74,8 +75,7 @@ define Package/libubus-lua/install - $(CP) $(PKG_BUILD_DIR)/lua/ubus.so $(1)/usr/lib/lua/ - endef - --$(eval $(call BuildPackage,ubus)) --$(eval $(call BuildPackage,ubusd)) - $(eval $(call BuildPackage,libubus)) - $(eval $(call BuildPackage,libubus-lua)) -- -+$(eval $(call BuildPackage,ubus)) -+$(eval $(call BuildPackage,ubusd)) -diff --git a/package/uci/Makefile b/package/uci/Makefile -index 54ad80b..29f9ef3 100644 ---- a/package/uci/Makefile -+++ b/package/uci/Makefile -@@ -1,5 +1,5 @@ - # --# Copyright (C) 2008-2013 OpenWrt.org -+# Copyright (C) 2008-2014 OpenWrt.org - # - # This is free software, licensed under the GNU General Public License v2. - # See /LICENSE for more information. -@@ -7,13 +7,13 @@ - - include $(TOPDIR)/rules.mk - --UCI_VERSION=2013-06-11 -+UCI_VERSION=2014-04-11 - UCI_RELEASE=1 - - PKG_NAME:=uci - PKG_VERSION:=$(UCI_VERSION)$(if $(UCI_RELEASE),.$(UCI_RELEASE)) - PKG_RELEASE:=1 --PKG_REV:=c9c9d5cb085acc58b6579ace83fb79c085a9db27 -+PKG_REV:=e339407372ffc70b1451e4eda218c01aa95a6a7f - - PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz - PKG_SOURCE_URL:=git://nbd.name/uci.git diff --git a/patches/openwrt/0004-Update-odhcp6c-from-Barrier-Breaker-r41830.patch b/patches/openwrt/0004-Update-odhcp6c-from-Barrier-Breaker-r41830.patch deleted file mode 100644 index 4338bdc2..00000000 --- a/patches/openwrt/0004-Update-odhcp6c-from-Barrier-Breaker-r41830.patch +++ /dev/null @@ -1,283 +0,0 @@ -From: Matthias Schiffer -Date: Sat, 11 Jan 2014 11:47:58 +0100 -Subject: Update odhcp6c from Barrier Breaker (r41830) - -diff --git a/package/odhcp6c/Makefile b/package/odhcp6c/Makefile -index e767064..3ec58e1 100644 ---- a/package/odhcp6c/Makefile -+++ b/package/odhcp6c/Makefile -@@ -8,26 +8,55 @@ - include $(TOPDIR)/rules.mk - - PKG_NAME:=odhcp6c --PKG_VERSION:=2013-10-02 --PKG_RELEASE=$(PKG_SOURCE_VERSION)-1 -+PKG_VERSION:=2014-07-21 -+PKG_RELEASE=$(PKG_SOURCE_VERSION) - - PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 - PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) - PKG_SOURCE_URL:=git://github.com/sbyx/odhcp6c.git - PKG_SOURCE_PROTO:=git --PKG_SOURCE_VERSION:=357ecc1f5163bc7f74c64f4bca387e8d44a2eac5 -+PKG_SOURCE_VERSION:=67b311ab81736b35858664219d345844ab08fcc7 - PKG_MAINTAINER:=Steven Barth - - include $(INCLUDE_DIR)/package.mk - include $(INCLUDE_DIR)/cmake.mk - -+ifneq ($(CONFIG_PACKAGE_odhcp6c_ext_prefix_class),0) -+ CMAKE_OPTIONS += -DEXT_PREFIX_CLASS=$(CONFIG_PACKAGE_odhcp6c_ext_prefix_class) -+endif -+ -+ifneq ($(CONFIG_PACKAGE_odhcp6c_ext_cer_id),0) -+ CMAKE_OPTIONS += -DEXT_CER_ID=$(CONFIG_PACKAGE_odhcp6c_ext_cer_id) -+endif -+ -+ifneq ($(CONFIG_PACKAGE_odhcp6c_ext_s46),0) -+ CMAKE_OPTIONS += -DEXT_S46=$(CONFIG_PACKAGE_odhcp6c_ext_s46) -+endif -+ - define Package/odhcp6c -- SECTION:=ipv6 -- CATEGORY:=IPv6 -+ SECTION:=net -+ CATEGORY:=Network - TITLE:=Embedded DHCPv6-client for OpenWrt - DEPENDS:=+kmod-ipv6 - endef - -+define Package/odhcp6c/config -+ config PACKAGE_odhcp6c_ext_prefix_class -+ int "Prefix Class Extension ID (0 = disabled)" -+ depends on PACKAGE_odhcp6c -+ default 0 -+ -+ config PACKAGE_odhcp6c_ext_cer_id -+ int "CER-ID Extension ID (0 = disabled)" -+ depends on PACKAGE_odhcp6c -+ default 0 -+ -+ config PACKAGE_odhcp6c_ext_s46 -+ int "Softwire MAP Extension ID (0 = disabled)" -+ depends on PACKAGE_odhcp6c -+ default 0 -+endef -+ - define Package/odhcp6c/install - $(INSTALL_DIR) $(1)/usr/sbin/ - $(INSTALL_BIN) $(PKG_BUILD_DIR)/odhcp6c $(1)/usr/sbin/ -diff --git a/package/odhcp6c/files/dhcpv6.script b/package/odhcp6c/files/dhcpv6.script -index 324a823..8c1ba18 100755 ---- a/package/odhcp6c/files/dhcpv6.script -+++ b/package/odhcp6c/files/dhcpv6.script -@@ -64,23 +64,68 @@ setup_interface () { - entry="${entry#*,}" - local metric="${entry%%,*}" - -- proto_add_ipv6_route "$addr" "$mask" "$gw" "$metric" "$valid" -+ if [ -z "$SOURCE_ROUTING" -o -z "$gw" ]; then -+ proto_add_ipv6_route "$addr" "$mask" "$gw" "$metric" "$valid" -+ else -+ proto_add_ipv6_route "$addr" "$mask" "$gw" "$metric" "$valid" "::/128" -+ for prefix in $PREFIXES $ADDRESSES; do -+ local paddr="${prefix%%,*}" -+ proto_add_ipv6_route "$addr" "$mask" "$gw" "$metric" "$valid" "$paddr" -+ done -+ fi - done - -+ proto_add_data -+ [ -n "$CER" ] && json_add_string cer "$CER" -+ [ -n "$PASSTHRU" ] && json_add_string passthru "$PASSTHRU" -+ [ -n "$ZONE" ] && json_add_string zone "$ZONE" -+ proto_close_data -+ - proto_send_update "$INTERFACE" - -- if [ -n "$AFTR_IP " -a -n "$IFACE_DSLITE" ]; then --uci -q batch <<-EOF >/dev/null --set network.$IFACE_DSLITE.proto=dslite --set network.$IFACE_DSLITE.auto=0 --set network.$IFACE_DSLITE.peeraddr=$AFTR_IP --set network.$IFACE_DSLITE.tunlink=$INTERFACE --commit network --EOF -- -- ifdown "$IFACE_DSLITE" -- /etc/init.d/network reload -- ifup "$IFACE_DSLITE" -+ MAPTYPE="" -+ MAPRULE="" -+ -+ if [ -n "$MAPE" -a -f /lib/netifd/proto/map.sh ]; then -+ MAPTYPE="map-e" -+ MAPRULE="$MAPE" -+ elif [ -n "$MAPT" -a -f /lib/netifd/proto/map.sh -a -f /proc/net/nat46/control ]; then -+ MAPTYPE="map-t" -+ MAPRULE="$MAPT" -+ elif [ -n "$LW4O6" -a -f /lib/netifd/proto/map.sh ]; then -+ MAPTYPE="lw4o6" -+ MAPRULE="$LW4O6" -+ fi -+ -+ [ -n "$ZONE" ] || ZONE=$(fw3 network $INTERFACE) -+ -+ if [ "$IFACE_MAP" != 0 -a -n "$MAPTYPE" -a -n "$MAPRULE" ]; then -+ [ -z "$IFACE_MAP" -o "$IFACE_MAP" = 1 ] && IFACE_MAP=${INTERFACE}_map -+ json_init -+ json_add_string name "$IFACE_MAP" -+ json_add_string ifname "@$INTERFACE" -+ json_add_string proto map -+ json_add_string type "$MAPTYPE" -+ json_add_string rule "$MAPRULE" -+ json_add_string tunlink "$INTERFACE" -+ [ -n "$ZONE_MAP" ] || ZONE_MAP=$ZONE -+ [ -n "$ZONE_MAP" ] && json_add_string zone "$ZONE_MAP" -+ [ -n "$IFACE_MAP_DELEGATE" ] && json_add_boolean delegate "$IFACE_MAP_DELEGATE" -+ json_close_object -+ ubus call network add_dynamic "$(json_dump)" -+ elif [ -n "$AFTR_IP " -a "$IFACE_DSLITE" != 0 -a -f /lib/netifd/proto/dslite.sh ]; then -+ [ -z "$IFACE_DSLITE" -o "$IFACE_DSLITE" = 1 ] && IFACE_DSLITE=${INTERFACE}_dslite -+ json_init -+ json_add_string name "$IFACE_DSLITE" -+ json_add_string ifname "@$INTERFACE" -+ json_add_string proto "dslite" -+ json_add_string peeraddr "$AFTR_IP" -+ json_add_string tunlink "$INTERFACE" -+ [ -n "$ZONE_DSLITE" ] || ZONE_DSLITE=$ZONE -+ [ -n "$ZONE_DSLITE" ] && json_add_string zone "$ZONE_DSLITE" -+ [ -n "$IFACE_DSLITE_DELEGATE" ] && json_add_boolean delegate "$IFACE_DSLITE_DELEGATE" -+ json_close_object -+ ubus call network add_dynamic "$(json_dump)" - fi - - # TODO: $SNTP_IP $SIP_IP $SNTP_FQDN $SIP_DOMAIN -diff --git a/package/odhcp6c/files/dhcpv6.sh b/package/odhcp6c/files/dhcpv6.sh -index bf6cd9a..0690bd1 100755 ---- a/package/odhcp6c/files/dhcpv6.sh -+++ b/package/odhcp6c/files/dhcpv6.sh -@@ -5,23 +5,35 @@ - init_proto "$@" - - proto_dhcpv6_init_config() { -- proto_config_add_string "reqaddress" -- proto_config_add_string "reqprefix" -- proto_config_add_string "clientid" -- proto_config_add_string "reqopts" -- proto_config_add_string "noslaaconly" -- proto_config_add_string "norelease" -- proto_config_add_string "ip6prefix" -- proto_config_add_string "iface_dslite" -- proto_config_add_string "ifaceid" -+ renew_handler=1 -+ -+ proto_config_add_string 'reqaddress:or("try","force","none")' -+ proto_config_add_string 'reqprefix:or("auto","no",range(0, 64))' -+ proto_config_add_string clientid -+ proto_config_add_string 'reqopts:list(uinteger)' -+ proto_config_add_string 'noslaaconly:bool' -+ proto_config_add_string 'forceprefix:bool' -+ proto_config_add_string 'norelease:bool' -+ proto_config_add_string 'ip6prefix:ip6addr' -+ proto_config_add_string iface_dslite -+ proto_config_add_string zone_dslite -+ proto_config_add_string iface_map -+ proto_config_add_string zone_map -+ proto_config_add_string zone -+ proto_config_add_string 'ifaceid:ip6addr' -+ proto_config_add_string 'sourcerouting:bool' -+ proto_config_add_string "userclass" -+ proto_config_add_string "vendorclass" -+ proto_config_add_boolean delegate -+ proto_config_add_int "soltimeout" - } - - proto_dhcpv6_setup() { - local config="$1" - local iface="$2" - -- local reqaddress reqprefix clientid reqopts noslaaconly norelease ip6prefix iface_dslite ifaceid -- json_get_vars reqaddress reqprefix clientid reqopts noslaaconly norelease ip6prefix iface_dslite ifaceid -+ local reqaddress reqprefix clientid reqopts noslaaconly forceprefix norelease ip6prefix iface_dslite iface_map ifaceid sourcerouting userclass vendorclass delegate zone_dslite zone_map zone soltimeout -+ json_get_vars reqaddress reqprefix clientid reqopts noslaaconly forceprefix norelease ip6prefix iface_dslite iface_map ifaceid sourcerouting userclass vendorclass delegate zone_dslite zone_map zone soltimeout - - - # Configure -@@ -35,16 +47,31 @@ proto_dhcpv6_setup() { - - [ "$noslaaconly" = "1" ] && append opts "-S" - -+ [ "$forceprefix" = "1" ] && append opts "-F" -+ - [ "$norelease" = "1" ] && append opts "-k" - - [ -n "$ifaceid" ] && append opts "-i$ifaceid" - -+ [ -n "$vendorclass" ] && append opts "-V$vendorclass" -+ -+ [ -n "$userclass" ] && append opts "-u$userclass" -+ - for opt in $reqopts; do - append opts "-r$opt" - done - -+ append opts "-t${soltimeout:-120}" -+ - [ -n "$ip6prefix" ] && proto_export "USERPREFIX=$ip6prefix" - [ -n "$iface_dslite" ] && proto_export "IFACE_DSLITE=$iface_dslite" -+ [ -n "$iface_map" ] && proto_export "IFACE_MAP=$iface_map" -+ [ "$sourcerouting" != "0" ] && proto_export "SOURCE_ROUTING=1" -+ [ "$delegate" = "0" ] && proto_export "IFACE_DSLITE_DELEGATE=0" -+ [ "$delegate" = "0" ] && proto_export "IFACE_MAP_DELEGATE=0" -+ [ -n "$zone_dslite" ] && proto_export "ZONE_DSLITE=$zone_dslite" -+ [ -n "$zone_map" ] && proto_export "ZONE_MAP=$zone_map" -+ [ -n "$zone" ] && proto_export "ZONE=$zone" - - proto_export "INTERFACE=$config" - proto_run_command "$config" odhcp6c \ -@@ -52,6 +79,13 @@ proto_dhcpv6_setup() { - $opts $iface - } - -+proto_dhcpv6_renew() { -+ local interface="$1" -+ # SIGUSR1 forces odhcp6c to renew its lease -+ local sigusr1="$(kill -l SIGUSR1)" -+ [ -n "$sigusr1" ] && proto_kill_command "$interface" $sigusr1 -+} -+ - proto_dhcpv6_teardown() { - local interface="$1" - proto_kill_command "$interface" -diff --git a/package/odhcp6c/patches/001-fix-integer-overflow-after-50-days.patch b/package/odhcp6c/patches/001-fix-integer-overflow-after-50-days.patch -deleted file mode 100644 -index 292d023..0000000 ---- a/package/odhcp6c/patches/001-fix-integer-overflow-after-50-days.patch -+++ /dev/null -@@ -1,25 +0,0 @@ --From 5b98f902f616bd9b96a2128587bc6995555a43c1 Mon Sep 17 00:00:00 2001 --From: Steven Barth --Date: Fri, 7 Mar 2014 10:33:49 +0100 --Subject: [PATCH] fix integer overflow after 50 days (thx Hauke Mehrtens) -- ----- -- src/odhcp6c.c | 2 +- -- 1 file changed, 1 insertion(+), 1 deletion(-) -- --diff --git a/src/odhcp6c.c b/src/odhcp6c.c --index 3c6b3b0..ba11ced 100644 ----- a/src/odhcp6c.c --+++ b/src/odhcp6c.c --@@ -470,7 +470,7 @@ uint64_t odhcp6c_get_milli_time(void) -- { -- struct timespec t = {0, 0}; -- syscall(SYS_clock_gettime, CLOCK_MONOTONIC, &t); --- return t.tv_sec * 1000 + t.tv_nsec / 1000000; --+ return ((uint64_t)t.tv_sec) * 1000 + ((uint64_t)t.tv_nsec) / 1000000; -- } -- -- ---- --1.7.10.4 -- diff --git a/patches/openwrt/0005-package-base-files-change-sysctl-handling.patch b/patches/openwrt/0005-package-base-files-change-sysctl-handling.patch deleted file mode 100644 index f2605897..00000000 --- a/patches/openwrt/0005-package-base-files-change-sysctl-handling.patch +++ /dev/null @@ -1,22 +0,0 @@ -From: Matthias Schiffer -Date: Sat, 11 Jan 2014 13:31:13 +0100 -Subject: package/base-files: change sysctl handling - -Add hotplug script that applies interface specific sysctls for interfaces that -only appear later - this allows to reliably configure per-interface parameters -in sysctl.conf, e.g. to disable ipv6 autoconfig on a specific iface. - -Cherry-picked from Barrier Breaker - -diff --git a/package/base-files/files/etc/hotplug.d/net/00-sysctl b/package/base-files/files/etc/hotplug.d/net/00-sysctl -new file mode 100644 -index 0000000..5d9da8a ---- /dev/null -+++ b/package/base-files/files/etc/hotplug.d/net/00-sysctl -@@ -0,0 +1,6 @@ -+#!/bin/sh -+ -+if [ -f /etc/sysctl.conf ] && [ "$ACTION" = add ]; then -+ sed -ne "/^[[:space:]]*net\..*\.$DEVICENAME\./p" /etc/sysctl.conf | \ -+ sysctl -e -p - | logger -t sysctl -+fi diff --git a/patches/openwrt/0006-Fix-ping6-sender-address.patch b/patches/openwrt/0006-Fix-ping6-sender-address.patch deleted file mode 100644 index c70848f4..00000000 --- a/patches/openwrt/0006-Fix-ping6-sender-address.patch +++ /dev/null @@ -1,39 +0,0 @@ -From: Matthias Schiffer -Date: Sat, 11 Jan 2014 17:08:59 +0100 -Subject: Fix ping6 sender address - -diff --git a/package/busybox/patches/960-ping6_sender_address.patch b/package/busybox/patches/960-ping6_sender_address.patch -new file mode 100644 -index 0000000..7c56a6d ---- /dev/null -+++ b/package/busybox/patches/960-ping6_sender_address.patch -@@ -0,0 +1,29 @@ -+--- a/networking/ping.c -++++ b/networking/ping.c -+@@ -638,7 +638,7 @@ static void unpack4(char *buf, int sz, s -+ } -+ } -+ #if ENABLE_PING6 -+-static void unpack6(char *packet, int sz, /*struct sockaddr_in6 *from,*/ int hoplimit) -++static void unpack6(char *packet, int sz, struct sockaddr_in6 *from, int hoplimit) -+ { -+ struct icmp6_hdr *icmppkt; -+ char buf[INET6_ADDRSTRLEN]; -+@@ -658,7 +658,7 @@ static void unpack6(char *packet, int sz -+ if (sz >= sizeof(struct icmp6_hdr) + sizeof(uint32_t)) -+ tp = (uint32_t *) &icmppkt->icmp6_data8[4]; -+ unpack_tail(sz, tp, -+- inet_ntop(AF_INET6, &pingaddr.sin6.sin6_addr, -++ inet_ntop(AF_INET6, &from->sin6_addr, -+ buf, sizeof(buf)), -+ recv_seq, hoplimit); -+ } else if (icmppkt->icmp6_type != ICMP6_ECHO_REQUEST) { -+@@ -808,7 +808,7 @@ static void ping6(len_and_sockaddr *lsa) -+ move_from_unaligned_int(hoplimit, CMSG_DATA(mp)); -+ } -+ } -+- unpack6(G.rcv_packet, c, /*&from,*/ hoplimit); -++ unpack6(G.rcv_packet, c, &from, hoplimit); -+ if (pingcount && nreceived >= pingcount) -+ break; -+ } diff --git a/patches/openwrt/0007-ar71xx-add-kernel-support-for-the-TL-WDR3500-board.patch b/patches/openwrt/0007-ar71xx-add-kernel-support-for-the-TL-WDR3500-board.patch deleted file mode 100644 index df15852d..00000000 --- a/patches/openwrt/0007-ar71xx-add-kernel-support-for-the-TL-WDR3500-board.patch +++ /dev/null @@ -1,246 +0,0 @@ -From: juhosg -Date: Fri, 1 Feb 2013 15:50:29 +0000 -Subject: ar71xx: add kernel support for the TL-WDR3500 board - -WDR3500 is similar to WDR3600 except it doesn't have gigabit ethernet, -and has only 1 USB port. - -Pending issues: - - * Leds are not working at all (except power and wlan_5g) - * LAN switch ethernet ports are reversed with respect to case label. - - [Label] -> soft device - [LAN1] -> eth0.4 - [LAN2] -> eth0.3 - [LAN3] -> eth0.2 - [LAN4] -> eth0.1 - -Based on http://patchwork.openwrt.org/patch/3208/ - -Thanks-to: Paul Fertser -Signed-off-by: Gui Iribarren -Signed-off-by: Gabor Juhos - -git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35423 3c298f89-4303-0410-b956-a3cf2f4a3e73 - -Conflicts: - target/linux/ar71xx/config-3.7 - -diff --git a/target/linux/ar71xx/config-3.3 b/target/linux/ar71xx/config-3.3 -index 446f202..dfc5bf2 100644 ---- a/target/linux/ar71xx/config-3.3 -+++ b/target/linux/ar71xx/config-3.3 -@@ -60,6 +60,7 @@ CONFIG_ATH79_MACH_TL_MR3020=y - CONFIG_ATH79_MACH_TL_MR3X20=y - CONFIG_ATH79_MACH_TL_WA901ND=y - CONFIG_ATH79_MACH_TL_WA901ND_V2=y -+CONFIG_ATH79_MACH_TL_WDR3500=y - CONFIG_ATH79_MACH_TL_WDR4300=y - CONFIG_ATH79_MACH_TL_WR1041N_V2=y - CONFIG_ATH79_MACH_TL_WR1043ND=y -diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wdr3500.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wdr3500.c -new file mode 100644 -index 0000000..05fe83d ---- /dev/null -+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wdr3500.c -@@ -0,0 +1,153 @@ -+/* -+ * TP-LINK TL-WDR3500 board support -+ * -+ * Copyright (C) 2012 Gabor Juhos -+ * Copyright (C) 2013 Gui Iribarren -+ * -+ * 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 -+#include -+#include -+#include -+#include -+#include -+ -+#include -+ -+#include "common.h" -+#include "dev-ap9x-pci.h" -+#include "dev-eth.h" -+#include "dev-gpio-buttons.h" -+#include "dev-leds-gpio.h" -+#include "dev-m25p80.h" -+#include "dev-spi.h" -+#include "dev-usb.h" -+#include "dev-wmac.h" -+#include "machtypes.h" -+ -+#define WDR3500_GPIO_LED_USB1 11 -+#define WDR3500_GPIO_LED_WLAN2G 13 -+#define WDR3500_GPIO_LED_SYSTEM 14 -+#define WDR3500_GPIO_LED_QSS 15 -+ -+#define WDR3500_GPIO_BTN_WPS 16 -+#define WDR3500_GPIO_BTN_RFKILL 17 -+ -+#define WDR3500_GPIO_USB1_POWER 22 -+ -+#define WDR3500_KEYS_POLL_INTERVAL 20 /* msecs */ -+#define WDR3500_KEYS_DEBOUNCE_INTERVAL (3 * WDR3500_KEYS_POLL_INTERVAL) -+ -+#define WDR3500_MAC0_OFFSET 0 -+#define WDR3500_MAC1_OFFSET 6 -+#define WDR3500_WMAC_CALDATA_OFFSET 0x1000 -+#define WDR3500_PCIE_CALDATA_OFFSET 0x5000 -+ -+static const char *wdr3500_part_probes[] = { -+ "tp-link", -+ NULL, -+}; -+ -+static struct flash_platform_data wdr3500_flash_data = { -+ .part_probes = wdr3500_part_probes, -+}; -+ -+static struct gpio_led wdr3500_leds_gpio[] __initdata = { -+ { -+ .name = "tp-link:green:qss", -+ .gpio = WDR3500_GPIO_LED_QSS, -+ .active_low = 1, -+ }, -+ { -+ .name = "tp-link:green:system", -+ .gpio = WDR3500_GPIO_LED_SYSTEM, -+ .active_low = 1, -+ }, -+ { -+ .name = "tp-link:green:usb1", -+ .gpio = WDR3500_GPIO_LED_USB1, -+ .active_low = 1, -+ }, -+ { -+ .name = "tp-link:green:wlan2g", -+ .gpio = WDR3500_GPIO_LED_WLAN2G, -+ .active_low = 1, -+ }, -+}; -+ -+static struct gpio_keys_button wdr3500_gpio_keys[] __initdata = { -+ { -+ .desc = "QSS button", -+ .type = EV_KEY, -+ .code = KEY_WPS_BUTTON, -+ .debounce_interval = WDR3500_KEYS_DEBOUNCE_INTERVAL, -+ .gpio = WDR3500_GPIO_BTN_WPS, -+ .active_low = 1, -+ }, -+ { -+ .desc = "RFKILL switch", -+ .type = EV_SW, -+ .code = KEY_RFKILL, -+ .debounce_interval = WDR3500_KEYS_DEBOUNCE_INTERVAL, -+ .gpio = WDR3500_GPIO_BTN_RFKILL, -+ }, -+}; -+ -+ -+static void __init wdr3500_setup(void) -+{ -+ u8 *mac = (u8 *) KSEG1ADDR(0x1f01fc00); -+ u8 *art = (u8 *) KSEG1ADDR(0x1fff0000); -+ u8 tmpmac[ETH_ALEN]; -+ -+ ath79_register_m25p80(&wdr3500_flash_data); -+ ath79_register_leds_gpio(-1, ARRAY_SIZE(wdr3500_leds_gpio), -+ wdr3500_leds_gpio); -+ ath79_register_gpio_keys_polled(-1, WDR3500_KEYS_POLL_INTERVAL, -+ ARRAY_SIZE(wdr3500_gpio_keys), -+ wdr3500_gpio_keys); -+ -+ ath79_init_mac(tmpmac, mac, 0); -+ ath79_register_wmac(art + WDR3500_WMAC_CALDATA_OFFSET, tmpmac); -+ -+ ath79_init_mac(tmpmac, mac, 1); -+ ap9x_pci_setup_wmac_led_pin(0, 0); -+ ap91_pci_init(art + WDR3500_PCIE_CALDATA_OFFSET, tmpmac); -+ -+ ath79_setup_ar934x_eth_cfg(AR934X_ETH_CFG_SW_ONLY_MODE); -+ -+ ath79_register_mdio(1, 0x0); -+ -+ /* LAN */ -+ ath79_init_mac(ath79_eth1_data.mac_addr, mac, -1); -+ -+ /* GMAC1 is connected to the internal switch */ -+ ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_GMII; -+ -+ ath79_register_eth(1); -+ -+ /* WAN */ -+ ath79_init_mac(ath79_eth0_data.mac_addr, mac, 2); -+ -+ /* GMAC0 is connected to the PHY4 of the internal switch */ -+ ath79_switch_data.phy4_mii_en = 1; -+ ath79_switch_data.phy_poll_mask = BIT(4); -+ ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_MII; -+ ath79_eth0_data.phy_mask = BIT(4); -+ ath79_eth0_data.mii_bus_dev = &ath79_mdio1_device.dev; -+ -+ ath79_register_eth(0); -+ -+ gpio_request_one(WDR3500_GPIO_USB1_POWER, -+ GPIOF_OUT_INIT_HIGH | GPIOF_EXPORT_DIR_FIXED, -+ "USB1 power"); -+ ath79_register_usb(); -+} -+ -+MIPS_MACHINE(ATH79_MACH_TL_WDR3500, "TL-WDR3500", -+ "TP-LINK TL-WDR3500", -+ wdr3500_setup); -diff --git a/target/linux/ar71xx/patches-3.3/613-MIPS-ath79-add-TL-WDR3500-support.patch b/target/linux/ar71xx/patches-3.3/613-MIPS-ath79-add-TL-WDR3500-support.patch -new file mode 100644 -index 0000000..0a2c3bd ---- /dev/null -+++ b/target/linux/ar71xx/patches-3.3/613-MIPS-ath79-add-TL-WDR3500-support.patch -@@ -0,0 +1,40 @@ -+--- a/arch/mips/ath79/machtypes.h -++++ b/arch/mips/ath79/machtypes.h -+@@ -84,6 +84,7 @@ enum ath79_mach_type { -+ ATH79_MACH_TL_WA7510N_V1, /* TP-LINK TL-WA7510N v1*/ -+ ATH79_MACH_TL_WA901ND, /* TP-LINK TL-WA901ND */ -+ ATH79_MACH_TL_WA901ND_V2, /* TP-LINK TL-WA901ND v2 */ -++ ATH79_MACH_TL_WDR3500, /* TP-LINK TL-WDR3500 */ -+ ATH79_MACH_TL_WDR4300, /* TP-LINK TL-WDR4300 */ -+ ATH79_MACH_TL_WR1041N_V2, /* TP-LINK TL-WR1041N v2 */ -+ ATH79_MACH_TL_WR1043ND, /* TP-LINK TL-WR1043ND */ -+--- a/arch/mips/ath79/Kconfig -++++ b/arch/mips/ath79/Kconfig -+@@ -514,6 +514,17 @@ config ATH79_MACH_TL_WA901ND_V2 -+ select ATH79_DEV_M25P80 -+ select ATH79_DEV_WMAC -+ -++config ATH79_MACH_TL_WDR3500 -++ bool "TP-LINK TL-WDR3500 board support" -++ select SOC_AR934X -++ select ATH79_DEV_AP9X_PCI if PCI -++ select ATH79_DEV_ETH -++ select ATH79_DEV_GPIO_BUTTONS -++ select ATH79_DEV_LEDS_GPIO -++ select ATH79_DEV_M25P80 -++ select ATH79_DEV_USB -++ select ATH79_DEV_WMAC -++ -+ config ATH79_MACH_TL_WDR4300 -+ bool "TP-LINK TL-WDR3600/4300/4310 board support" -+ select SOC_AR934X -+--- a/arch/mips/ath79/Makefile -++++ b/arch/mips/ath79/Makefile -+@@ -81,6 +81,7 @@ obj-$(CONFIG_ATH79_MACH_TL_MR3020) += ma -+ obj-$(CONFIG_ATH79_MACH_TL_MR3X20) += mach-tl-mr3x20.o -+ obj-$(CONFIG_ATH79_MACH_TL_WA901ND) += mach-tl-wa901nd.o -+ obj-$(CONFIG_ATH79_MACH_TL_WA901ND_V2) += mach-tl-wa901nd-v2.o -++obj-$(CONFIG_ATH79_MACH_TL_WDR3500) += mach-tl-wdr3500.o -+ obj-$(CONFIG_ATH79_MACH_TL_WDR4300) += mach-tl-wdr4300.o -+ obj-$(CONFIG_ATH79_MACH_TL_WR741ND) += mach-tl-wr741nd.o -+ obj-$(CONFIG_ATH79_MACH_TL_WR741ND_V4) += mach-tl-wr741nd-v4.o diff --git a/patches/openwrt/0008-ar71xx-add-user-space-support-for-TL-WDR3500-board.patch b/patches/openwrt/0008-ar71xx-add-user-space-support-for-TL-WDR3500-board.patch deleted file mode 100644 index c6d1bcc4..00000000 --- a/patches/openwrt/0008-ar71xx-add-user-space-support-for-TL-WDR3500-board.patch +++ /dev/null @@ -1,48 +0,0 @@ -From: juhosg -Date: Fri, 1 Feb 2013 15:50:32 +0000 -Subject: ar71xx: add user-space support for TL-WDR3500 board - -Based on http://patchwork.openwrt.org/patch/3208/ - -Thanks-to: Paul Fertser -Signed-off-by: Gui Iribarren -Signed-off-by: Gabor Juhos - -git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35424 3c298f89-4303-0410-b956-a3cf2f4a3e73 - -diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh -index fe7c910..8d71352 100755 ---- a/target/linux/ar71xx/base-files/lib/ar71xx.sh -+++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh -@@ -123,6 +123,9 @@ tplink_board_detect() { - "342000"*) - model="TP-Link TL-MR3420" - ;; -+ "350000"*) -+ model="TP-Link TL-WDR3500" -+ ;; - "360000"*) - model="TP-Link TL-WDR3600" - ;; -@@ -357,6 +360,9 @@ ar71xx_board_detect() { - *"TL-WA901ND v2") - name="tl-wa901nd-v2" - ;; -+ *"TL-WDR3500") -+ name="tl-wdr3500" -+ ;; - *"TL-WDR3600/4300/4310") - name="tl-wdr4300" - ;; -diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh -index 49b1de9..e52ad9e 100755 ---- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh -+++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh -@@ -155,6 +155,7 @@ platform_check_image() { - tl-wa7510n | \ - tl-wa901nd | \ - tl-wa901nd-v2 | \ -+ tl-wdr3500 | \ - tl-wdr4300 | \ - tl-wr703n | \ - tl-wr741nd | \ diff --git a/patches/openwrt/0009-ar71xx-build-image-for-the-TL-WDR3500-board.patch b/patches/openwrt/0009-ar71xx-build-image-for-the-TL-WDR3500-board.patch deleted file mode 100644 index 80e3cf76..00000000 --- a/patches/openwrt/0009-ar71xx-build-image-for-the-TL-WDR3500-board.patch +++ /dev/null @@ -1,55 +0,0 @@ -From: juhosg -Date: Fri, 1 Feb 2013 15:50:34 +0000 -Subject: ar71xx: build image for the TL-WDR3500 board - -Based on http://patchwork.openwrt.org/patch/3208/ - -Thanks-to: Paul Fertser -Signed-off-by: Gui Iribarren -Signed-off-by: Gabor Juhos - -git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35425 3c298f89-4303-0410-b956-a3cf2f4a3e73 - -Conflicts: - target/linux/ar71xx/image/Makefile - -diff --git a/target/linux/ar71xx/generic/profiles/tp-link.mk b/target/linux/ar71xx/generic/profiles/tp-link.mk -index 07d7059..3d7859c 100644 ---- a/target/linux/ar71xx/generic/profiles/tp-link.mk -+++ b/target/linux/ar71xx/generic/profiles/tp-link.mk -@@ -105,12 +105,12 @@ $(eval $(call Profile,TLWA901)) - - - define Profile/TLWDR4300 -- NAME:=TP-LINK TL-WDR3600/4300/4310 -+ NAME:=TP-LINK TL-WDR3500/3600/4300/4310 - PACKAGES:=kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev - endef - - define Profile/TLWDR4300/Description -- Package set optimized for the TP-LINK TL-WDR3600/4300/4310. -+ Package set optimized for the TP-LINK TL-WDR3500/3600/4300/4310. - endef - $(eval $(call Profile,TLWDR4300)) - -diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile -index 8e82f7f..01d1e67 100644 ---- a/target/linux/ar71xx/image/Makefile -+++ b/target/linux/ar71xx/image/Makefile -@@ -881,6 +881,7 @@ $(eval $(call SingleProfile,TPLINK-LZMA,$(fs_64kraw),TLWR741NV4,tl-wr741nd-v4,TL - $(eval $(call SingleProfile,TPLINK-LZMA,$(fs_64kraw),TLWR841NV8,tl-wr841n-v8,TL-WR841N-v8,ttyS0,115200,0x08410008,1,4Mlzma)) - $(eval $(call SingleProfile,TPLINK-LZMA,$(fs_64kraw),TLWR1041,tl-wr1041n-v2,TL-WR1041N-v2,ttyS0,115200,0x10410002,1,4Mlzma)) - $(eval $(call SingleProfile,TPLINK-LZMA,$(fs_64kraw),TLWR2543,tl-wr2543-v1,TL-WR2543N,ttyS0,115200,0x25430001,1,8Mlzma,-v 3.13.99)) -+$(eval $(call SingleProfile,TPLINK-LZMA,$(fs_64kraw),TLWDR3500V1,tl-wdr3500-v1,TL-WDR3500,ttyS0,115200,0x35000001,1,8Mlzma)) - $(eval $(call SingleProfile,TPLINK-LZMA,$(fs_64kraw),TLWDR3600V1,tl-wdr3600-v1,TL-WDR4300,ttyS0,115200,0x36000001,1,8Mlzma)) - $(eval $(call SingleProfile,TPLINK-LZMA,$(fs_64kraw),TLWDR4300V1,tl-wdr4300-v1,TL-WDR4300,ttyS0,115200,0x43000001,1,8Mlzma)) - $(eval $(call SingleProfile,TPLINK-LZMA,$(fs_64kraw),TLWDR4310V1,tl-wdr4310-v1,TL-WDR4300,ttyS0,115200,0x43100001,1,8Mlzma)) -@@ -925,7 +926,7 @@ $(eval $(call MultiProfile,TLWR740,TLWR740NV1 TLWR740NV3 TLWR740NV4)) - $(eval $(call MultiProfile,TLWR741,TLWR741NV1 TLWR741NV2 TLWR741NV4)) - $(eval $(call MultiProfile,TLWR841,TLWR841NV15 TLWR841NV3 TLWR841NV5 TLWR841NV7 TLWR841NV8)) - $(eval $(call MultiProfile,TLWR941,TLWR941NV2 TLWR941NV3 TLWR941NV4)) --$(eval $(call MultiProfile,TLWDR4300,TLWDR3600V1 TLWDR4300V1 TLWDR4310V1)) -+$(eval $(call MultiProfile,TLWDR4300,TLWDR3500V1 TLWDR3600V1 TLWDR4300V1 TLWDR4310V1)) - $(eval $(call MultiProfile,UBNT,UBNTAIRROUTER UBNTRS UBNTRSPRO UBNTLSSR71 UBNTBULLETM UBNTROCKETM UBNTNANOM UBNTUNIFI UBNTUNIFIOUTDOOR)) - $(eval $(call MultiProfile,WNDR3700,WNDR3700V1 WNDR3700V2 WNDR3800 WNDRMAC WNDRMACV2)) - $(eval $(call MultiProfile,WP543,WP543_2M WP543_4M WP543_8M WP543_16M)) diff --git a/patches/openwrt/0010-ar71xx-add-default-switch-configuration-for-the-TL-WDR3500.patch b/patches/openwrt/0010-ar71xx-add-default-switch-configuration-for-the-TL-WDR3500.patch deleted file mode 100644 index 14456f7c..00000000 --- a/patches/openwrt/0010-ar71xx-add-default-switch-configuration-for-the-TL-WDR3500.patch +++ /dev/null @@ -1,23 +0,0 @@ -From: juhosg -Date: Sun, 24 Mar 2013 19:23:36 +0000 -Subject: ar71xx: add default switch configuration for the TL-WDR3500 - -Signed-off-by: Gabor Juhos - -git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36116 3c298f89-4303-0410-b956-a3cf2f4a3e73 - -Conflicts: - target/linux/ar71xx/base-files/etc/uci-defaults/02_network - -diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/network b/target/linux/ar71xx/base-files/etc/uci-defaults/network -index 7fa219d..a36036f 100755 ---- a/target/linux/ar71xx/base-files/etc/uci-defaults/network -+++ b/target/linux/ar71xx/base-files/etc/uci-defaults/network -@@ -188,6 +188,7 @@ tew-632brp |\ - tew-712br |\ - tl-mr3220 |\ - tl-mr3420 |\ -+tl-wdr3500 |\ - tl-wr741nd |\ - tl-wr741nd-v4 |\ - tl-wr841n-v7 |\ diff --git a/patches/openwrt/0011-ar71xx-add-diag-support-for-the-TL-WDR3500.patch b/patches/openwrt/0011-ar71xx-add-diag-support-for-the-TL-WDR3500.patch deleted file mode 100644 index 1ac6acde..00000000 --- a/patches/openwrt/0011-ar71xx-add-diag-support-for-the-TL-WDR3500.patch +++ /dev/null @@ -1,20 +0,0 @@ -From: juhosg -Date: Sun, 24 Mar 2013 19:23:43 +0000 -Subject: ar71xx: add diag support for the TL-WDR3500 - -Signed-off-by: Gabor Juhos - -git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36117 3c298f89-4303-0410-b956-a3cf2f4a3e73 - -diff --git a/target/linux/ar71xx/base-files/etc/diag.sh b/target/linux/ar71xx/base-files/etc/diag.sh -index 416322d..b206438 100755 ---- a/target/linux/ar71xx/base-files/etc/diag.sh -+++ b/target/linux/ar71xx/base-files/etc/diag.sh -@@ -129,6 +129,7 @@ get_status_led() { - tl-mr3420 | \ - tl-wa901nd | \ - tl-wa901nd-v2 | \ -+ tl-wdr3500 | \ - tl-wr1041n-v2 | \ - tl-wr1043nd | \ - tl-wr741nd | \ diff --git a/patches/openwrt/0012-ar71xx-remove-numeric-suffix-of-the-TL-WDR3500-USB-LED.patch b/patches/openwrt/0012-ar71xx-remove-numeric-suffix-of-the-TL-WDR3500-USB-LED.patch deleted file mode 100644 index 4ade0f4e..00000000 --- a/patches/openwrt/0012-ar71xx-remove-numeric-suffix-of-the-TL-WDR3500-USB-LED.patch +++ /dev/null @@ -1,53 +0,0 @@ -From: juhosg -Date: Sun, 24 Mar 2013 19:23:45 +0000 -Subject: ar71xx: remove numeric suffix of the TL-WDR3500 USB LED - -Signed-off-by: Gabor Juhos - -git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36118 3c298f89-4303-0410-b956-a3cf2f4a3e73 - -diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wdr3500.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wdr3500.c -index 05fe83d..785b21f 100644 ---- a/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wdr3500.c -+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wdr3500.c -@@ -29,7 +29,7 @@ - #include "dev-wmac.h" - #include "machtypes.h" - --#define WDR3500_GPIO_LED_USB1 11 -+#define WDR3500_GPIO_LED_USB 11 - #define WDR3500_GPIO_LED_WLAN2G 13 - #define WDR3500_GPIO_LED_SYSTEM 14 - #define WDR3500_GPIO_LED_QSS 15 -@@ -37,7 +37,7 @@ - #define WDR3500_GPIO_BTN_WPS 16 - #define WDR3500_GPIO_BTN_RFKILL 17 - --#define WDR3500_GPIO_USB1_POWER 22 -+#define WDR3500_GPIO_USB_POWER 22 - - #define WDR3500_KEYS_POLL_INTERVAL 20 /* msecs */ - #define WDR3500_KEYS_DEBOUNCE_INTERVAL (3 * WDR3500_KEYS_POLL_INTERVAL) -@@ -68,8 +68,8 @@ static struct gpio_led wdr3500_leds_gpio[] __initdata = { - .active_low = 1, - }, - { -- .name = "tp-link:green:usb1", -- .gpio = WDR3500_GPIO_LED_USB1, -+ .name = "tp-link:green:usb", -+ .gpio = WDR3500_GPIO_LED_USB, - .active_low = 1, - }, - { -@@ -142,9 +142,9 @@ static void __init wdr3500_setup(void) - - ath79_register_eth(0); - -- gpio_request_one(WDR3500_GPIO_USB1_POWER, -+ gpio_request_one(WDR3500_GPIO_USB_POWER, - GPIOF_OUT_INIT_HIGH | GPIOF_EXPORT_DIR_FIXED, -- "USB1 power"); -+ "USB power"); - ath79_register_usb(); - } - diff --git a/patches/openwrt/0013-ar71xx-fix-USB-power-GPIO-on-the-TL-WDR3500.patch b/patches/openwrt/0013-ar71xx-fix-USB-power-GPIO-on-the-TL-WDR3500.patch deleted file mode 100644 index e6a90f70..00000000 --- a/patches/openwrt/0013-ar71xx-fix-USB-power-GPIO-on-the-TL-WDR3500.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: juhosg -Date: Sun, 24 Mar 2013 19:23:47 +0000 -Subject: ar71xx: fix USB power GPIO on the TL-WDR3500 - -Signed-off-by: Gabor Juhos - -git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36119 3c298f89-4303-0410-b956-a3cf2f4a3e73 - -diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wdr3500.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wdr3500.c -index 785b21f..5020ba4 100644 ---- a/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wdr3500.c -+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wdr3500.c -@@ -37,7 +37,7 @@ - #define WDR3500_GPIO_BTN_WPS 16 - #define WDR3500_GPIO_BTN_RFKILL 17 - --#define WDR3500_GPIO_USB_POWER 22 -+#define WDR3500_GPIO_USB_POWER 12 - - #define WDR3500_KEYS_POLL_INTERVAL 20 /* msecs */ - #define WDR3500_KEYS_DEBOUNCE_INTERVAL (3 * WDR3500_KEYS_POLL_INTERVAL) diff --git a/patches/openwrt/0014-ar71xx-add-default-LED-configuration-for-the-WL-WRD3500.patch b/patches/openwrt/0014-ar71xx-add-default-LED-configuration-for-the-WL-WRD3500.patch deleted file mode 100644 index 50b78af1..00000000 --- a/patches/openwrt/0014-ar71xx-add-default-LED-configuration-for-the-WL-WRD3500.patch +++ /dev/null @@ -1,27 +0,0 @@ -From: juhosg -Date: Sun, 24 Mar 2013 21:07:21 +0000 -Subject: ar71xx: add default LED configuration for the WL-WRD3500 - -Signed-off-by: Gabor Juhos - -git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36120 3c298f89-4303-0410-b956-a3cf2f4a3e73 - -Conflicts: - target/linux/ar71xx/base-files/etc/uci-defaults/01_leds - -diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/leds b/target/linux/ar71xx/base-files/etc/uci-defaults/leds -index 7be4ce9..48b8154 100755 ---- a/target/linux/ar71xx/base-files/etc/uci-defaults/leds -+++ b/target/linux/ar71xx/base-files/etc/uci-defaults/leds -@@ -126,6 +126,11 @@ tl-wa901nd-v2) - ucidef_set_led_wlan "wlan" "WLAN" "tp-link:green:wlan" "phy0tpt" - ;; - -+tl-wdr3500) -+ ucidef_set_led_usbdev "usb" "USB" "tp-link:green:usb" "1-1" -+ ucidef_set_led_wlan "wlan2g" "WLAN2G" "tp-link:green:wlan2g" "phy0tpt" -+ ;; -+ - tl-wdr4300) - ucidef_set_led_usbdev "usb1" "USB1" "tp-link:green:usb1" "1-1.1" - ucidef_set_led_usbdev "usb2" "USB2" "tp-link:green:usb2" "1-1.2" diff --git a/patches/openwrt/0015-ar71xx-fix-ethernet-LEDs-on-the-TL-WDR3500.patch b/patches/openwrt/0015-ar71xx-fix-ethernet-LEDs-on-the-TL-WDR3500.patch deleted file mode 100644 index 8bc06445..00000000 --- a/patches/openwrt/0015-ar71xx-fix-ethernet-LEDs-on-the-TL-WDR3500.patch +++ /dev/null @@ -1,42 +0,0 @@ -From: juhosg -Date: Mon, 25 Mar 2013 06:40:03 +0000 -Subject: ar71xx: fix ethernet LEDs on the TL-WDR3500 - -Signed-off-by: Gabor Juhos - -git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36122 3c298f89-4303-0410-b956-a3cf2f4a3e73 - -diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wdr3500.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wdr3500.c -index 5020ba4..452c20b 100644 ---- a/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wdr3500.c -+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wdr3500.c -@@ -33,6 +33,11 @@ - #define WDR3500_GPIO_LED_WLAN2G 13 - #define WDR3500_GPIO_LED_SYSTEM 14 - #define WDR3500_GPIO_LED_QSS 15 -+#define WDR3500_GPIO_LED_WAN 18 -+#define WDR3500_GPIO_LED_LAN1 19 -+#define WDR3500_GPIO_LED_LAN2 20 -+#define WDR3500_GPIO_LED_LAN3 21 -+#define WDR3500_GPIO_LED_LAN4 22 - - #define WDR3500_GPIO_BTN_WPS 16 - #define WDR3500_GPIO_BTN_RFKILL 17 -@@ -146,6 +151,17 @@ static void __init wdr3500_setup(void) - GPIOF_OUT_INIT_HIGH | GPIOF_EXPORT_DIR_FIXED, - "USB power"); - ath79_register_usb(); -+ -+ ath79_gpio_output_select(WDR3500_GPIO_LED_LAN1, -+ AR934X_GPIO_OUT_LED_LINK3); -+ ath79_gpio_output_select(WDR3500_GPIO_LED_LAN2, -+ AR934X_GPIO_OUT_LED_LINK2); -+ ath79_gpio_output_select(WDR3500_GPIO_LED_LAN3, -+ AR934X_GPIO_OUT_LED_LINK1); -+ ath79_gpio_output_select(WDR3500_GPIO_LED_LAN4, -+ AR934X_GPIO_OUT_LED_LINK0); -+ ath79_gpio_output_select(WDR3500_GPIO_LED_WAN, -+ AR934X_GPIO_OUT_LED_LINK4); - } - - MIPS_MACHINE(ATH79_MACH_TL_WDR3500, "TL-WDR3500", diff --git a/patches/openwrt/0016-ar71xx-add-GPIO-output-select-values-for-AR934x.patch b/patches/openwrt/0016-ar71xx-add-GPIO-output-select-values-for-AR934x.patch deleted file mode 100644 index 10847ed2..00000000 --- a/patches/openwrt/0016-ar71xx-add-GPIO-output-select-values-for-AR934x.patch +++ /dev/null @@ -1,38 +0,0 @@ -From: juhosg -Date: Mon, 25 Mar 2013 06:40:00 +0000 -Subject: ar71xx: add GPIO output select values for AR934x - -Signed-off-by: Gabor Juhos - -git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36121 3c298f89-4303-0410-b956-a3cf2f4a3e73 - -Conflicts: - target/linux/ar71xx/patches-3.8/601-MIPS-ath79-add-more-register-defines.patch - -diff --git a/target/linux/ar71xx/patches-3.3/601-MIPS-ath79-add-more-register-defines.patch b/target/linux/ar71xx/patches-3.3/601-MIPS-ath79-add-more-register-defines.patch -index 8411d58..12522c1 100644 ---- a/target/linux/ar71xx/patches-3.3/601-MIPS-ath79-add-more-register-defines.patch -+++ b/target/linux/ar71xx/patches-3.3/601-MIPS-ath79-add-more-register-defines.patch -@@ -166,7 +166,7 @@ - #define AR934X_GPIO_REG_FUNC 0x6c - - #define AR71XX_GPIO_COUNT 16 --@@ -550,4 +618,139 @@ -+@@ -550,4 +618,144 @@ - #define AR934X_SRIF_DPLL2_OUTDIV_SHIFT 13 - #define AR934X_SRIF_DPLL2_OUTDIV_MASK 0x7 - -@@ -237,7 +237,12 @@ - +#define AR934X_GPIO_FUNC_CLK_OBS0_EN BIT(2) - +#define AR934X_GPIO_FUNC_JTAG_DISABLE BIT(1) - + --+#define AR934X_GPIO_OUT_GPIO 0x00 -++#define AR934X_GPIO_OUT_GPIO 0 -++#define AR934X_GPIO_OUT_LED_LINK0 41 -++#define AR934X_GPIO_OUT_LED_LINK1 42 -++#define AR934X_GPIO_OUT_LED_LINK2 43 -++#define AR934X_GPIO_OUT_LED_LINK3 44 -++#define AR934X_GPIO_OUT_LED_LINK4 45 - + - +/* - + * MII_CTRL block diff --git a/patches/openwrt/0017-Backport-hostapd-from-Barrier-Breaker-r41029.patch b/patches/openwrt/0017-Backport-hostapd-from-Barrier-Breaker-r41029.patch deleted file mode 100644 index a155198e..00000000 --- a/patches/openwrt/0017-Backport-hostapd-from-Barrier-Breaker-r41029.patch +++ /dev/null @@ -1,2201 +0,0 @@ -From: Matthias Schiffer -Date: Mon, 19 May 2014 15:59:06 +0200 -Subject: Backport hostapd from Barrier Breaker (r41029) - -diff --git a/package/hostapd/Makefile b/package/hostapd/Makefile -index b4dc242..beb37a3 100644 ---- a/package/hostapd/Makefile -+++ b/package/hostapd/Makefile -@@ -8,9 +8,9 @@ - include $(TOPDIR)/rules.mk - - PKG_NAME:=hostapd --PKG_VERSION:=20131120 -+PKG_VERSION:=2014-06-03 - PKG_RELEASE:=1 --PKG_REV:=594516b4c28a94ca686b17f1e463dfd6712b75a7 -+PKG_REV:=84df167554569af8c87f0a8ac1fb508192417d8e - - PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 - PKG_SOURCE_URL:=git://w1.fi/srv/git/hostap.git -diff --git a/package/hostapd/files/hostapd.sh b/package/hostapd/files/hostapd.sh -index b55b63d..2a16bb4 100644 ---- a/package/hostapd/files/hostapd.sh -+++ b/package/hostapd/files/hostapd.sh -@@ -130,7 +130,9 @@ hostapd_set_bss_options() { - append "$var" "radius_das_client=$dae_client $dae_secret" "$N" - } - config_get nasid "$vif" nasid -+ config_get ownip "$vif" ownip - append "$var" "nas_identifier=$nasid" "$N" -+ append "$var" "own_ip_addr=$ownip" "$N" - append "$var" "eapol_key_index_workaround=1" "$N" - append "$var" "ieee8021x=1" "$N" - append "$var" "wpa_key_mgmt=WPA-EAP" "$N" -diff --git a/package/hostapd/patches/100-madwifi_key_fixes.patch b/package/hostapd/patches/100-madwifi_key_fixes.patch -index dcd6d10..a46943b 100644 ---- a/package/hostapd/patches/100-madwifi_key_fixes.patch -+++ b/package/hostapd/patches/100-madwifi_key_fixes.patch -@@ -1,6 +1,6 @@ - --- a/src/drivers/driver_madwifi.c - +++ b/src/drivers/driver_madwifi.c --@@ -450,7 +450,9 @@ wpa_driver_madwifi_set_key(const char *i -+@@ -449,7 +449,9 @@ wpa_driver_madwifi_set_key(const char *i - - memset(&wk, 0, sizeof(wk)); - wk.ik_type = cipher; -@@ -11,7 +11,7 @@ - if (addr == NULL || is_broadcast_ether_addr(addr)) { - memset(wk.ik_macaddr, 0xff, IEEE80211_ADDR_LEN); - wk.ik_keyix = key_idx; --@@ -462,6 +464,20 @@ wpa_driver_madwifi_set_key(const char *i -+@@ -461,6 +463,20 @@ wpa_driver_madwifi_set_key(const char *i - wk.ik_keylen = key_len; - memcpy(wk.ik_keydata, key, key_len); - -diff --git a/package/hostapd/patches/110-bool_fix.patch b/package/hostapd/patches/110-bool_fix.patch -index 9f82b0b..1ad84bf 100644 ---- a/package/hostapd/patches/110-bool_fix.patch -+++ b/package/hostapd/patches/110-bool_fix.patch -@@ -1,6 +1,6 @@ - --- a/src/ap/ieee802_1x.c - +++ b/src/ap/ieee802_1x.c --@@ -1933,9 +1933,9 @@ void ieee802_1x_notify_pre_auth(struct e -+@@ -2119,9 +2119,9 @@ void ieee802_1x_notify_pre_auth(struct e - } - - -diff --git a/package/hostapd/patches/130-no_eapol_fix.patch b/package/hostapd/patches/130-no_eapol_fix.patch -new file mode 100644 -index 0000000..3c19cb3 ---- /dev/null -+++ b/package/hostapd/patches/130-no_eapol_fix.patch -@@ -0,0 +1,14 @@ -+--- a/wpa_supplicant/wpa_supplicant.c -++++ b/wpa_supplicant/wpa_supplicant.c -+@@ -247,9 +247,10 @@ void wpa_supplicant_cancel_auth_timeout( -+ */ -+ void wpa_supplicant_initiate_eapol(struct wpa_supplicant *wpa_s) -+ { -++ struct wpa_ssid *ssid = wpa_s->current_ssid; -++ -+ #ifdef IEEE8021X_EAPOL -+ struct eapol_config eapol_conf; -+- struct wpa_ssid *ssid = wpa_s->current_ssid; -+ -+ #ifdef CONFIG_IBSS_RSN -+ if (ssid->mode == WPAS_MODE_IBSS && -diff --git a/package/hostapd/patches/130-wds_sta_del_fix.patch b/package/hostapd/patches/130-wds_sta_del_fix.patch -deleted file mode 100644 -index 06b6906..0000000 ---- a/package/hostapd/patches/130-wds_sta_del_fix.patch -+++ /dev/null -@@ -1,13 +0,0 @@ ----- a/src/drivers/driver_nl80211.c --+++ b/src/drivers/driver_nl80211.c --@@ -9083,8 +9083,8 @@ static int i802_set_wds_sta(void *priv, -- name); -- -- i802_set_sta_vlan(priv, addr, bss->ifname, 0); --- return wpa_driver_nl80211_if_remove(priv, WPA_IF_AP_VLAN, --- name); --+ nl80211_remove_iface(drv, if_nametoindex(name)); --+ return 0; -- } -- } -- -diff --git a/package/hostapd/patches/200-multicall.patch b/package/hostapd/patches/200-multicall.patch -index 2289f51..efe151c 100644 ---- a/package/hostapd/patches/200-multicall.patch -+++ b/package/hostapd/patches/200-multicall.patch -@@ -1,14 +1,14 @@ - --- a/hostapd/Makefile - +++ b/hostapd/Makefile --@@ -14,6 +14,7 @@ CFLAGS += -I../src/utils -+@@ -14,6 +14,7 @@ CFLAGS += -I$(abspath ../src/utils) - # CFLAGS += -DUSE_KERNEL_HEADERS -I/usr/src/linux/include - - -include .config - +-include $(if $(MULTICALL), ../wpa_supplicant/.config) - -- ifndef CONFIG_OS -- ifdef CONFIG_NATIVE_WINDOWS --@@ -200,10 +201,14 @@ ifdef CONFIG_IEEE80211AC -+ ifdef CONFIG_TESTING_OPTIONS -+ CFLAGS += -DCONFIG_TESTING_OPTIONS -+@@ -223,10 +224,14 @@ ifdef CONFIG_IEEE80211AC - CFLAGS += -DCONFIG_IEEE80211AC - endif - -@@ -26,7 +26,7 @@ - LIBS += $(DRV_AP_LIBS) - - ifdef CONFIG_L2_PACKET --@@ -890,6 +895,12 @@ install: all -+@@ -913,6 +918,12 @@ install: all - - BCHECK=../src/drivers/build.hostapd - -@@ -39,7 +39,7 @@ - hostapd: $(BCHECK) $(OBJS) - $(Q)$(CC) $(LDFLAGS) -o hostapd $(OBJS) $(LIBS) - @$(E) " LD " $@ --@@ -928,6 +939,12 @@ HOBJS += ../src/crypto/aes-internal.o -+@@ -951,6 +962,12 @@ HOBJS += ../src/crypto/aes-internal.o - HOBJS += ../src/crypto/aes-internal-enc.o - endif - -@@ -54,15 +54,15 @@ - @$(E) " LD " $@ - --- a/wpa_supplicant/Makefile - +++ b/wpa_supplicant/Makefile --@@ -14,6 +14,7 @@ CFLAGS += -I../src -- CFLAGS += -I../src/utils -+@@ -14,6 +14,7 @@ CFLAGS += -I$(abspath ../src) -+ CFLAGS += -I$(abspath ../src/utils) - - -include .config - +-include $(if $(MULTICALL),../hostapd/.config) - -- BINALL=wpa_supplicant wpa_cli -- --@@ -727,6 +728,10 @@ ifdef CONFIG_DYNAMIC_EAP_METHODS -+ ifdef CONFIG_TESTING_OPTIONS -+ CFLAGS += -DCONFIG_TESTING_OPTIONS -+@@ -741,6 +742,10 @@ ifdef CONFIG_DYNAMIC_EAP_METHODS - CFLAGS += -DCONFIG_DYNAMIC_EAP_METHODS - LIBS += -ldl -rdynamic - endif -@@ -72,8 +72,8 @@ - + endif - endif - -- ifdef CONFIG_AP --@@ -735,9 +740,11 @@ NEED_EAP_COMMON=y -+ ifdef CONFIG_MACSEC -+@@ -762,9 +767,11 @@ NEED_EAP_COMMON=y - NEED_RSN_AUTHENTICATOR=y - CFLAGS += -DCONFIG_AP - OBJS += ap.o -@@ -85,7 +85,7 @@ - OBJS += ../src/ap/hostapd.o - OBJS += ../src/ap/wpa_auth_glue.o - OBJS += ../src/ap/utils.o --@@ -799,10 +806,18 @@ endif -+@@ -826,10 +833,18 @@ endif - ifdef CONFIG_HS20 - OBJS += ../src/ap/hs20.o - endif -@@ -104,7 +104,7 @@ - NEED_AES_WRAP=y - OBJS += ../src/ap/wpa_auth.o - OBJS += ../src/ap/wpa_auth_ie.o --@@ -1551,6 +1566,12 @@ wpa_priv: $(BCHECK) $(OBJS_priv) -+@@ -1602,6 +1617,12 @@ wpa_priv: $(BCHECK) $(OBJS_priv) - - $(OBJS_c) $(OBJS_t) $(OBJS_t2) $(OBJS) $(BCHECK) $(EXTRA_progs): .config - -@@ -117,7 +117,7 @@ - wpa_supplicant: $(BCHECK) $(OBJS) $(EXTRA_progs) - $(Q)$(LDO) $(LDFLAGS) -o wpa_supplicant $(OBJS) $(LIBS) $(EXTRALIBS) - @$(E) " LD " $@ --@@ -1625,6 +1646,12 @@ eap_eke.so: ../src/eap_peer/eap_eke.c .. -+@@ -1682,6 +1703,12 @@ endif - %@.service: %.service.arg.in - sed -e 's|\@BINDIR\@|$(BINDIR)|g' $< >$@ - -@@ -132,7 +132,7 @@ - wpa_cli.exe: wpa_cli - --- a/src/drivers/driver.h - +++ b/src/drivers/driver.h --@@ -4079,8 +4079,8 @@ union wpa_event_data { -+@@ -4117,8 +4117,8 @@ union wpa_event_data { - * Driver wrapper code should call this function whenever an event is received - * from the driver. - */ -@@ -145,7 +145,7 @@ - /* - --- a/src/ap/drv_callbacks.c - +++ b/src/ap/drv_callbacks.c --@@ -844,8 +844,8 @@ static void hostapd_event_dfs_nop_finish -+@@ -926,8 +926,8 @@ static void hostapd_event_dfs_nop_finish - #endif /* NEED_AP_MLME */ - - -@@ -158,7 +158,7 @@ - #ifndef CONFIG_NO_STDOUT_DEBUG - --- a/wpa_supplicant/wpa_priv.c - +++ b/wpa_supplicant/wpa_priv.c --@@ -817,8 +817,8 @@ static void wpa_priv_send_ft_response(st -+@@ -815,8 +815,8 @@ static void wpa_priv_send_ft_response(st - } - - -@@ -169,7 +169,7 @@ - { - struct wpa_priv_interface *iface = ctx; - --@@ -960,6 +960,7 @@ int main(int argc, char *argv[]) -+@@ -956,6 +956,7 @@ int main(int argc, char *argv[]) - if (os_program_init()) - return -1; - -@@ -179,7 +179,7 @@ - for (;;) { - --- a/wpa_supplicant/events.c - +++ b/wpa_supplicant/events.c --@@ -2710,8 +2710,8 @@ static void wpa_supplicant_update_channe -+@@ -2919,8 +2919,8 @@ static void wpa_supplicant_notify_avoid_ - } - - -@@ -192,7 +192,7 @@ - - --- a/wpa_supplicant/wpa_supplicant.c - +++ b/wpa_supplicant/wpa_supplicant.c --@@ -3138,6 +3138,9 @@ static void wpa_supplicant_deinit_iface( -+@@ -3811,6 +3811,9 @@ static void wpa_supplicant_deinit_iface( - os_free(wpa_s); - } - -@@ -202,7 +202,7 @@ - - /** - * wpa_supplicant_add_iface - Add a new network interface --@@ -3329,6 +3332,7 @@ struct wpa_global * wpa_supplicant_init( -+@@ -4002,6 +4005,7 @@ struct wpa_global * wpa_supplicant_init( - wpa_msg_register_ifname_cb(wpa_supplicant_msg_ifname_cb); - #endif /* CONFIG_NO_WPA_MSG */ - -@@ -212,7 +212,7 @@ - wpa_debug_open_syslog(); - --- a/hostapd/main.c - +++ b/hostapd/main.c --@@ -511,6 +511,9 @@ static int hostapd_get_ctrl_iface_group( -+@@ -502,6 +502,9 @@ static int hostapd_get_ctrl_iface_group( - return 0; - } - -@@ -220,27 +220,57 @@ - + union wpa_event_data *data); - + - -- int main(int argc, char *argv[]) -- { --@@ -541,6 +544,7 @@ int main(int argc, char *argv[]) -+ #ifdef CONFIG_WPS -+ static int gen_uuid(const char *txt_addr) -+@@ -553,6 +556,7 @@ int main(int argc, char *argv[]) - interfaces.global_iface_name = NULL; - interfaces.global_ctrl_sock = -1; - - + wpa_supplicant_event = hostapd_wpa_event; - for (;;) { -- c = getopt(argc, argv, "b:Bde:f:hKP:Ttvg:G:"); -+ c = getopt(argc, argv, "b:Bde:f:hKP:Ttu:vg:G:"); - if (c < 0) - --- a/src/drivers/drivers.c - +++ b/src/drivers/drivers.c --@@ -7,7 +7,11 @@ -- */ -- -- #include "includes.h" --+#include "common.h" --+#include "driver.h" -+@@ -10,6 +10,9 @@ -+ #include "utils/common.h" -+ #include "driver.h" - - +void (*wpa_supplicant_event)(void *ctx, enum wpa_event_type event, - + union wpa_event_data *data); -- -++ - #ifdef CONFIG_DRIVER_WEXT - extern struct wpa_driver_ops wpa_driver_wext_ops; /* driver_wext.c */ -+ #endif /* CONFIG_DRIVER_WEXT */ -+--- a/wpa_supplicant/eapol_test.c -++++ b/wpa_supplicant/eapol_test.c -+@@ -28,8 +28,12 @@ -+ #include "ctrl_iface.h" -+ #include "pcsc_funcs.h" -+ #include "wpas_glue.h" -++#include "drivers/driver.h" -+ -+ -++void (*wpa_supplicant_event)(void *ctx, enum wpa_event_type event, -++ union wpa_event_data *data); -++ -+ struct wpa_driver_ops *wpa_drivers[] = { NULL }; -+ -+ -+@@ -1185,6 +1189,8 @@ static void usage(void) -+ "option several times.\n"); -+ } -+ -++extern void supplicant_event(void *ctx, enum wpa_event_type event, -++ union wpa_event_data *data); -+ -+ int main(int argc, char *argv[]) -+ { -+@@ -1203,6 +1209,7 @@ int main(int argc, char *argv[]) -+ if (os_program_init()) -+ return -1; -+ -++ wpa_supplicant_event = supplicant_event; -+ hostapd_logger_register_cb(hostapd_logger_cb); -+ -+ os_memset(&eapol_test, 0, sizeof(eapol_test)); -diff --git a/package/hostapd/patches/300-noscan.patch b/package/hostapd/patches/300-noscan.patch -index 17e7661..4ea26b6 100644 ---- a/package/hostapd/patches/300-noscan.patch -+++ b/package/hostapd/patches/300-noscan.patch -@@ -1,17 +1,17 @@ - --- a/hostapd/config_file.c - +++ b/hostapd/config_file.c --@@ -2412,6 +2412,8 @@ static int hostapd_config_fill(struct ho -- } -+@@ -2639,6 +2639,8 @@ static int hostapd_config_fill(struct ho -+ } - #endif /* CONFIG_IEEE80211W */ - #ifdef CONFIG_IEEE80211N --+ } else if (os_strcmp(buf, "noscan") == 0) { --+ conf->noscan = atoi(pos); -- } else if (os_strcmp(buf, "ieee80211n") == 0) { -- conf->ieee80211n = atoi(pos); -- } else if (os_strcmp(buf, "ht_capab") == 0) { -++ } else if (os_strcmp(buf, "noscan") == 0) { -++ conf->noscan = atoi(pos); -+ } else if (os_strcmp(buf, "ieee80211n") == 0) { -+ conf->ieee80211n = atoi(pos); -+ } else if (os_strcmp(buf, "ht_capab") == 0) { - --- a/src/ap/ap_config.h - +++ b/src/ap/ap_config.h --@@ -527,6 +527,7 @@ struct hostapd_config { -+@@ -576,6 +576,7 @@ struct hostapd_config { - - int ht_op_mode_fixed; - u16 ht_capab; -@@ -21,9 +21,9 @@ - int require_ht; - --- a/src/ap/hw_features.c - +++ b/src/ap/hw_features.c --@@ -577,7 +577,7 @@ static int ieee80211n_check_40mhz(struct -- { -+@@ -690,7 +690,7 @@ static int ieee80211n_check_40mhz(struct - struct wpa_driver_scan_params params; -+ int ret; - - - if (!iface->conf->secondary_channel) - + if (!iface->conf->secondary_channel || iface->conf->noscan) -diff --git a/package/hostapd/patches/310-rescan_immediately.patch b/package/hostapd/patches/310-rescan_immediately.patch -index 043f07c..dac0f6e 100644 ---- a/package/hostapd/patches/310-rescan_immediately.patch -+++ b/package/hostapd/patches/310-rescan_immediately.patch -@@ -1,6 +1,6 @@ - --- a/wpa_supplicant/wpa_supplicant.c - +++ b/wpa_supplicant/wpa_supplicant.c --@@ -2488,7 +2488,7 @@ static struct wpa_supplicant * wpa_suppl -+@@ -2752,7 +2752,7 @@ static struct wpa_supplicant * wpa_suppl - if (wpa_s == NULL) - return NULL; - wpa_s->scan_req = INITIAL_SCAN_REQ; -diff --git a/package/hostapd/patches/320-optional_rfkill.patch b/package/hostapd/patches/320-optional_rfkill.patch -index 7ec51b1..3808f9b 100644 ---- a/package/hostapd/patches/320-optional_rfkill.patch -+++ b/package/hostapd/patches/320-optional_rfkill.patch -@@ -1,221 +1,6 @@ ----- a/src/drivers/driver_nl80211.c --+++ b/src/drivers/driver_nl80211.c --@@ -254,7 +254,9 @@ struct wpa_driver_nl80211_data { -- int if_removed; -- int if_disabled; -- int ignore_if_down_event; --+#ifdef CONFIG_RFKILL -- struct rfkill_data *rfkill; --+#endif -- struct wpa_driver_capa capa; -- u8 *extended_capa, *extended_capa_mask; -- unsigned int extended_capa_len; --@@ -3630,7 +3632,7 @@ static int wpa_driver_nl80211_init_nl(st -- return 0; -- } -- --- --+#ifdef CONFIG_RFKILL -- static void wpa_driver_nl80211_rfkill_blocked(void *ctx) -- { -- wpa_printf(MSG_DEBUG, "nl80211: RFKILL blocked"); --@@ -3652,6 +3654,7 @@ static void wpa_driver_nl80211_rfkill_un -- } -- /* rtnetlink ifup handler will report interface as enabled */ -- } --+#endif /* CONFIG_RFKILL */ -- -- -- static void wpa_driver_nl80211_handle_eapol_tx_status(int sock, --@@ -3740,7 +3743,9 @@ static void * wpa_driver_nl80211_drv_ini -- const u8 *set_addr) -- { -- struct wpa_driver_nl80211_data *drv; --+#ifdef CONFIG_RFKILL -- struct rfkill_config *rcfg; --+#endif -- struct i802_bss *bss; -- -- if (global_priv == NULL) --@@ -3778,6 +3783,7 @@ static void * wpa_driver_nl80211_drv_ini -- if (nl80211_init_bss(bss)) -- goto failed; -- --+#ifdef CONFIG_RFKILL -- rcfg = os_zalloc(sizeof(*rcfg)); -- if (rcfg == NULL) -- goto failed; --@@ -3790,6 +3796,7 @@ static void * wpa_driver_nl80211_drv_ini -- wpa_printf(MSG_DEBUG, "nl80211: RFKILL status not available"); -- os_free(rcfg); -- } --+#endif /* CONFIG_RFKILL */ -- -- if (linux_iface_up(drv->global->ioctl_sock, ifname) > 0) -- drv->start_iface_up = 1; --@@ -4116,10 +4123,12 @@ static void nl80211_mgmt_unsubscribe(str -- } -- -- --+#ifdef CONFIG_RFKILL -- static void wpa_driver_nl80211_send_rfkill(void *eloop_ctx, void *timeout_ctx) -- { -- wpa_supplicant_event(timeout_ctx, EVENT_INTERFACE_DISABLED, NULL); -- } --+#endif /* CONFIG_RFKILL */ -- -- -- static void nl80211_del_p2pdev(struct i802_bss *bss) --@@ -4246,13 +4255,16 @@ wpa_driver_nl80211_finish_drv_init(struc -- } -- -- if (linux_set_iface_flags(drv->global->ioctl_sock, bss->ifname, 1)) { --+#ifdef CONFIG_RFKILL -- if (rfkill_is_blocked(drv->rfkill)) { -- wpa_printf(MSG_DEBUG, "nl80211: Could not yet enable " -- "interface '%s' due to rfkill", -- bss->ifname); -- drv->if_disabled = 1; -- send_rfkill_event = 1; --- } else { --+ } else --+#endif --+ { -- wpa_printf(MSG_ERROR, "nl80211: Could not set " -- "interface '%s' UP", bss->ifname); -- return -1; --@@ -4268,8 +4280,10 @@ wpa_driver_nl80211_finish_drv_init(struc -- return -1; -- -- if (send_rfkill_event) { --+#ifdef CONFIG_RFKILL -- eloop_register_timeout(0, 0, wpa_driver_nl80211_send_rfkill, -- drv, drv->ctx); --+#endif -- } -- -- return 0; --@@ -4347,7 +4361,9 @@ static void wpa_driver_nl80211_deinit(st -- -- netlink_send_oper_ifla(drv->global->netlink, drv->ifindex, 0, -- IF_OPER_UP); --+#ifdef CONFIG_RFKILL -- rfkill_deinit(drv->rfkill); --+#endif -- -- eloop_cancel_timeout(wpa_driver_nl80211_scan_timeout, drv, drv->ctx); -- ----- a/src/drivers/driver_wext.c --+++ b/src/drivers/driver_wext.c --@@ -740,7 +740,7 @@ static void wpa_driver_wext_event_rtm_de -- } -- } -- --- --+#ifdef CONFIG_RFKILL -- static void wpa_driver_wext_rfkill_blocked(void *ctx) -- { -- wpa_printf(MSG_DEBUG, "WEXT: RFKILL blocked"); --@@ -762,7 +762,7 @@ static void wpa_driver_wext_rfkill_unblo -- } -- /* rtnetlink ifup handler will report interface as enabled */ -- } --- --+#endif /* CONFIG_RFKILL */ -- -- static void wext_get_phy_name(struct wpa_driver_wext_data *drv) -- { --@@ -808,7 +808,9 @@ void * wpa_driver_wext_init(void *ctx, c -- { -- struct wpa_driver_wext_data *drv; -- struct netlink_config *cfg; --+#ifdef CONFIG_RFKILL -- struct rfkill_config *rcfg; --+#endif -- char path[128]; -- struct stat buf; -- --@@ -843,6 +845,7 @@ void * wpa_driver_wext_init(void *ctx, c -- goto err2; -- } -- --+#ifdef CONFIG_RFKILL -- rcfg = os_zalloc(sizeof(*rcfg)); -- if (rcfg == NULL) -- goto err3; --@@ -855,6 +858,7 @@ void * wpa_driver_wext_init(void *ctx, c -- wpa_printf(MSG_DEBUG, "WEXT: RFKILL status not available"); -- os_free(rcfg); -- } --+#endif /* CONFIG_RFKILL */ -- -- drv->mlme_sock = -1; -- --@@ -872,7 +876,9 @@ void * wpa_driver_wext_init(void *ctx, c -- return drv; -- -- err3: --+#ifdef CONFIG_RFKILL -- rfkill_deinit(drv->rfkill); --+#endif -- netlink_deinit(drv->netlink); -- err2: -- close(drv->ioctl_sock); --@@ -882,10 +888,12 @@ err1: -- } -- -- --+#ifdef CONFIG_RFKILL -- static void wpa_driver_wext_send_rfkill(void *eloop_ctx, void *timeout_ctx) -- { -- wpa_supplicant_event(timeout_ctx, EVENT_INTERFACE_DISABLED, NULL); -- } --+#endif /* CONFIG_RFKILL */ -- -- -- static int wpa_driver_wext_finish_drv_init(struct wpa_driver_wext_data *drv) --@@ -893,13 +901,16 @@ static int wpa_driver_wext_finish_drv_in -- int send_rfkill_event = 0; -- -- if (linux_set_iface_flags(drv->ioctl_sock, drv->ifname, 1) < 0) { --+#ifdef CONFIG_RFKILL -- if (rfkill_is_blocked(drv->rfkill)) { -- wpa_printf(MSG_DEBUG, "WEXT: Could not yet enable " -- "interface '%s' due to rfkill", -- drv->ifname); -- drv->if_disabled = 1; -- send_rfkill_event = 1; --- } else { --+ } else --+#endif --+ { -- wpa_printf(MSG_ERROR, "WEXT: Could not set " -- "interface '%s' UP", drv->ifname); -- return -1; --@@ -947,8 +958,10 @@ static int wpa_driver_wext_finish_drv_in -- 1, IF_OPER_DORMANT); -- -- if (send_rfkill_event) { --+#ifdef CONFIG_RFKILL -- eloop_register_timeout(0, 0, wpa_driver_wext_send_rfkill, -- drv, drv->ctx); --+#endif -- } -- -- return 0; --@@ -978,7 +991,9 @@ void wpa_driver_wext_deinit(void *priv) -- -- netlink_send_oper_ifla(drv->netlink, drv->ifindex, 0, IF_OPER_UP); -- netlink_deinit(drv->netlink); --+#ifdef CONFIG_RFKILL -- rfkill_deinit(drv->rfkill); --+#endif -- -- if (drv->mlme_sock >= 0) -- eloop_unregister_read_sock(drv->mlme_sock); - --- a/src/drivers/drivers.mak - +++ b/src/drivers/drivers.mak --@@ -25,7 +25,6 @@ NEED_SME=y -+@@ -30,7 +30,6 @@ NEED_SME=y - NEED_AP_MLME=y - NEED_NETLINK=y - NEED_LINUX_IOCTL=y -@@ -223,7 +8,7 @@ - - ifdef CONFIG_LIBNL32 - DRV_LIBS += -lnl-3 --@@ -109,7 +108,6 @@ DRV_WPA_CFLAGS += -DCONFIG_DRIVER_WEXT -+@@ -114,7 +113,6 @@ DRV_WPA_CFLAGS += -DCONFIG_DRIVER_WEXT - CONFIG_WIRELESS_EXTENSION=y - NEED_NETLINK=y - NEED_LINUX_IOCTL=y -@@ -231,7 +16,7 @@ - endif - - ifdef CONFIG_DRIVER_NDIS --@@ -135,7 +133,6 @@ endif -+@@ -140,7 +138,6 @@ endif - ifdef CONFIG_WIRELESS_EXTENSION - DRV_WPA_CFLAGS += -DCONFIG_WIRELESS_EXTENSION - DRV_WPA_OBJS += ../src/drivers/driver_wext.o -@@ -239,7 +24,7 @@ - endif - - ifdef NEED_NETLINK --@@ -148,6 +145,7 @@ endif -+@@ -153,6 +150,7 @@ endif - - ifdef NEED_RFKILL - DRV_OBJS += ../src/drivers/rfkill.o -@@ -247,15 +32,30 @@ - endif - - ifdef CONFIG_VLAN_NETLINK ----- a/src/drivers/driver_wext.h --+++ b/src/drivers/driver_wext.h --@@ -22,7 +22,9 @@ struct wpa_driver_wext_data { -- int ifindex2; -- int if_removed; -- int if_disabled; --+#ifdef CONFIG_RFKILL -- struct rfkill_data *rfkill; --+#endif -- u8 *assoc_req_ies; -- size_t assoc_req_ies_len; -- u8 *assoc_resp_ies; -+--- a/src/drivers/rfkill.h -++++ b/src/drivers/rfkill.h -+@@ -18,8 +18,24 @@ struct rfkill_config { -+ void (*unblocked_cb)(void *ctx); -+ }; -+ -++#ifdef CONFIG_RFKILL -+ struct rfkill_data * rfkill_init(struct rfkill_config *cfg); -+ void rfkill_deinit(struct rfkill_data *rfkill); -+ int rfkill_is_blocked(struct rfkill_data *rfkill); -++#else -++static inline struct rfkill_data * rfkill_init(struct rfkill_config *cfg) -++{ -++ return (void *) 1; -++} -++ -++static inline void rfkill_deinit(struct rfkill_data *rfkill) -++{ -++} -++ -++static inline int rfkill_is_blocked(struct rfkill_data *rfkill) -++{ -++ return 0; -++} -++#endif -+ -+ #endif /* RFKILL_H */ -diff --git a/package/hostapd/patches/330-nl80211_fix_set_freq.patch b/package/hostapd/patches/330-nl80211_fix_set_freq.patch -index a505a60..dbc9ef8 100644 ---- a/package/hostapd/patches/330-nl80211_fix_set_freq.patch -+++ b/package/hostapd/patches/330-nl80211_fix_set_freq.patch -@@ -1,15 +1,15 @@ - --- a/src/drivers/driver_nl80211.c - +++ b/src/drivers/driver_nl80211.c --@@ -6860,7 +6860,7 @@ static int wpa_driver_nl80211_set_freq(s -- -- nl80211_cmd(drv, msg, 0, NL80211_CMD_SET_WIPHY); -+@@ -7488,7 +7488,7 @@ static int nl80211_set_channel(struct i8 -+ nl80211_cmd(drv, msg, 0, set_chan ? NL80211_CMD_SET_CHANNEL : -+ NL80211_CMD_SET_WIPHY); - - - NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, drv->ifindex); - + NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, bss->ifindex); - if (nl80211_put_freq_params(msg, freq) < 0) - goto nla_put_failure; - --@@ -11322,7 +11322,7 @@ static int nl80211_switch_channel(void * -+@@ -12047,7 +12047,7 @@ static int nl80211_switch_channel(void * - return -ENOMEM; - - nl80211_cmd(drv, msg, 0, NL80211_CMD_CHANNEL_SWITCH); -diff --git a/package/hostapd/patches/340-reload_freq_change.patch b/package/hostapd/patches/340-reload_freq_change.patch -index 9316794..d3e8918 100644 ---- a/package/hostapd/patches/340-reload_freq_change.patch -+++ b/package/hostapd/patches/340-reload_freq_change.patch -@@ -1,6 +1,6 @@ - --- a/src/ap/hostapd.c - +++ b/src/ap/hostapd.c --@@ -72,6 +72,16 @@ static void hostapd_reload_bss(struct ho -+@@ -70,6 +70,16 @@ static void hostapd_reload_bss(struct ho - #endif /* CONFIG_NO_RADIUS */ - - ssid = &hapd->conf->ssid; -@@ -17,7 +17,7 @@ - if (!ssid->wpa_psk_set && ssid->wpa_psk && !ssid->wpa_psk->next && - ssid->wpa_passphrase_set && ssid->wpa_passphrase) { - /* --@@ -172,6 +182,9 @@ int hostapd_reload_config(struct hostapd -+@@ -170,20 +180,12 @@ int hostapd_reload_config(struct hostapd - oldconf = hapd->iconf; - iface->conf = newconf; - -@@ -27,3 +27,17 @@ - for (j = 0; j < iface->num_bss; j++) { - hapd = iface->bss[j]; - hapd->iconf = newconf; -+- hapd->iconf->channel = oldconf->channel; -+- hapd->iconf->secondary_channel = oldconf->secondary_channel; -+- hapd->iconf->ieee80211n = oldconf->ieee80211n; -+- hapd->iconf->ieee80211ac = oldconf->ieee80211ac; -+- hapd->iconf->ht_capab = oldconf->ht_capab; -+- hapd->iconf->vht_capab = oldconf->vht_capab; -+- hapd->iconf->vht_oper_chwidth = oldconf->vht_oper_chwidth; -+- hapd->iconf->vht_oper_centr_freq_seg0_idx = -+- oldconf->vht_oper_centr_freq_seg0_idx; -+- hapd->iconf->vht_oper_centr_freq_seg1_idx = -+- oldconf->vht_oper_centr_freq_seg1_idx; -+ hapd->conf = newconf->bss[j]; -+ hostapd_reload_bss(hapd); -+ } -diff --git a/package/hostapd/patches/350-nl80211_del_beacon_bss.patch b/package/hostapd/patches/350-nl80211_del_beacon_bss.patch -index 885922c..e6f6cf3 100644 ---- a/package/hostapd/patches/350-nl80211_del_beacon_bss.patch -+++ b/package/hostapd/patches/350-nl80211_del_beacon_bss.patch -@@ -1,6 +1,6 @@ - --- a/src/drivers/driver_nl80211.c - +++ b/src/drivers/driver_nl80211.c --@@ -4290,18 +4290,20 @@ wpa_driver_nl80211_finish_drv_init(struc -+@@ -4817,18 +4817,20 @@ wpa_driver_nl80211_finish_drv_init(struc - } - - -@@ -24,7 +24,7 @@ - - return send_and_recv_msgs(drv, msg, NULL, NULL); - nla_put_failure: --@@ -4309,6 +4311,15 @@ static int wpa_driver_nl80211_del_beacon -+@@ -4836,6 +4838,15 @@ static int wpa_driver_nl80211_del_beacon - return -ENOBUFS; - } - -@@ -40,7 +40,7 @@ - - /** - * wpa_driver_nl80211_deinit - Deinitialize nl80211 driver interface --@@ -9911,7 +9922,6 @@ static int wpa_driver_nl80211_stop_ap(vo -+@@ -10617,7 +10628,6 @@ static int wpa_driver_nl80211_stop_ap(vo - if (!is_ap_interface(drv->nlmode)) - return -1; - wpa_driver_nl80211_del_beacon(drv); -diff --git a/package/hostapd/patches/360-ctrl_iface_reload.patch b/package/hostapd/patches/360-ctrl_iface_reload.patch -index 170d4f2..e69c3d3 100644 ---- a/package/hostapd/patches/360-ctrl_iface_reload.patch -+++ b/package/hostapd/patches/360-ctrl_iface_reload.patch -@@ -1,6 +1,6 @@ - --- a/hostapd/ctrl_iface.c - +++ b/hostapd/ctrl_iface.c --@@ -34,6 +34,7 @@ -+@@ -37,6 +37,7 @@ - #include "wps/wps.h" - #include "config_file.h" - #include "ctrl_iface.h" -@@ -8,7 +8,7 @@ - - - struct wpa_ctrl_dst { --@@ -44,6 +45,7 @@ struct wpa_ctrl_dst { -+@@ -47,6 +48,7 @@ struct wpa_ctrl_dst { - int errors; - }; - -@@ -16,7 +16,7 @@ - - static void hostapd_ctrl_iface_send(struct hostapd_data *hapd, int level, - const char *buf, size_t len); --@@ -153,6 +155,68 @@ static int hostapd_ctrl_iface_new_sta(st -+@@ -156,6 +158,68 @@ static int hostapd_ctrl_iface_new_sta(st - return 0; - } - -@@ -85,14 +85,14 @@ - - #ifdef CONFIG_IEEE80211W - #ifdef NEED_AP_MLME --@@ -1199,6 +1263,10 @@ static void hostapd_ctrl_iface_receive(i -- reply_len += res; -- } -- #endif /* CONFIG_NO_RADIUS */ -+@@ -1546,6 +1610,10 @@ static void hostapd_ctrl_iface_receive(i -+ } else if (os_strncmp(buf, "VENDOR ", 7) == 0) { -+ reply_len = hostapd_ctrl_iface_vendor(hapd, buf + 7, reply, -+ reply_size); - + } else if (os_strcmp(buf, "DOWN") == 0) { - + hostapd_ctrl_iface_set_down(hapd); - + } else if (os_strncmp(buf, "UPDATE ", 7) == 0) { - + hostapd_ctrl_iface_update(hapd, buf + 7); -- } else if (os_strcmp(buf, "STA-FIRST") == 0) { -- reply_len = hostapd_ctrl_iface_sta_first(hapd, reply, -- reply_size); -+ -+ } else { -+ os_memcpy(reply, "UNKNOWN COMMAND\n", 16); -diff --git a/package/hostapd/patches/370-ap_sta_support.patch b/package/hostapd/patches/370-ap_sta_support.patch -index a3d0572..8a92ead 100644 ---- a/package/hostapd/patches/370-ap_sta_support.patch -+++ b/package/hostapd/patches/370-ap_sta_support.patch -@@ -1,6 +1,6 @@ - --- a/wpa_supplicant/wpa_supplicant_i.h - +++ b/wpa_supplicant/wpa_supplicant_i.h --@@ -96,6 +96,11 @@ struct wpa_interface { -+@@ -108,6 +108,11 @@ struct wpa_interface { - const char *ifname; - - /** -@@ -12,7 +12,7 @@ - * bridge_ifname - Optional bridge interface name - * - * If the driver interface (ifname) is included in a Linux bridge --@@ -325,6 +330,8 @@ struct wpa_supplicant { -+@@ -395,6 +400,8 @@ struct wpa_supplicant { - #endif /* CONFIG_CTRL_IFACE_DBUS_NEW */ - char bridge_ifname[16]; - -@@ -20,12 +20,12 @@ - + - char *confname; - char *confanother; -- struct wpa_config *conf; -+ - --- a/wpa_supplicant/Makefile - +++ b/wpa_supplicant/Makefile - @@ -13,6 +13,10 @@ PKG_CONFIG ?= pkg-config -- CFLAGS += -I../src -- CFLAGS += -I../src/utils -+ CFLAGS += -I$(abspath ../src) -+ CFLAGS += -I$(abspath ../src/utils) - - +ifdef MULTICALL - +CFLAGS += -DMULTICALL -@@ -34,7 +34,7 @@ - -include .config - -include $(if $(MULTICALL),../hostapd/.config) - --@@ -76,6 +80,8 @@ OBJS_c = wpa_cli.o ../src/common/wpa_ctr -+@@ -82,6 +86,8 @@ OBJS_c = wpa_cli.o ../src/common/wpa_ctr - OBJS_c += ../src/utils/wpa_debug.o - OBJS_c += ../src/utils/common.o - -@@ -45,9 +45,9 @@ - CONFIG_OS=win32 - --- a/wpa_supplicant/wpa_supplicant.c - +++ b/wpa_supplicant/wpa_supplicant.c --@@ -109,6 +109,46 @@ extern int wpa_debug_show_keys; -- extern int wpa_debug_timestamp; -- extern struct wpa_driver_ops *wpa_drivers[]; -+@@ -105,6 +105,55 @@ const char *wpa_supplicant_full_license5 -+ "\n"; -+ #endif /* CONFIG_NO_STDOUT_DEBUG */ - - +static int hostapd_stop(struct wpa_supplicant *wpa_s) - +{ -@@ -69,14 +69,23 @@ - + int len = sizeof(buf); - + enum hostapd_hw_mode hw_mode; - + u8 channel; -++ int sec_chan = 0; - + int ret; - + - + if (!bss) - + return; - + -++ if (bss->ht_param & HT_INFO_HT_PARAM_STA_CHNL_WIDTH) { -++ int sec = bss->ht_param & HT_INFO_HT_PARAM_SECONDARY_CHNL_OFF_MASK; -++ if (sec == HT_INFO_HT_PARAM_SECONDARY_CHNL_ABOVE) -++ sec_chan = 1; -++ else if (sec == HT_INFO_HT_PARAM_SECONDARY_CHNL_BELOW) -++ sec_chan = -1; -++ } -++ - + hw_mode = ieee80211_freq_to_chan(bss->freq, &channel); --+ if (asprintf(&cmd, "UPDATE channel=%d sec_chan=0 hw_mode=%d ieee80211n=%d", --+ channel, hw_mode, !!bss->ht_capab) < 0) -++ if (asprintf(&cmd, "UPDATE channel=%d sec_chan=%d hw_mode=%d ieee80211n=%d", -++ channel, sec_chan, hw_mode, !!bss->ht_capab) < 0) - + return -1; - + - + ret = wpa_ctrl_request(wpa_s->hostapd, cmd, os_strlen(cmd), buf, &len, NULL); -@@ -92,7 +101,7 @@ - /* Configure default/group WEP keys for static WEP */ - int wpa_set_wep_keys(struct wpa_supplicant *wpa_s, struct wpa_ssid *ssid) - { --@@ -685,8 +725,12 @@ void wpa_supplicant_set_state(struct wpa -+@@ -711,8 +760,12 @@ void wpa_supplicant_set_state(struct wpa - #endif /* CONFIG_P2P */ - - sme_sched_obss_scan(wpa_s, 1); -@@ -105,7 +114,7 @@ - wpa_s->new_connection = 1; - wpa_drv_set_operstate(wpa_s, 0); - #ifndef IEEE8021X_EAPOL --@@ -2906,6 +2950,20 @@ static int wpa_supplicant_init_iface(str -+@@ -3595,6 +3648,20 @@ static int wpa_supplicant_init_iface(str - sizeof(wpa_s->bridge_ifname)); - } - -@@ -126,7 +135,7 @@ - /* RSNA Supplicant Key Management - INITIALIZE */ - eapol_sm_notify_portEnabled(wpa_s->eapol, FALSE); - eapol_sm_notify_portValid(wpa_s->eapol, FALSE); --@@ -3125,6 +3183,11 @@ static void wpa_supplicant_deinit_iface( -+@@ -3798,6 +3865,11 @@ static void wpa_supplicant_deinit_iface( - if (terminate) - wpa_msg(wpa_s, MSG_INFO, WPA_EVENT_TERMINATING); - -@@ -148,41 +157,45 @@ - #include "drivers/driver.h" - #include "wpa_supplicant_i.h" - #include "config.h" --@@ -245,6 +246,9 @@ static void calculate_update_time(const -+@@ -247,6 +248,10 @@ static void calculate_update_time(const - static void wpa_bss_copy_res(struct wpa_bss *dst, struct wpa_scan_res *src, -- struct os_time *fetch_time) -+ struct os_reltime *fetch_time) - { - + struct ieee80211_ht_capabilities *capab; -++ struct ieee80211_ht_operation *oper; - + struct ieee802_11_elems elems; - + - dst->flags = src->flags; - os_memcpy(dst->bssid, src->bssid, ETH_ALEN); - dst->freq = src->freq; --@@ -255,6 +259,12 @@ static void wpa_bss_copy_res(struct wpa_ -+@@ -257,6 +262,15 @@ static void wpa_bss_copy_res(struct wpa_ - dst->level = src->level; - dst->tsf = src->tsf; - - + memset(&elems, 0, sizeof(elems)); - + ieee802_11_parse_elems((u8 *) (src + 1), src->ie_len, &elems, 0); - + capab = (struct ieee80211_ht_capabilities *) elems.ht_capabilities; -++ oper = (struct ieee80211_ht_operation *) elems.ht_operation; - + if (capab) - + dst->ht_capab = le_to_host16(capab->ht_capabilities_info); -++ if (oper) -++ dst->ht_param = oper->ht_param; - + - calculate_update_time(fetch_time, src->age, &dst->last_update); - } - - --- a/wpa_supplicant/main.c - +++ b/wpa_supplicant/main.c --@@ -27,7 +27,7 @@ static void usage(void) -- " wpa_supplicant [-BddhKLqqstuvW] [-P] " -+@@ -33,7 +33,7 @@ static void usage(void) -+ "vW] [-P] " - "[-g] \\\n" - " [-G] \\\n" - - " -i -c [-C] [-D] " - + " -i -c [-C] [-D] [-H] " - "[-p] \\\n" -- " [-b] [-f] [-e] " -- "\\\n" --@@ -72,6 +72,7 @@ static void usage(void) -+ " [-b] [-e]" -+ #ifdef CONFIG_DEBUG_FILE -+@@ -84,6 +84,7 @@ static void usage(void) - #endif /* CONFIG_DEBUG_LINUX_TRACING */ - printf(" -t = include timestamp in debug messages\n" - " -h = show this help text\n" -@@ -190,16 +203,16 @@ - " -L = show license (BSD)\n" - " -o = override driver parameter for new interfaces\n" - " -O = override ctrl_interface parameter for new interfaces\n" --@@ -160,7 +161,7 @@ int main(int argc, char *argv[]) -+@@ -175,7 +176,7 @@ int main(int argc, char *argv[]) - - for (;;) { - c = getopt(argc, argv, --- "b:Bc:C:D:de:f:g:G:hi:I:KLNo:O:p:P:qsTtuvW"); --+ "b:Bc:C:D:de:f:g:G:hH:i:I:KLNo:O:p:P:qsTtuvW"); -+- "b:Bc:C:D:de:f:g:G:hi:I:KLm:No:O:p:P:qsTtuvW"); -++ "b:Bc:C:D:de:f:g:G:hH:i:I:KLm:No:O:p:P:qsTtuvW"); - if (c < 0) - break; - switch (c) { --@@ -207,6 +208,9 @@ int main(int argc, char *argv[]) -+@@ -222,6 +223,9 @@ int main(int argc, char *argv[]) - usage(); - exitcode = 0; - goto out; -@@ -211,12 +224,14 @@ - break; - --- a/wpa_supplicant/bss.h - +++ b/wpa_supplicant/bss.h --@@ -69,6 +69,8 @@ struct wpa_bss { -+@@ -70,6 +70,10 @@ struct wpa_bss { - u8 ssid[32]; - /** Length of SSID */ - size_t ssid_len; - + /** HT caapbilities */ - + u16 ht_capab; -++ /* Five octets of HT Operation Information */ -++ u8 ht_param; - /** Frequency of the channel in MHz (e.g., 2412 = channel 1) */ - int freq; - /** Beacon interval in TUs (host byte order) */ -diff --git a/package/hostapd/patches/380-disable_ctrl_iface_mib.patch b/package/hostapd/patches/380-disable_ctrl_iface_mib.patch -index 27f21bd..dee1ab3 100644 ---- a/package/hostapd/patches/380-disable_ctrl_iface_mib.patch -+++ b/package/hostapd/patches/380-disable_ctrl_iface_mib.patch -@@ -1,6 +1,6 @@ - --- a/hostapd/Makefile - +++ b/hostapd/Makefile --@@ -144,6 +144,9 @@ endif -+@@ -163,6 +163,9 @@ endif - ifdef CONFIG_NO_CTRL_IFACE - CFLAGS += -DCONFIG_NO_CTRL_IFACE - else -@@ -12,28 +12,15 @@ - endif - --- a/hostapd/ctrl_iface.c - +++ b/hostapd/ctrl_iface.c --@@ -1234,6 +1234,7 @@ static void hostapd_ctrl_iface_receive(i -- } else if (os_strcmp(buf, "STATUS") == 0) { -- reply_len = hostapd_ctrl_iface_status(hapd, reply, -+@@ -1447,6 +1447,7 @@ static void hostapd_ctrl_iface_receive(i - reply_size); -+ } else if (os_strcmp(buf, "STATUS-DRIVER") == 0) { -+ reply_len = hostapd_drv_status(hapd, reply, reply_size); - +#ifdef CONFIG_CTRL_IFACE_MIB - } else if (os_strcmp(buf, "MIB") == 0) { - reply_len = ieee802_11_get_mib(hapd, reply, reply_size); - if (reply_len >= 0) { --@@ -1263,10 +1264,12 @@ static void hostapd_ctrl_iface_receive(i -- reply_len += res; -- } -- #endif /* CONFIG_NO_RADIUS */ --+#endif -- } else if (os_strcmp(buf, "DOWN") == 0) { -- hostapd_ctrl_iface_set_down(hapd); -- } else if (os_strncmp(buf, "UPDATE ", 7) == 0) { -- hostapd_ctrl_iface_update(hapd, buf + 7); --+#ifdef CONFIG_CTRL_IFACE_MIB -- } else if (os_strcmp(buf, "STA-FIRST") == 0) { -- reply_len = hostapd_ctrl_iface_sta_first(hapd, reply, -- reply_size); --@@ -1276,6 +1279,7 @@ static void hostapd_ctrl_iface_receive(i -+@@ -1488,6 +1489,7 @@ static void hostapd_ctrl_iface_receive(i - } else if (os_strncmp(buf, "STA-NEXT ", 9) == 0) { - reply_len = hostapd_ctrl_iface_sta_next(hapd, buf + 9, reply, - reply_size); -@@ -43,7 +30,7 @@ - reply_len = -1; - --- a/wpa_supplicant/Makefile - +++ b/wpa_supplicant/Makefile --@@ -778,6 +778,9 @@ ifdef CONFIG_WNM -+@@ -805,6 +805,9 @@ ifdef CONFIG_WNM - OBJS += ../src/ap/wnm_ap.o - endif - ifdef CONFIG_CTRL_IFACE -@@ -55,7 +42,7 @@ - - --- a/wpa_supplicant/ctrl_iface.c - +++ b/wpa_supplicant/ctrl_iface.c --@@ -5262,6 +5262,7 @@ char * wpa_supplicant_ctrl_iface_process -+@@ -6243,6 +6243,7 @@ char * wpa_supplicant_ctrl_iface_process - reply_len = -1; - } else if (os_strncmp(buf, "NOTE ", 5) == 0) { - wpa_printf(MSG_INFO, "NOTE: %s", buf + 5); -@@ -63,7 +50,7 @@ - } else if (os_strcmp(buf, "MIB") == 0) { - reply_len = wpa_sm_get_mib(wpa_s->wpa, reply, reply_size); - if (reply_len >= 0) { --@@ -5273,6 +5274,7 @@ char * wpa_supplicant_ctrl_iface_process -+@@ -6254,6 +6255,7 @@ char * wpa_supplicant_ctrl_iface_process - else - reply_len += res; - } -@@ -71,7 +58,7 @@ - } else if (os_strncmp(buf, "STATUS", 6) == 0) { - reply_len = wpa_supplicant_ctrl_iface_status( - wpa_s, buf + 6, reply, reply_size); --@@ -5687,6 +5689,7 @@ char * wpa_supplicant_ctrl_iface_process -+@@ -6661,6 +6663,7 @@ char * wpa_supplicant_ctrl_iface_process - reply_len = wpa_supplicant_ctrl_iface_bss( - wpa_s, buf + 4, reply, reply_size); - #ifdef CONFIG_AP -@@ -79,7 +66,7 @@ - } else if (os_strcmp(buf, "STA-FIRST") == 0) { - reply_len = ap_ctrl_iface_sta_first(wpa_s, reply, reply_size); - } else if (os_strncmp(buf, "STA ", 4) == 0) { --@@ -5695,6 +5698,7 @@ char * wpa_supplicant_ctrl_iface_process -+@@ -6669,6 +6672,7 @@ char * wpa_supplicant_ctrl_iface_process - } else if (os_strncmp(buf, "STA-NEXT ", 9) == 0) { - reply_len = ap_ctrl_iface_sta_next(wpa_s, buf + 9, reply, - reply_size); -@@ -89,15 +76,15 @@ - reply_len = -1; - --- a/src/ap/ctrl_iface_ap.c - +++ b/src/ap/ctrl_iface_ap.c --@@ -20,6 +20,7 @@ -+@@ -21,6 +21,7 @@ - #include "ctrl_iface_ap.h" - #include "ap_drv_ops.h" - - +#ifdef CONFIG_CTRL_IFACE_MIB - -- static int hostapd_get_sta_conn_time(struct sta_info *sta, -- char *buf, size_t buflen) --@@ -129,6 +130,7 @@ int hostapd_ctrl_iface_sta_next(struct h -+ static int hostapd_get_sta_tx_rx(struct hostapd_data *hapd, -+ struct sta_info *sta, -+@@ -214,6 +215,7 @@ int hostapd_ctrl_iface_sta_next(struct h - return hostapd_ctrl_iface_sta_mib(hapd, sta->next, buf, buflen); - } - -@@ -105,14 +92,14 @@ - - #ifdef CONFIG_P2P_MANAGER - static int p2p_manager_disconnect(struct hostapd_data *hapd, u16 stype, --@@ -423,3 +425,4 @@ int hostapd_parse_csa_settings(const cha -+@@ -526,3 +528,4 @@ int hostapd_parse_csa_settings(const cha - - return 0; - } - + - --- a/src/ap/ieee802_1x.c - +++ b/src/ap/ieee802_1x.c --@@ -1938,6 +1938,7 @@ static const char * bool_txt(Boolean boo -+@@ -2124,6 +2124,7 @@ static const char * bool_txt(Boolean boo - return bool_val ? "TRUE" : "FALSE"; - } - -@@ -120,17 +107,17 @@ - - int ieee802_1x_get_mib(struct hostapd_data *hapd, char *buf, size_t buflen) - { --@@ -2090,6 +2091,7 @@ int ieee802_1x_get_mib_sta(struct hostap -+@@ -2291,6 +2292,7 @@ int ieee802_1x_get_mib_sta(struct hostap - return len; - } - - +#endif - - static void ieee802_1x_finished(struct hostapd_data *hapd, -- struct sta_info *sta, int success) -+ struct sta_info *sta, int success, - --- a/src/ap/wpa_auth.c - +++ b/src/ap/wpa_auth.c --@@ -2708,6 +2708,7 @@ static const char * wpa_bool_txt(int boo -+@@ -2832,6 +2832,7 @@ static const char * wpa_bool_txt(int boo - return bool ? "TRUE" : "FALSE"; - } - -@@ -138,7 +125,7 @@ - - #define RSN_SUITE "%02x-%02x-%02x-%d" - #define RSN_SUITE_ARG(s) \ --@@ -2852,7 +2853,7 @@ int wpa_get_mib_sta(struct wpa_state_mac -+@@ -2976,7 +2977,7 @@ int wpa_get_mib_sta(struct wpa_state_mac - - return len; - } -@@ -149,7 +136,7 @@ - { - --- a/src/rsn_supp/wpa.c - +++ b/src/rsn_supp/wpa.c --@@ -1844,6 +1844,8 @@ static u32 wpa_key_mgmt_suite(struct wpa -+@@ -1911,6 +1911,8 @@ static u32 wpa_key_mgmt_suite(struct wpa - } - - -@@ -158,7 +145,7 @@ - #define RSN_SUITE "%02x-%02x-%02x-%d" - #define RSN_SUITE_ARG(s) \ - ((s) >> 24) & 0xff, ((s) >> 16) & 0xff, ((s) >> 8) & 0xff, (s) & 0xff --@@ -1927,6 +1929,7 @@ int wpa_sm_get_mib(struct wpa_sm *sm, ch -+@@ -1994,6 +1996,7 @@ int wpa_sm_get_mib(struct wpa_sm *sm, ch - - return (int) len; - } -diff --git a/package/hostapd/patches/390-wpa_ie_cap_workaround.patch b/package/hostapd/patches/390-wpa_ie_cap_workaround.patch -index 00a3222..40148fc 100644 ---- a/package/hostapd/patches/390-wpa_ie_cap_workaround.patch -+++ b/package/hostapd/patches/390-wpa_ie_cap_workaround.patch -@@ -1,6 +1,6 @@ - --- a/src/common/wpa_common.c - +++ b/src/common/wpa_common.c --@@ -959,6 +959,31 @@ const char * wpa_key_mgmt_txt(int key_mg -+@@ -1002,6 +1002,31 @@ const char * wpa_key_mgmt_txt(int key_mg - } - - -@@ -32,7 +32,7 @@ - int wpa_compare_rsn_ie(int ft_initial_assoc, - const u8 *ie1, size_t ie1len, - const u8 *ie2, size_t ie2len) --@@ -966,8 +991,19 @@ int wpa_compare_rsn_ie(int ft_initial_as -+@@ -1009,8 +1034,19 @@ int wpa_compare_rsn_ie(int ft_initial_as - if (ie1 == NULL || ie2 == NULL) - return -1; - -diff --git a/package/hostapd/patches/400-terminate_on_setup_failure.patch b/package/hostapd/patches/400-terminate_on_setup_failure.patch -deleted file mode 100644 -index 0d9065a..0000000 ---- a/package/hostapd/patches/400-terminate_on_setup_failure.patch -+++ /dev/null -@@ -1,85 +0,0 @@ ----- a/src/ap/hostapd.c --+++ b/src/ap/hostapd.c --@@ -1103,13 +1103,8 @@ int hostapd_setup_interface_complete(str -- size_t j; -- u8 *prev_addr; -- --- if (err) { --- wpa_printf(MSG_ERROR, "Interface initialization failed"); --- hostapd_set_state(iface, HAPD_IFACE_DISABLED); --- if (iface->interfaces && iface->interfaces->terminate_on_error) --- eloop_terminate(); --- return -1; --- } --+ if (err) --+ goto error; -- -- wpa_printf(MSG_DEBUG, "Completing interface initialization"); -- if (iface->conf->channel) { --@@ -1140,7 +1135,7 @@ int hostapd_setup_interface_complete(str -- hapd->iconf->vht_oper_centr_freq_seg1_idx)) { -- wpa_printf(MSG_ERROR, "Could not set channel for " -- "kernel driver"); --- return -1; --+ goto error; -- } -- } -- --@@ -1151,7 +1146,7 @@ int hostapd_setup_interface_complete(str -- hostapd_logger(hapd, NULL, HOSTAPD_MODULE_IEEE80211, -- HOSTAPD_LEVEL_WARNING, -- "Failed to prepare rates table."); --- return -1; --+ goto error; -- } -- } -- --@@ -1159,14 +1154,14 @@ int hostapd_setup_interface_complete(str -- hostapd_set_rts(hapd, hapd->iconf->rts_threshold)) { -- wpa_printf(MSG_ERROR, "Could not set RTS threshold for " -- "kernel driver"); --- return -1; --+ goto error; -- } -- -- if (hapd->iconf->fragm_threshold > -1 && -- hostapd_set_frag(hapd, hapd->iconf->fragm_threshold)) { -- wpa_printf(MSG_ERROR, "Could not set fragmentation threshold " -- "for kernel driver"); --- return -1; --+ goto error; -- } -- -- prev_addr = hapd->own_addr; --@@ -1176,7 +1171,7 @@ int hostapd_setup_interface_complete(str -- if (j) -- os_memcpy(hapd->own_addr, prev_addr, ETH_ALEN); -- if (hostapd_setup_bss(hapd, j == 0)) --- return -1; --+ goto error; -- if (hostapd_mac_comp_empty(hapd->conf->bssid) == 0) -- prev_addr = hapd->own_addr; -- } --@@ -1191,7 +1186,7 @@ int hostapd_setup_interface_complete(str -- if (hostapd_driver_commit(hapd) < 0) { -- wpa_printf(MSG_ERROR, "%s: Failed to commit driver " -- "configuration", __func__); --- return -1; --+ goto error; -- } -- -- /* --@@ -1216,6 +1211,13 @@ int hostapd_setup_interface_complete(str -- iface->interfaces->terminate_on_error--; -- -- return 0; --+ --+error: --+ wpa_printf(MSG_ERROR, "Interface initialization failed"); --+ hostapd_set_state(iface, HAPD_IFACE_DISABLED); --+ if (iface->interfaces && iface->interfaces->terminate_on_error) --+ eloop_terminate(); --+ return -1; -- } -- -- -diff --git a/package/hostapd/patches/410-bring_down_interface.patch b/package/hostapd/patches/410-bring_down_interface.patch -index 31033a0..165484b 100644 ---- a/package/hostapd/patches/410-bring_down_interface.patch -+++ b/package/hostapd/patches/410-bring_down_interface.patch -@@ -1,6 +1,6 @@ - --- a/src/drivers/driver_nl80211.c - +++ b/src/drivers/driver_nl80211.c --@@ -8480,12 +8480,7 @@ static int wpa_driver_nl80211_set_mode(s -+@@ -9070,12 +9070,7 @@ static int wpa_driver_nl80211_set_mode(s - /* Try to set the mode again while the interface is - * down */ - ret = nl80211_set_mode(drv, drv->ifindex, nlmode); -@@ -14,7 +14,7 @@ - break; - } else - wpa_printf(MSG_DEBUG, "nl80211: Failed to set " --@@ -8498,6 +8493,8 @@ static int wpa_driver_nl80211_set_mode(s -+@@ -9088,6 +9083,8 @@ static int wpa_driver_nl80211_set_mode(s - "interface is down"); - drv->nlmode = nlmode; - drv->ignore_if_down_event = 1; -diff --git a/package/hostapd/patches/420-fix_wps_pin_crash.patch b/package/hostapd/patches/420-fix_wps_pin_crash.patch -index 130bd53..31995c4 100644 ---- a/package/hostapd/patches/420-fix_wps_pin_crash.patch -+++ b/package/hostapd/patches/420-fix_wps_pin_crash.patch -@@ -1,6 +1,6 @@ - --- a/hostapd/ctrl_iface.c - +++ b/hostapd/ctrl_iface.c --@@ -480,6 +480,9 @@ static int hostapd_ctrl_iface_wps_ap_pin -+@@ -540,6 +540,9 @@ static int hostapd_ctrl_iface_wps_ap_pin - char *pos; - const char *pin_txt; - -diff --git a/package/hostapd/patches/430-wps_single_auth_enc_type.patch b/package/hostapd/patches/430-wps_single_auth_enc_type.patch -index 6e86658..8dae52b 100644 ---- a/package/hostapd/patches/430-wps_single_auth_enc_type.patch -+++ b/package/hostapd/patches/430-wps_single_auth_enc_type.patch -@@ -1,6 +1,6 @@ - --- a/src/ap/wps_hostapd.c - +++ b/src/ap/wps_hostapd.c --@@ -1069,11 +1069,9 @@ int hostapd_init_wps(struct hostapd_data -+@@ -1051,11 +1051,9 @@ int hostapd_init_wps(struct hostapd_data - - if (conf->rsn_pairwise & WPA_CIPHER_CCMP) - wps->encr_types |= WPS_ENCR_AES; -@@ -14,7 +14,7 @@ - if (conf->wpa_key_mgmt & WPA_KEY_MGMT_PSK) - wps->auth_types |= WPS_AUTH_WPAPSK; - if (conf->wpa_key_mgmt & WPA_KEY_MGMT_IEEE8021X) --@@ -1081,7 +1079,7 @@ int hostapd_init_wps(struct hostapd_data -+@@ -1063,7 +1061,7 @@ int hostapd_init_wps(struct hostapd_data - - if (conf->wpa_pairwise & WPA_CIPHER_CCMP) - wps->encr_types |= WPS_ENCR_AES; -diff --git a/package/hostapd/patches/440-dynamic_20_40_mhz.patch b/package/hostapd/patches/440-dynamic_20_40_mhz.patch -deleted file mode 100644 -index 905ec2c..0000000 ---- a/package/hostapd/patches/440-dynamic_20_40_mhz.patch -+++ /dev/null -@@ -1,206 +0,0 @@ ----- a/hostapd/config_file.c --+++ b/hostapd/config_file.c --@@ -2422,6 +2422,10 @@ static int hostapd_config_fill(struct ho -- "ht_capab", line); -- errors++; -- } --+ } else if (os_strcmp(buf, "dynamic_ht40") == 0) { --+ conf->dynamic_ht40 = atoi(pos); --+ if (conf->dynamic_ht40 == 1) --+ conf->dynamic_ht40 = 1500; -- } else if (os_strcmp(buf, "require_ht") == 0) { -- conf->require_ht = atoi(pos); -- } else if (os_strcmp(buf, "obss_interval") == 0) { ----- a/src/ap/ap_config.h --+++ b/src/ap/ap_config.h --@@ -531,6 +531,7 @@ struct hostapd_config { -- int ieee80211n; -- int secondary_channel; -- int require_ht; --+ int dynamic_ht40; -- int obss_interval; -- u32 vht_capab; -- int ieee80211ac; ----- a/src/ap/hostapd.c --+++ b/src/ap/hostapd.c --@@ -23,6 +23,7 @@ -- #include "beacon.h" -- #include "iapp.h" -- #include "ieee802_1x.h" --+#include "ieee802_11.h" -- #include "ieee802_11_auth.h" -- #include "vlan_init.h" -- #include "wpa_auth.h" --@@ -332,6 +333,7 @@ static void hostapd_cleanup(struct hosta -- static void hostapd_cleanup_iface_partial(struct hostapd_iface *iface) -- { -- wpa_printf(MSG_DEBUG, "%s(%p)", __func__, iface); --+ hostapd_deinit_ht(iface); -- hostapd_free_hw_features(iface->hw_features, iface->num_hw_features); -- iface->hw_features = NULL; -- os_free(iface->current_rates); ----- a/src/ap/hostapd.h --+++ b/src/ap/hostapd.h --@@ -326,6 +326,9 @@ struct hostapd_iface { -- /* Overlapping BSS information */ -- int olbc_ht; -- --+ int force_20mhz; --+ struct os_time last_20mhz_trigger; --+ -- u16 ht_op_mode; -- -- /* surveying helpers */ ----- a/src/ap/ieee802_11.c --+++ b/src/ap/ieee802_11.c --@@ -1538,6 +1538,9 @@ static void handle_beacon(struct hostapd -- sizeof(mgmt->u.beacon)), &elems, -- 0); -- --+ if (!elems.ht_capabilities) --+ hostapd_trigger_20mhz(hapd->iface); --+ -- ap_list_process_beacon(hapd->iface, mgmt, &elems, fi); -- } -- ----- a/src/ap/ieee802_11.h --+++ b/src/ap/ieee802_11.h --@@ -82,4 +82,17 @@ int hostapd_update_time_adv(struct hosta -- void hostapd_client_poll_ok(struct hostapd_data *hapd, const u8 *addr); -- u8 * hostapd_eid_bss_max_idle_period(struct hostapd_data *hapd, u8 *eid); -- --+#ifdef CONFIG_IEEE80211N --+void hostapd_trigger_20mhz(struct hostapd_iface *iface); --+void hostapd_deinit_ht(struct hostapd_iface *iface); --+ --+#else --+static inline void hostapd_deinit_ht(struct hostapd_iface *iface) --+{ --+} --+static inline void hostapd_trigger_20mhz(struct hostapd_iface *iface) --+{ --+} --+#endif /* CONFIG_IEEE80211N */ --+ -- #endif /* IEEE802_11_H */ ----- a/src/ap/ieee802_11_ht.c --+++ b/src/ap/ieee802_11_ht.c --@@ -20,9 +20,11 @@ -- #include "drivers/driver.h" -- #include "hostapd.h" -- #include "ap_config.h" --+#include "ap_drv_ops.h" -- #include "sta_info.h" -- #include "beacon.h" -- #include "ieee802_11.h" --+#include "utils/eloop.h" -- -- -- u8 * hostapd_eid_ht_capabilities(struct hostapd_data *hapd, u8 *eid) --@@ -86,12 +88,15 @@ u8 * hostapd_eid_ht_operation(struct hos -- -- oper->control_chan = hapd->iconf->channel; -- oper->operation_mode = host_to_le16(hapd->iface->ht_op_mode); --- if (hapd->iconf->secondary_channel == 1) --- oper->ht_param |= HT_INFO_HT_PARAM_SECONDARY_CHNL_ABOVE | --- HT_INFO_HT_PARAM_REC_TRANS_CHNL_WIDTH; --- if (hapd->iconf->secondary_channel == -1) --- oper->ht_param |= HT_INFO_HT_PARAM_SECONDARY_CHNL_BELOW | --- HT_INFO_HT_PARAM_REC_TRANS_CHNL_WIDTH; --+ --+ if (!hapd->iface->force_20mhz) { --+ if (hapd->iconf->secondary_channel == 1) --+ oper->ht_param |= HT_INFO_HT_PARAM_SECONDARY_CHNL_ABOVE | --+ HT_INFO_HT_PARAM_REC_TRANS_CHNL_WIDTH; --+ if (hapd->iconf->secondary_channel == -1) --+ oper->ht_param |= HT_INFO_HT_PARAM_SECONDARY_CHNL_BELOW | --+ HT_INFO_HT_PARAM_REC_TRANS_CHNL_WIDTH; --+ } -- -- pos += sizeof(*oper); -- --@@ -286,3 +291,84 @@ void hostapd_get_ht_capab(struct hostapd -- -- neg_ht_cap->ht_capabilities_info = host_to_le16(cap); -- } --+ --+static void hostapd_set_force_20mhz(struct hostapd_iface *iface); --+ --+static void hostapd_restore_40mhz(void *eloop_data, void *user_ctx) --+{ --+ struct hostapd_iface *iface = eloop_data; --+ struct os_time time; --+ int timeout; --+ --+ if (!iface->last_20mhz_trigger.sec) --+ return; --+ --+ os_get_time(&time); --+ timeout = iface->last_20mhz_trigger.sec + iface->conf->dynamic_ht40 - --+ time.sec; --+ --+ if (timeout > 0) { --+ eloop_register_timeout(timeout, 0, hostapd_restore_40mhz, --+ iface, NULL); --+ return; --+ } --+ --+ iface->last_20mhz_trigger.sec = 0; --+ iface->last_20mhz_trigger.usec = 0; --+ --+ iface->force_20mhz = 0; --+ hostapd_set_force_20mhz(iface); --+} --+ --+static void hostapd_set_force_20mhz(struct hostapd_iface *iface) --+{ --+ int secondary_channel; --+ int i; --+ --+ ieee802_11_set_beacons(iface); --+ --+ for (i = 0; i < iface->num_bss; i++) { --+ struct hostapd_data *hapd = iface->bss[i]; --+ --+ if (iface->force_20mhz) --+ secondary_channel = 0; --+ else --+ secondary_channel = hapd->iconf->secondary_channel; --+ --+ if (hostapd_set_freq(hapd, hapd->iconf->hw_mode, iface->freq, --+ hapd->iconf->channel, --+ hapd->iconf->ieee80211n, --+ hapd->iconf->ieee80211ac, --+ secondary_channel, --+ hapd->iconf->vht_oper_chwidth, --+ hapd->iconf->vht_oper_centr_freq_seg0_idx, --+ hapd->iconf->vht_oper_centr_freq_seg1_idx)) { --+ wpa_printf(MSG_ERROR, "Could not set channel for " --+ "kernel driver"); --+ } --+ } --+} --+ --+void hostapd_deinit_ht(struct hostapd_iface *iface) --+{ --+ eloop_cancel_timeout(hostapd_restore_40mhz, iface, NULL); --+} --+ --+void hostapd_trigger_20mhz(struct hostapd_iface *iface) --+{ --+ if (!iface->conf->dynamic_ht40) --+ return; --+ --+ if (!iface->force_20mhz) { --+ iface->force_20mhz = 1; --+ hostapd_set_force_20mhz(iface); --+ } --+ --+ if (!iface->last_20mhz_trigger.sec) { --+ eloop_cancel_timeout(hostapd_restore_40mhz, iface, NULL); --+ eloop_register_timeout(iface->conf->dynamic_ht40, 0, --+ hostapd_restore_40mhz, iface, NULL); --+ } --+ --+ os_get_time(&iface->last_20mhz_trigger); --+} -diff --git a/package/hostapd/patches/450-limit_debug_messages.patch b/package/hostapd/patches/450-limit_debug_messages.patch -index aaea941..08f17dc 100644 ---- a/package/hostapd/patches/450-limit_debug_messages.patch -+++ b/package/hostapd/patches/450-limit_debug_messages.patch -@@ -20,40 +20,41 @@ - { - size_t i; - --@@ -375,20 +375,9 @@ static void _wpa_hexdump(int level, cons -+@@ -375,20 +375,8 @@ static void _wpa_hexdump(int level, cons - #endif /* CONFIG_ANDROID_LOG */ - } - ---void wpa_hexdump(int level, const char *title, const u8 *buf, size_t len) -+-void wpa_hexdump(int level, const char *title, const void *buf, size_t len) - -{ - - _wpa_hexdump(level, title, buf, len, 1); - -} - - - - ---void wpa_hexdump_key(int level, const char *title, const u8 *buf, size_t len) -+-void wpa_hexdump_key(int level, const char *title, const void *buf, size_t len) - -{ - - _wpa_hexdump(level, title, buf, len, wpa_debug_show_keys); - -} -- - - ---static void _wpa_hexdump_ascii(int level, const char *title, const u8 *buf, -+- -+-static void _wpa_hexdump_ascii(int level, const char *title, const void *buf, - - size_t len, int show) --+void _wpa_hexdump_ascii(int level, const char *title, const u8 *buf, -++void _wpa_hexdump_ascii(int level, const char *title, const void *buf, - + size_t len, int show) - { - size_t i, llen; - const u8 *pos = buf; --@@ -495,19 +484,6 @@ static void _wpa_hexdump_ascii(int level -+@@ -495,20 +483,6 @@ static void _wpa_hexdump_ascii(int level - } - - ---void wpa_hexdump_ascii(int level, const char *title, const u8 *buf, size_t len) -+-void wpa_hexdump_ascii(int level, const char *title, const void *buf, -+- size_t len) - -{ - - _wpa_hexdump_ascii(level, title, buf, len, 1); - -} - - - - ---void wpa_hexdump_ascii_key(int level, const char *title, const u8 *buf, -+-void wpa_hexdump_ascii_key(int level, const char *title, const void *buf, - - size_t len) - -{ - - _wpa_hexdump_ascii(level, title, buf, len, wpa_debug_show_keys); -@@ -63,7 +64,7 @@ - #ifdef CONFIG_DEBUG_FILE - static char *last_path = NULL; - #endif /* CONFIG_DEBUG_FILE */ --@@ -591,7 +567,7 @@ void wpa_msg_register_ifname_cb(wpa_msg_ -+@@ -592,7 +566,7 @@ void wpa_msg_register_ifname_cb(wpa_msg_ - } - - -@@ -72,7 +73,7 @@ - { - va_list ap; - char *buf; --@@ -625,7 +601,7 @@ void wpa_msg(void *ctx, int level, const -+@@ -630,7 +604,7 @@ void wpa_msg(void *ctx, int level, const - } - - -@@ -83,14 +84,14 @@ - char *buf; - --- a/src/utils/wpa_debug.h - +++ b/src/utils/wpa_debug.h --@@ -43,6 +43,17 @@ int wpa_debug_open_file(const char *path -+@@ -47,6 +47,17 @@ int wpa_debug_open_file(const char *path - int wpa_debug_reopen_file(void); - void wpa_debug_close_file(void); - - +/* internal */ - +void _wpa_hexdump(int level, const char *title, const u8 *buf, - + size_t len, int show); --+void _wpa_hexdump_ascii(int level, const char *title, const u8 *buf, -++void _wpa_hexdump_ascii(int level, const char *title, const void *buf, - + size_t len, int show); - +extern int wpa_debug_show_keys; - + -@@ -101,7 +102,7 @@ - /** - * wpa_debug_printf_timestamp - Print timestamp for debug output - * --@@ -63,9 +74,15 @@ void wpa_debug_print_timestamp(void); -+@@ -67,9 +78,15 @@ void wpa_debug_print_timestamp(void); - * - * Note: New line '\n' is added to the end of the text when printing to stdout. - */ -@@ -118,11 +119,11 @@ - /** - * wpa_hexdump - conditional hex dump - * @level: priority level (MSG_*) of the message --@@ -77,7 +94,13 @@ PRINTF_FORMAT(2, 3); -+@@ -81,7 +98,13 @@ PRINTF_FORMAT(2, 3); - * output may be directed to stdout, stderr, and/or syslog based on - * configuration. The contents of buf is printed out has hex dump. - */ ---void wpa_hexdump(int level, const char *title, const u8 *buf, size_t len); -+-void wpa_hexdump(int level, const char *title, const void *buf, size_t len); - +static inline void wpa_hexdump(int level, const char *title, const u8 *buf, size_t len) - +{ - + if (level < CONFIG_MSG_MIN_PRIORITY) -@@ -133,11 +134,11 @@ - - static inline void wpa_hexdump_buf(int level, const char *title, - const struct wpabuf *buf) --@@ -99,7 +122,13 @@ static inline void wpa_hexdump_buf(int l -+@@ -103,7 +126,13 @@ static inline void wpa_hexdump_buf(int l - * like wpa_hexdump(), but by default, does not include secret keys (passwords, - * etc.) in debug output. - */ ---void wpa_hexdump_key(int level, const char *title, const u8 *buf, size_t len); -+-void wpa_hexdump_key(int level, const char *title, const void *buf, size_t len); - +static inline void wpa_hexdump_key(int level, const char *title, const u8 *buf, size_t len) - +{ - + if (level < CONFIG_MSG_MIN_PRIORITY) -@@ -148,11 +149,11 @@ - - static inline void wpa_hexdump_buf_key(int level, const char *title, - const struct wpabuf *buf) --@@ -121,8 +150,14 @@ static inline void wpa_hexdump_buf_key(i -+@@ -125,8 +154,14 @@ static inline void wpa_hexdump_buf_key(i - * the hex numbers and ASCII characters (for printable range) are shown. 16 - * bytes per line will be shown. - */ ---void wpa_hexdump_ascii(int level, const char *title, const u8 *buf, -+-void wpa_hexdump_ascii(int level, const char *title, const void *buf, - - size_t len); - +static inline void wpa_hexdump_ascii(int level, const char *title, - + const u8 *buf, size_t len) -@@ -165,11 +166,11 @@ - - /** - * wpa_hexdump_ascii_key - conditional hex dump, hide keys --@@ -138,8 +173,14 @@ void wpa_hexdump_ascii(int level, const -+@@ -142,8 +177,14 @@ void wpa_hexdump_ascii(int level, const - * bytes per line will be shown. This works like wpa_hexdump_ascii(), but by - * default, does not include secret keys (passwords, etc.) in debug output. - */ ---void wpa_hexdump_ascii_key(int level, const char *title, const u8 *buf, -+-void wpa_hexdump_ascii_key(int level, const char *title, const void *buf, - - size_t len); - +static inline void wpa_hexdump_ascii_key(int level, const char *title, - + const u8 *buf, size_t len) -@@ -182,7 +183,7 @@ - - /* - * wpa_dbg() behaves like wpa_msg(), but it can be removed from build to reduce --@@ -174,7 +215,12 @@ void wpa_hexdump_ascii_key(int level, co -+@@ -178,7 +219,12 @@ void wpa_hexdump_ascii_key(int level, co - * - * Note: New line '\n' is added to the end of the text when printing to stdout. - */ -@@ -196,7 +197,7 @@ - - /** - * wpa_msg_ctrl - Conditional printf for ctrl_iface monitors --@@ -188,8 +234,13 @@ void wpa_msg(void *ctx, int level, const -+@@ -192,8 +238,13 @@ void wpa_msg(void *ctx, int level, const - * attached ctrl_iface monitors. In other words, it can be used for frequent - * events that do not need to be sent to syslog. - */ -diff --git a/package/hostapd/patches/460-indicate-features.patch b/package/hostapd/patches/460-indicate-features.patch -index 7a44da1..cee3e76 100644 ---- a/package/hostapd/patches/460-indicate-features.patch -+++ b/package/hostapd/patches/460-indicate-features.patch -@@ -1,23 +1,23 @@ - --- a/hostapd/main.c - +++ b/hostapd/main.c --@@ -14,6 +14,7 @@ -- -+@@ -15,6 +15,7 @@ - #include "utils/common.h" - #include "utils/eloop.h" -+ #include "utils/uuid.h" - +#include "utils/build_features.h" - #include "crypto/random.h" - #include "crypto/tls.h" - #include "common/version.h" --@@ -546,7 +547,7 @@ int main(int argc, char *argv[]) -+@@ -558,7 +559,7 @@ int main(int argc, char *argv[]) - - wpa_supplicant_event = hostapd_wpa_event; - for (;;) { --- c = getopt(argc, argv, "b:Bde:f:hKP:Ttvg:G:"); --+ c = getopt(argc, argv, "b:Bde:f:hKP:Ttg:G:v::"); -+- c = getopt(argc, argv, "b:Bde:f:hKP:Ttu:vg:G:"); -++ c = getopt(argc, argv, "b:Bde:f:hKP:Ttu:g:G:v::"); - if (c < 0) - break; - switch (c) { --@@ -583,6 +584,8 @@ int main(int argc, char *argv[]) -+@@ -595,6 +596,8 @@ int main(int argc, char *argv[]) - break; - #endif /* CONFIG_DEBUG_LINUX_TRACING */ - case 'v': -@@ -36,16 +36,16 @@ - #include "wpa_supplicant_i.h" - #include "driver_i.h" - #include "p2p_supplicant.h" --@@ -161,7 +162,7 @@ int main(int argc, char *argv[]) -+@@ -176,7 +177,7 @@ int main(int argc, char *argv[]) - - for (;;) { - c = getopt(argc, argv, --- "b:Bc:C:D:de:f:g:G:hH:i:I:KLNo:O:p:P:qsTtuvW"); --+ "b:Bc:C:D:de:f:g:G:hH:i:I:KLNo:O:p:P:qsTtuv::W"); -+- "b:Bc:C:D:de:f:g:G:hH:i:I:KLm:No:O:p:P:qsTtuvW"); -++ "b:Bc:C:D:de:f:g:G:hH:i:I:KLm:No:O:p:P:qsTtuv::W"); - if (c < 0) - break; - switch (c) { --@@ -259,8 +260,12 @@ int main(int argc, char *argv[]) -+@@ -279,8 +280,12 @@ int main(int argc, char *argv[]) - break; - #endif /* CONFIG_DBUS */ - case 'v': -diff --git a/package/hostapd/patches/470-hostapd_cli_ifdef.patch b/package/hostapd/patches/470-hostapd_cli_ifdef.patch -index 5ac0fdd..d4a0f12 100644 ---- a/package/hostapd/patches/470-hostapd_cli_ifdef.patch -+++ b/package/hostapd/patches/470-hostapd_cli_ifdef.patch -@@ -16,7 +16,7 @@ - " get_config show current configuration\n" - " help show this usage help\n" - " interface [ifname] show interfaces/select interface\n" --@@ -352,7 +350,6 @@ static int hostapd_cli_cmd_sa_query(stru -+@@ -362,7 +360,6 @@ static int hostapd_cli_cmd_sa_query(stru - #endif /* CONFIG_IEEE80211W */ - - -@@ -24,7 +24,7 @@ - static int hostapd_cli_cmd_wps_pin(struct wpa_ctrl *ctrl, int argc, - char *argv[]) - { --@@ -578,7 +575,6 @@ static int hostapd_cli_cmd_wps_config(st -+@@ -588,7 +585,6 @@ static int hostapd_cli_cmd_wps_config(st - ssid_hex, argv[1]); - return wpa_ctrl_command(ctrl, buf); - } -@@ -32,7 +32,7 @@ - - - static int hostapd_cli_cmd_disassoc_imminent(struct wpa_ctrl *ctrl, int argc, --@@ -903,7 +899,6 @@ static struct hostapd_cli_cmd hostapd_cl -+@@ -979,7 +975,6 @@ static struct hostapd_cli_cmd hostapd_cl - #ifdef CONFIG_IEEE80211W - { "sa_query", hostapd_cli_cmd_sa_query }, - #endif /* CONFIG_IEEE80211W */ -@@ -40,7 +40,7 @@ - { "wps_pin", hostapd_cli_cmd_wps_pin }, - { "wps_check_pin", hostapd_cli_cmd_wps_check_pin }, - { "wps_pbc", hostapd_cli_cmd_wps_pbc }, --@@ -917,7 +912,6 @@ static struct hostapd_cli_cmd hostapd_cl -+@@ -993,7 +988,6 @@ static struct hostapd_cli_cmd hostapd_cl - { "wps_ap_pin", hostapd_cli_cmd_wps_ap_pin }, - { "wps_config", hostapd_cli_cmd_wps_config }, - { "wps_get_status", hostapd_cli_cmd_wps_get_status }, -diff --git a/package/hostapd/patches/471-wpa_cli_ifdef.patch b/package/hostapd/patches/471-wpa_cli_ifdef.patch -index cc84444..36b5a44 100644 ---- a/package/hostapd/patches/471-wpa_cli_ifdef.patch -+++ b/package/hostapd/patches/471-wpa_cli_ifdef.patch -@@ -10,4 +10,4 @@ - + - static const char *wpa_cli_version = - "wpa_cli v" VERSION_STR "\n" -- "Copyright (c) 2004-2013, Jouni Malinen and contributors"; -+ "Copyright (c) 2004-2014, Jouni Malinen and contributors"; -diff --git a/package/hostapd/patches/480-max_num_sta_probe.patch b/package/hostapd/patches/480-max_num_sta_probe.patch -index e5ca8b4..e238bf4 100644 ---- a/package/hostapd/patches/480-max_num_sta_probe.patch -+++ b/package/hostapd/patches/480-max_num_sta_probe.patch -@@ -1,6 +1,6 @@ - --- a/src/ap/beacon.c - +++ b/src/ap/beacon.c --@@ -501,6 +501,10 @@ void handle_probe_req(struct hostapd_dat -+@@ -599,6 +599,10 @@ void handle_probe_req(struct hostapd_dat - return; - } - -@@ -9,5 +9,5 @@ - + " too many connected stations.", MAC2STR(mgmt->sa)); - + - #ifdef CONFIG_INTERWORKING -- if (elems.interworking && elems.interworking_len >= 1) { -- u8 ant = elems.interworking[0] & 0x0f; -+ if (hapd->conf->interworking && -+ elems.interworking && elems.interworking_len >= 1) { -diff --git a/package/hostapd/patches/490-scan_wait.patch b/package/hostapd/patches/490-scan_wait.patch -index 61715d6..3459a61 100644 ---- a/package/hostapd/patches/490-scan_wait.patch -+++ b/package/hostapd/patches/490-scan_wait.patch -@@ -1,15 +1,15 @@ - --- a/hostapd/main.c - +++ b/hostapd/main.c --@@ -33,6 +33,8 @@ -- extern int wpa_debug_level; -- extern int wpa_debug_show_keys; -- extern int wpa_debug_timestamp; -+@@ -36,6 +36,8 @@ struct hapd_global { -+ }; -+ -+ static struct hapd_global global; - +static int daemonize = 0; - +static char *pid_file = NULL; - -- extern struct wpa_driver_ops *wpa_drivers[]; - --@@ -147,6 +149,14 @@ static void hostapd_logger_cb(void *ctx, -+ #ifndef CONFIG_NO_HOSTAPD_LOGGER -+@@ -141,6 +143,14 @@ static void hostapd_logger_cb(void *ctx, - } - #endif /* CONFIG_NO_HOSTAPD_LOGGER */ - -@@ -24,7 +24,7 @@ - - /** - * hostapd_driver_init - Preparate driver interface --@@ -165,6 +175,8 @@ static int hostapd_driver_init(struct ho -+@@ -159,6 +169,8 @@ static int hostapd_driver_init(struct ho - return -1; - } - -@@ -33,7 +33,7 @@ - /* Initialize the driver interface */ - if (!(b[0] | b[1] | b[2] | b[3] | b[4] | b[5])) - b = NULL; --@@ -381,8 +393,6 @@ static void hostapd_global_deinit(const -+@@ -372,8 +384,6 @@ static void hostapd_global_deinit(const - #endif /* CONFIG_NATIVE_WINDOWS */ - - eap_server_unregister_methods(); -@@ -42,7 +42,7 @@ - } - - --@@ -408,11 +418,6 @@ static int hostapd_global_run(struct hap -+@@ -399,11 +409,6 @@ static int hostapd_global_run(struct hap - } - #endif /* EAP_SERVER_TNC */ - -@@ -54,7 +54,7 @@ - eloop_run(); - - return 0; --@@ -521,8 +526,7 @@ int main(int argc, char *argv[]) -+@@ -533,8 +538,7 @@ int main(int argc, char *argv[]) - struct hapd_interfaces interfaces; - int ret = 1; - size_t i, j; -diff --git a/package/hostapd/patches/500-wpa_supplicant-add-new-config-params-to-be-used-with.patch b/package/hostapd/patches/500-wpa_supplicant-add-new-config-params-to-be-used-with.patch -index 544151e..9f4a5f5 100644 ---- a/package/hostapd/patches/500-wpa_supplicant-add-new-config-params-to-be-used-with.patch -+++ b/package/hostapd/patches/500-wpa_supplicant-add-new-config-params-to-be-used-with.patch -@@ -22,9 +22,9 @@ Signed-hostap: Antonio Quartulli - #include "common/defs.h" - #include "utils/list.h" - --@@ -404,6 +405,11 @@ struct wpa_driver_associate_params { -- */ -- int freq; -+@@ -414,6 +415,11 @@ struct wpa_driver_associate_params { -+ * responsible for selecting with which BSS to associate. */ -+ const u8 *bssid; - - + int beacon_interval; - + int fixed_freq; -@@ -32,11 +32,11 @@ Signed-hostap: Antonio Quartulli - + int mcast_rate; - + - /** -- * bg_scan_period - Background scan period in seconds, 0 to disable -- * background scan, or -1 to indicate no change to default driver -+ * bssid_hint - BSSID of a proposed AP -+ * - --- a/wpa_supplicant/config.c - +++ b/wpa_supplicant/config.c --@@ -14,6 +14,7 @@ -+@@ -15,6 +15,7 @@ - #include "rsn_supp/wpa.h" - #include "eap_peer/eap.h" - #include "p2p/p2p.h" -@@ -44,7 +44,7 @@ Signed-hostap: Antonio Quartulli - #include "config.h" - - --@@ -1512,6 +1513,97 @@ static char * wpa_config_write_psk_list( -+@@ -1527,6 +1528,97 @@ static char * wpa_config_write_psk_list( - - #endif /* CONFIG_P2P */ - -@@ -142,16 +142,16 @@ Signed-hostap: Antonio Quartulli - /* Helper macros for network block parser */ - - #ifdef OFFSET --@@ -1715,6 +1807,9 @@ static const struct parse_data ssid_fiel -+@@ -1733,6 +1825,9 @@ static const struct parse_data ssid_fiel - { INT(ap_max_inactivity) }, - { INT(dtim_period) }, - { INT(beacon_int) }, - + { INT_RANGE(fixed_freq, 0, 1) }, - + { FUNC(rates) }, - + { FUNC(mcast_rate) }, -- }; -- -- #undef OFFSET -+ #ifdef CONFIG_MACSEC -+ { INT_RANGE(macsec_policy, 0, 1) }, -+ #endif /* CONFIG_MACSEC */ - --- a/wpa_supplicant/config_ssid.h - +++ b/wpa_supplicant/config_ssid.h - @@ -12,6 +12,7 @@ -@@ -162,37 +162,24 @@ Signed-hostap: Antonio Quartulli - - #define MAX_SSID_LEN 32 - --@@ -620,6 +621,10 @@ struct wpa_ssid { -- * dereferences since it may not be updated in all cases. -+@@ -637,6 +638,10 @@ struct wpa_ssid { - */ - void *parent_cred; --+ -+ - + int fixed_freq; - + unsigned char rates[NL80211_MAX_SUPP_RATES]; - + double mcast_rate; -- }; -- -- #endif /* CONFIG_SSID_H */ -++ -+ #ifdef CONFIG_MACSEC -+ /** -+ * macsec_policy - Determines the policy for MACsec secure session - --- a/wpa_supplicant/wpa_supplicant.c - +++ b/wpa_supplicant/wpa_supplicant.c --@@ -1623,15 +1623,24 @@ void wpa_supplicant_associate(struct wpa -- params.ssid_len = ssid->ssid_len; -- } -- --- if (ssid->mode == WPAS_MODE_IBSS && ssid->bssid_set && --- wpa_s->conf->ap_scan == 2) { --- params.bssid = ssid->bssid; --- params.fixed_bssid = 1; --+ if (ssid->mode == WPAS_MODE_IBSS) { --+ if (ssid->bssid_set && wpa_s->conf->ap_scan == 2) { --+ params.bssid = ssid->bssid; --+ params.fixed_bssid = 1; --+ } --+ if (ssid->frequency > 0 && params.freq == 0) --+ /* Initial channel for IBSS */ --+ params.freq = ssid->frequency; -+@@ -1806,6 +1806,13 @@ static void wpas_start_assoc_cb(struct w -+ params.beacon_int = ssid->beacon_int; -+ else -+ params.beacon_int = wpa_s->conf->beacon_int; - + params.fixed_freq = ssid->fixed_freq; --+ params.beacon_interval = ssid->beacon_int; - + i = 0; - + while (i < NL80211_MAX_SUPP_RATES) { - + params.rates[i] = ssid->rates[i]; -@@ -201,9 +188,4 @@ Signed-hostap: Antonio Quartulli - + params.mcast_rate = ssid->mcast_rate; - } - --- if (ssid->mode == WPAS_MODE_IBSS && ssid->frequency > 0 && --- params.freq == 0) --- params.freq = ssid->frequency; /* Initial channel for IBSS */ - params.wpa_ie = wpa_ie; -- params.wpa_ie_len = wpa_ie_len; -- params.pairwise_suite = cipher_pairwise; -diff --git a/package/hostapd/patches/501-driver_nl80211-use-new-parameters-during-ibss-join.patch b/package/hostapd/patches/501-driver_nl80211-use-new-parameters-during-ibss-join.patch -index 565bbc9..e7484d9 100644 ---- a/package/hostapd/patches/501-driver_nl80211-use-new-parameters-during-ibss-join.patch -+++ b/package/hostapd/patches/501-driver_nl80211-use-new-parameters-during-ibss-join.patch -@@ -10,7 +10,7 @@ Signed-hostap: Antonio Quartulli - - --- a/src/drivers/driver_nl80211.c - +++ b/src/drivers/driver_nl80211.c --@@ -7903,7 +7903,7 @@ static int wpa_driver_nl80211_ibss(struc -+@@ -8581,7 +8581,7 @@ static int wpa_driver_nl80211_ibss(struc - struct wpa_driver_associate_params *params) - { - struct nl_msg *msg; -@@ -19,9 +19,9 @@ Signed-hostap: Antonio Quartulli - int count = 0; - - wpa_printf(MSG_DEBUG, "nl80211: Join IBSS (ifindex=%d)", drv->ifindex); --@@ -7936,6 +7936,37 @@ retry: -- wpa_printf(MSG_DEBUG, " * freq=%d", params->freq); -- NLA_PUT_U32(msg, NL80211_ATTR_WIPHY_FREQ, params->freq); -+@@ -8620,6 +8620,37 @@ retry: -+ params->beacon_int); -+ } - - + if (params->fixed_freq) { - + wpa_printf(MSG_DEBUG, " * fixed_freq"); -diff --git a/package/hostapd/patches/502-wpa_s-support-htmode-param.patch b/package/hostapd/patches/502-wpa_s-support-htmode-param.patch -index adb20a2..b4c4034 100644 ---- a/package/hostapd/patches/502-wpa_s-support-htmode-param.patch -+++ b/package/hostapd/patches/502-wpa_s-support-htmode-param.patch -@@ -16,7 +16,7 @@ Signed-off-by: Antonio Quartulli - - --- a/src/drivers/driver.h - +++ b/src/drivers/driver.h --@@ -409,6 +409,8 @@ struct wpa_driver_associate_params { -+@@ -419,6 +419,8 @@ struct wpa_driver_associate_params { - int fixed_freq; - unsigned char rates[NL80211_MAX_SUPP_RATES]; - int mcast_rate; -@@ -24,10 +24,10 @@ Signed-off-by: Antonio Quartulli - + unsigned int htmode; - - /** -- * bg_scan_period - Background scan period in seconds, 0 to disable -+ * bssid_hint - BSSID of a proposed AP - --- a/src/drivers/driver_nl80211.c - +++ b/src/drivers/driver_nl80211.c --@@ -7967,6 +7967,22 @@ retry: -+@@ -8651,6 +8651,22 @@ retry: - NLA_PUT_U32(msg, NL80211_ATTR_MCAST_RATE, params->mcast_rate); - } - -@@ -52,7 +52,7 @@ Signed-off-by: Antonio Quartulli - goto nla_put_failure; - --- a/wpa_supplicant/config.c - +++ b/wpa_supplicant/config.c --@@ -1544,6 +1544,71 @@ static char * wpa_config_write_mcast_rat -+@@ -1559,6 +1559,71 @@ static char * wpa_config_write_mcast_rat - } - #endif /* NO_CONFIG_WRITE */ - -@@ -124,28 +124,28 @@ Signed-off-by: Antonio Quartulli - static int wpa_config_parse_rates(const struct parse_data *data, - struct wpa_ssid *ssid, int line, - const char *value) --@@ -1810,6 +1875,7 @@ static const struct parse_data ssid_fiel -+@@ -1828,6 +1893,7 @@ static const struct parse_data ssid_fiel - { INT_RANGE(fixed_freq, 0, 1) }, - { FUNC(rates) }, - { FUNC(mcast_rate) }, - + { FUNC(htmode) }, -- }; -- -- #undef OFFSET -+ #ifdef CONFIG_MACSEC -+ { INT_RANGE(macsec_policy, 0, 1) }, -+ #endif /* CONFIG_MACSEC */ - --- a/wpa_supplicant/config_ssid.h - +++ b/wpa_supplicant/config_ssid.h --@@ -625,6 +625,8 @@ struct wpa_ssid { -+@@ -641,6 +641,8 @@ struct wpa_ssid { - int fixed_freq; - unsigned char rates[NL80211_MAX_SUPP_RATES]; - double mcast_rate; - + int ht_set; - + unsigned int htmode; -- }; - -- #endif /* CONFIG_SSID_H */ -+ #ifdef CONFIG_MACSEC -+ /** - --- a/wpa_supplicant/wpa_supplicant.c - +++ b/wpa_supplicant/wpa_supplicant.c --@@ -1639,6 +1639,8 @@ void wpa_supplicant_associate(struct wpa -+@@ -1813,6 +1813,8 @@ static void wpas_start_assoc_cb(struct w - i++; - } - params.mcast_rate = ssid->mcast_rate; -diff --git a/package/hostapd/patches/510-wpa_supplicant_p2p_parse_ifcomb.patch b/package/hostapd/patches/510-wpa_supplicant_p2p_parse_ifcomb.patch -deleted file mode 100644 -index fe72ee2..0000000 ---- a/package/hostapd/patches/510-wpa_supplicant_p2p_parse_ifcomb.patch -+++ /dev/null -@@ -1,18 +0,0 @@ ----- a/src/drivers/driver_nl80211.c --+++ b/src/drivers/driver_nl80211.c --@@ -3157,10 +3157,12 @@ static int wiphy_info_iface_comb_process -- } -- -- if (combination_has_p2p && combination_has_mgd) { --- info->p2p_concurrent = 1; --- info->num_multichan_concurrent = --+ int num_channels = -- nla_get_u32(tb_comb[NL80211_IFACE_COMB_NUM_CHANNELS]); --- return 1; --+ --+ info->p2p_concurrent = 1; --+ if (info->num_multichan_concurrent < num_channels) --+ info->num_multichan_concurrent = num_channels; -- } -- -- return 0; diff --git a/patches/openwrt/0018-ar71xx-add-support-for-QCA953x-SoC.patch b/patches/openwrt/0018-ar71xx-add-support-for-QCA953x-SoC.patch deleted file mode 100644 index ecb3a50a..00000000 --- a/patches/openwrt/0018-ar71xx-add-support-for-QCA953x-SoC.patch +++ /dev/null @@ -1,546 +0,0 @@ -From: Matthias Schiffer -Date: Sat, 29 Mar 2014 21:55:41 +0100 -Subject: ar71xx: add support for QCA953x SoC - -diff --git a/target/linux/ar71xx/config-3.3 b/target/linux/ar71xx/config-3.3 -index dfc5bf2..1c3ba3c 100644 ---- a/target/linux/ar71xx/config-3.3 -+++ b/target/linux/ar71xx/config-3.3 -@@ -40,11 +40,11 @@ CONFIG_ATH79_MACH_EW_DORIN=y - CONFIG_ATH79_MACH_HORNET_UB=y - CONFIG_ATH79_MACH_JA76PF=y - CONFIG_ATH79_MACH_JWAP003=y -+CONFIG_ATH79_MACH_MR600=y - CONFIG_ATH79_MACH_MZK_W04NU=y - CONFIG_ATH79_MACH_MZK_W300NH=y - CONFIG_ATH79_MACH_NBG460N=y - CONFIG_ATH79_MACH_OM2P=y --CONFIG_ATH79_MACH_MR600=y - CONFIG_ATH79_MACH_PB42=y - CONFIG_ATH79_MACH_PB44=y - CONFIG_ATH79_MACH_PB92=y -@@ -214,6 +214,7 @@ CONFIG_SOC_AR724X=y - CONFIG_SOC_AR913X=y - CONFIG_SOC_AR933X=y - CONFIG_SOC_AR934X=y -+CONFIG_SOC_QCA953X=y - CONFIG_SOC_QCA955X=y - CONFIG_SPI=y - CONFIG_SPI_AP83=y -diff --git a/target/linux/ar71xx/files/arch/mips/ath79/dev-eth.c b/target/linux/ar71xx/files/arch/mips/ath79/dev-eth.c -index 5a0b950..1a9b0df 100644 ---- a/target/linux/ar71xx/files/arch/mips/ath79/dev-eth.c -+++ b/target/linux/ar71xx/files/arch/mips/ath79/dev-eth.c -@@ -195,6 +195,7 @@ void __init ath79_register_mdio(unsigned int id, u32 phy_mask) - case ATH79_SOC_AR7241: - case ATH79_SOC_AR9330: - case ATH79_SOC_AR9331: -+ case ATH79_SOC_QCA9533: - mdio_dev = &ath79_mdio1_device; - mdio_data = &ath79_mdio1_data; - break; -@@ -250,6 +251,11 @@ void __init ath79_register_mdio(unsigned int id, u32 phy_mask) - } - mdio_data->is_ar934x = 1; - break; -+ -+ case ATH79_SOC_QCA9533: -+ mdio_data->builtin_switch = 1; -+ break; -+ - case ATH79_SOC_QCA9558: - if (id == 1) - mdio_data->builtin_switch = 1; -@@ -540,6 +546,7 @@ static void __init ath79_init_eth_pll_data(unsigned int id) - case ATH79_SOC_AR9341: - case ATH79_SOC_AR9342: - case ATH79_SOC_AR9344: -+ case ATH79_SOC_QCA9533: - case ATH79_SOC_QCA9558: - pll_10 = AR934X_PLL_VAL_10; - pll_100 = AR934X_PLL_VAL_100; -@@ -596,6 +603,7 @@ static int __init ath79_setup_phy_if_mode(unsigned int id, - case ATH79_SOC_AR7241: - case ATH79_SOC_AR9330: - case ATH79_SOC_AR9331: -+ case ATH79_SOC_QCA9533: - pdata->phy_if_mode = PHY_INTERFACE_MODE_MII; - break; - -@@ -645,6 +653,7 @@ static int __init ath79_setup_phy_if_mode(unsigned int id, - case ATH79_SOC_AR7241: - case ATH79_SOC_AR9330: - case ATH79_SOC_AR9331: -+ case ATH79_SOC_QCA9533: - pdata->phy_if_mode = PHY_INTERFACE_MODE_GMII; - break; - -@@ -882,6 +891,37 @@ void __init ath79_register_eth(unsigned int id) - pdata->fifo_cfg3 = 0x01f00140; - break; - -+ case ATH79_SOC_QCA9533: -+ if (id == 0) { -+ pdata->reset_bit = AR933X_RESET_GE0_MAC | -+ AR933X_RESET_GE0_MDIO; -+ pdata->set_speed = ath79_set_speed_dummy; -+ -+ pdata->phy_mask = BIT(4); -+ } else { -+ pdata->reset_bit = AR933X_RESET_GE1_MAC | -+ AR933X_RESET_GE1_MDIO; -+ pdata->set_speed = ath79_set_speed_dummy; -+ -+ pdata->speed = SPEED_1000; -+ pdata->duplex = DUPLEX_FULL; -+ pdata->switch_data = &ath79_switch_data; -+ -+ ath79_switch_data.phy_poll_mask |= BIT(4); -+ } -+ -+ pdata->ddr_flush = ath79_ddr_no_flush; -+ pdata->has_gbit = 1; -+ pdata->is_ar724x = 1; -+ -+ if (!pdata->fifo_cfg1) -+ pdata->fifo_cfg1 = 0x0010ffff; -+ if (!pdata->fifo_cfg2) -+ pdata->fifo_cfg2 = 0x015500aa; -+ if (!pdata->fifo_cfg3) -+ pdata->fifo_cfg3 = 0x01f00140; -+ break; -+ - case ATH79_SOC_AR9341: - case ATH79_SOC_AR9342: - case ATH79_SOC_AR9344: -@@ -953,6 +993,7 @@ void __init ath79_register_eth(unsigned int id) - case ATH79_SOC_AR7241: - case ATH79_SOC_AR9330: - case ATH79_SOC_AR9331: -+ case ATH79_SOC_QCA9533: - pdata->mii_bus_dev = &ath79_mdio1_device.dev; - break; - -diff --git a/target/linux/ar71xx/patches-3.3/707-MIPS-ath79-add-support-for-QCA953x-SoC.patch b/target/linux/ar71xx/patches-3.3/707-MIPS-ath79-add-support-for-QCA953x-SoC.patch -new file mode 100644 -index 0000000..4c9e761 ---- /dev/null -+++ b/target/linux/ar71xx/patches-3.3/707-MIPS-ath79-add-support-for-QCA953x-SoC.patch -@@ -0,0 +1,417 @@ -+From 5300a7cd7ed2f88488ddba62947b9c6bb9663777 Mon Sep 17 00:00:00 2001 -+Message-Id: <5300a7cd7ed2f88488ddba62947b9c6bb9663777.1396122227.git.mschiffer@universe-factory.net> -+From: Matthias Schiffer -+Date: Sat, 29 Mar 2014 20:26:08 +0100 -+Subject: [PATCH 1/2] MIPS: ath79: add support for QCA953x SoC -+ -+Note that the clock calculation looks very similar to the QCA955x, but actually -+some bits' meanings are slightly different. -+--- -+ arch/mips/ath79/Kconfig | 6 +- -+ arch/mips/ath79/clock.c | 78 ++++++++++++++++++++++++++ -+ arch/mips/ath79/common.c | 4 ++ -+ arch/mips/ath79/dev-common.c | 1 + -+ arch/mips/ath79/dev-wmac.c | 20 +++++++ -+ arch/mips/ath79/early_printk.c | 1 + -+ arch/mips/ath79/gpio.c | 4 +- -+ arch/mips/ath79/irq.c | 4 ++ -+ arch/mips/ath79/setup.c | 8 ++- -+ arch/mips/include/asm/mach-ath79/ar71xx_regs.h | 48 ++++++++++++++++ -+ arch/mips/include/asm/mach-ath79/ath79.h | 11 ++++ -+ 11 files changed, 182 insertions(+), 3 deletions(-) -+ -+--- a/arch/mips/ath79/Kconfig -++++ b/arch/mips/ath79/Kconfig -+@@ -688,6 +688,10 @@ config SOC_AR934X -+ select PCI_AR724X if PCI -+ def_bool n -+ -++config SOC_QCA953X -++ select USB_ARCH_HAS_EHCI -++ def_bool n -++ -+ config SOC_QCA955X -+ select USB_ARCH_HAS_EHCI -+ select HW_HAS_PCI -+@@ -731,7 +735,7 @@ config ATH79_DEV_USB -+ def_bool n -+ -+ config ATH79_DEV_WMAC -+- depends on (SOC_AR913X || SOC_AR933X || SOC_AR934X || SOC_QCA955X) -++ depends on (SOC_AR913X || SOC_AR933X || SOC_AR934X || SOC_QCA953X || SOC_QCA955X) -+ def_bool n -+ -+ config ATH79_NVRAM -+--- a/arch/mips/ath79/clock.c -++++ b/arch/mips/ath79/clock.c -+@@ -295,6 +295,82 @@ static void __init ar934x_clocks_init(vo -+ iounmap(dpll_base); -+ } -+ -++static void __init qca953x_clocks_init(void) -++{ -++ u32 pll, out_div, ref_div, nint, frac, clk_ctrl, postdiv; -++ u32 cpu_pll, ddr_pll; -++ u32 bootstrap; -++ -++ bootstrap = ath79_reset_rr(QCA953X_RESET_REG_BOOTSTRAP); -++ if (bootstrap & QCA953X_BOOTSTRAP_REF_CLK_40) -++ ath79_ref_clk.rate = 40 * 1000 * 1000; -++ else -++ ath79_ref_clk.rate = 25 * 1000 * 1000; -++ -++ pll = ath79_pll_rr(QCA953X_PLL_CPU_CONFIG_REG); -++ out_div = (pll >> QCA953X_PLL_CPU_CONFIG_OUTDIV_SHIFT) & -++ QCA953X_PLL_CPU_CONFIG_OUTDIV_MASK; -++ ref_div = (pll >> QCA953X_PLL_CPU_CONFIG_REFDIV_SHIFT) & -++ QCA953X_PLL_CPU_CONFIG_REFDIV_MASK; -++ nint = (pll >> QCA953X_PLL_CPU_CONFIG_NINT_SHIFT) & -++ QCA953X_PLL_CPU_CONFIG_NINT_MASK; -++ frac = (pll >> QCA953X_PLL_CPU_CONFIG_NFRAC_SHIFT) & -++ QCA953X_PLL_CPU_CONFIG_NFRAC_MASK; -++ -++ cpu_pll = nint * ath79_ref_clk.rate / ref_div; -++ cpu_pll += frac * (ath79_ref_clk.rate >> 6) / ref_div; -++ cpu_pll /= (1 << out_div); -++ -++ pll = ath79_pll_rr(QCA953X_PLL_DDR_CONFIG_REG); -++ out_div = (pll >> QCA953X_PLL_DDR_CONFIG_OUTDIV_SHIFT) & -++ QCA953X_PLL_DDR_CONFIG_OUTDIV_MASK; -++ ref_div = (pll >> QCA953X_PLL_DDR_CONFIG_REFDIV_SHIFT) & -++ QCA953X_PLL_DDR_CONFIG_REFDIV_MASK; -++ nint = (pll >> QCA953X_PLL_DDR_CONFIG_NINT_SHIFT) & -++ QCA953X_PLL_DDR_CONFIG_NINT_MASK; -++ frac = (pll >> QCA953X_PLL_DDR_CONFIG_NFRAC_SHIFT) & -++ QCA953X_PLL_DDR_CONFIG_NFRAC_MASK; -++ -++ ddr_pll = nint * ath79_ref_clk.rate / ref_div; -++ ddr_pll += frac * (ath79_ref_clk.rate >> 6) / (ref_div << 4); -++ ddr_pll /= (1 << out_div); -++ -++ clk_ctrl = ath79_pll_rr(QCA953X_PLL_CLK_CTRL_REG); -++ -++ postdiv = (clk_ctrl >> QCA953X_PLL_CLK_CTRL_CPU_POST_DIV_SHIFT) & -++ QCA953X_PLL_CLK_CTRL_CPU_POST_DIV_MASK; -++ -++ if (clk_ctrl & QCA953X_PLL_CLK_CTRL_CPU_PLL_BYPASS) -++ ath79_cpu_clk.rate = ath79_ref_clk.rate; -++ else if (clk_ctrl & QCA953X_PLL_CLK_CTRL_CPUCLK_FROM_CPUPLL) -++ ath79_cpu_clk.rate = cpu_pll / (postdiv + 1); -++ else -++ ath79_cpu_clk.rate = ddr_pll / (postdiv + 1); -++ -++ postdiv = (clk_ctrl >> QCA953X_PLL_CLK_CTRL_DDR_POST_DIV_SHIFT) & -++ QCA953X_PLL_CLK_CTRL_DDR_POST_DIV_MASK; -++ -++ if (clk_ctrl & QCA953X_PLL_CLK_CTRL_DDR_PLL_BYPASS) -++ ath79_ddr_clk.rate = ath79_ref_clk.rate; -++ else if (clk_ctrl & QCA953X_PLL_CLK_CTRL_DDRCLK_FROM_DDRPLL) -++ ath79_ddr_clk.rate = ddr_pll / (postdiv + 1); -++ else -++ ath79_ddr_clk.rate = cpu_pll / (postdiv + 1); -++ -++ postdiv = (clk_ctrl >> QCA953X_PLL_CLK_CTRL_AHB_POST_DIV_SHIFT) & -++ QCA953X_PLL_CLK_CTRL_AHB_POST_DIV_MASK; -++ -++ if (clk_ctrl & QCA953X_PLL_CLK_CTRL_AHB_PLL_BYPASS) -++ ath79_ahb_clk.rate = ath79_ref_clk.rate; -++ else if (clk_ctrl & QCA953X_PLL_CLK_CTRL_AHBCLK_FROM_DDRPLL) -++ ath79_ahb_clk.rate = ddr_pll / (postdiv + 1); -++ else -++ ath79_ahb_clk.rate = cpu_pll / (postdiv + 1); -++ -++ ath79_wdt_clk.rate = ath79_ref_clk.rate; -++ ath79_uart_clk.rate = ath79_ref_clk.rate; -++} -++ -+ static void __init qca955x_clocks_init(void) -+ { -+ u32 pll, out_div, ref_div, nint, frac, clk_ctrl, postdiv; -+@@ -383,6 +459,8 @@ void __init ath79_clocks_init(void) -+ ar933x_clocks_init(); -+ else if (soc_is_ar934x()) -+ ar934x_clocks_init(); -++ else if (soc_is_qca953x()) -++ qca953x_clocks_init(); -+ else if (soc_is_qca955x()) -+ qca955x_clocks_init(); -+ else -+--- a/arch/mips/ath79/common.c -++++ b/arch/mips/ath79/common.c -+@@ -74,6 +74,8 @@ void ath79_device_reset_set(u32 mask) -+ else if (soc_is_ar934x() || -+ soc_is_qca955x()) -+ reg = AR934X_RESET_REG_RESET_MODULE; -++ else if (soc_is_qca953x()) -++ reg = QCA953X_RESET_REG_RESET_MODULE; -+ else -+ BUG(); -+ -+@@ -101,6 +103,8 @@ void ath79_device_reset_clear(u32 mask) -+ else if (soc_is_ar934x() || -+ soc_is_qca955x()) -+ reg = AR934X_RESET_REG_RESET_MODULE; -++ else if (soc_is_qca953x()) -++ reg = QCA953X_RESET_REG_RESET_MODULE; -+ else -+ BUG(); -+ -+--- a/arch/mips/ath79/dev-common.c -++++ b/arch/mips/ath79/dev-common.c -+@@ -100,6 +100,7 @@ void __init ath79_register_uart(void) -+ soc_is_ar724x() || -+ soc_is_ar913x() || -+ soc_is_ar934x() || -++ soc_is_qca953x() || -+ soc_is_qca955x()) { -+ ath79_uart_data[0].uartclk = clk_get_rate(clk); -+ platform_device_register(&ath79_uart_device); -+--- a/arch/mips/ath79/dev-wmac.c -++++ b/arch/mips/ath79/dev-wmac.c -+@@ -99,7 +99,7 @@ static int ar933x_wmac_reset(void) -+ return -ETIMEDOUT; -+ } -+ -+-static int ar933x_r1_get_wmac_revision(void) -++static int ar93xx_get_soc_revision(void) -+ { -+ return ath79_soc_rev; -+ } -+@@ -124,7 +124,7 @@ static void __init ar933x_wmac_setup(voi -+ ath79_wmac_data.is_clk_25mhz = true; -+ -+ if (ath79_soc_rev == 1) -+- ath79_wmac_data.get_mac_revision = ar933x_r1_get_wmac_revision; -++ ath79_wmac_data.get_mac_revision = ar93xx_get_soc_revision; -+ -+ ath79_wmac_data.external_reset = ar933x_wmac_reset; -+ } -+@@ -147,6 +147,26 @@ static void ar934x_wmac_setup(void) -+ ath79_wmac_data.is_clk_25mhz = true; -+ } -+ -++static void qca953x_wmac_setup(void) -++{ -++ u32 t; -++ -++ ath79_wmac_device.name = "qca953x_wmac"; -++ -++ ath79_wmac_resources[0].start = QCA953X_WMAC_BASE; -++ ath79_wmac_resources[0].end = QCA953X_WMAC_BASE + QCA953X_WMAC_SIZE - 1; -++ ath79_wmac_resources[1].start = ATH79_CPU_IRQ_IP2; -++ ath79_wmac_resources[1].end = ATH79_CPU_IRQ_IP2; -++ -++ t = ath79_reset_rr(QCA953X_RESET_REG_BOOTSTRAP); -++ if (t & QCA953X_BOOTSTRAP_REF_CLK_40) -++ ath79_wmac_data.is_clk_25mhz = false; -++ else -++ ath79_wmac_data.is_clk_25mhz = true; -++ -++ ath79_wmac_data.get_mac_revision = ar93xx_get_soc_revision; -++} -++ -+ static void qca955x_wmac_setup(void) -+ { -+ u32 t; -+@@ -314,6 +334,8 @@ void __init ath79_register_wmac(u8 *cal_ -+ ar933x_wmac_setup(); -+ else if (soc_is_ar934x()) -+ ar934x_wmac_setup(); -++ else if (soc_is_qca953x()) -++ qca953x_wmac_setup(); -+ else if (soc_is_qca955x()) -+ qca955x_wmac_setup(); -+ else -+--- a/arch/mips/ath79/early_printk.c -++++ b/arch/mips/ath79/early_printk.c -+@@ -114,6 +114,7 @@ static void prom_putchar_init(void) -+ case REV_ID_MAJOR_AR9341: -+ case REV_ID_MAJOR_AR9342: -+ case REV_ID_MAJOR_AR9344: -++ case REV_ID_MAJOR_QCA9533: -+ case REV_ID_MAJOR_QCA9558: -+ _prom_putchar = prom_putchar_ar71xx; -+ break; -+--- a/arch/mips/ath79/gpio.c -++++ b/arch/mips/ath79/gpio.c -+@@ -240,6 +240,8 @@ void __init ath79_gpio_init(void) -+ ath79_gpio_count = AR933X_GPIO_COUNT; -+ else if (soc_is_ar934x()) -+ ath79_gpio_count = AR934X_GPIO_COUNT; -++ else if (soc_is_qca953x()) -++ ath79_gpio_count = QCA953X_GPIO_COUNT; -+ else if (soc_is_qca955x()) -+ ath79_gpio_count = QCA955X_GPIO_COUNT; -+ else -+@@ -247,7 +249,7 @@ void __init ath79_gpio_init(void) -+ -+ ath79_gpio_base = ioremap_nocache(AR71XX_GPIO_BASE, AR71XX_GPIO_SIZE); -+ ath79_gpio_chip.ngpio = ath79_gpio_count; -+- if (soc_is_ar934x() || soc_is_qca955x()) { -++ if (soc_is_ar934x() || soc_is_qca953x() || soc_is_qca955x()) { -+ ath79_gpio_chip.direction_input = ar934x_gpio_direction_input; -+ ath79_gpio_chip.direction_output = ar934x_gpio_direction_output; -+ } -+--- a/arch/mips/ath79/irq.c -++++ b/arch/mips/ath79/irq.c -+@@ -106,6 +106,7 @@ static void __init ath79_misc_irq_init(v -+ else if (soc_is_ar724x() || -+ soc_is_ar933x() || -+ soc_is_ar934x() || -++ soc_is_qca953x() || -+ soc_is_qca955x()) -+ ath79_misc_irq_chip.irq_ack = ar724x_misc_irq_ack; -+ else -+@@ -352,6 +353,9 @@ void __init arch_init_irq(void) -+ } else if (soc_is_ar934x()) { -+ ath79_ip2_handler = ath79_default_ip2_handler; -+ ath79_ip3_handler = ar934x_ip3_handler; -++ } else if (soc_is_qca953x()) { -++ ath79_ip2_handler = ath79_default_ip2_handler; -++ ath79_ip3_handler = ath79_default_ip3_handler; -+ } else if (soc_is_qca955x()) { -+ ath79_ip2_handler = ath79_default_ip2_handler; -+ ath79_ip3_handler = ath79_default_ip3_handler; -+--- a/arch/mips/ath79/setup.c -++++ b/arch/mips/ath79/setup.c -+@@ -164,6 +164,12 @@ static void __init ath79_detect_sys_type -+ rev = id & AR934X_REV_ID_REVISION_MASK; -+ break; -+ -++ case REV_ID_MAJOR_QCA9533: -++ ath79_soc = ATH79_SOC_QCA9533; -++ chip = "9533"; -++ rev = id & AR944X_REV_ID_REVISION_MASK; -++ break; -++ -+ case REV_ID_MAJOR_QCA9558: -+ ath79_soc = ATH79_SOC_QCA9558; -+ chip = "9558"; -+@@ -176,7 +182,7 @@ static void __init ath79_detect_sys_type -+ -+ ath79_soc_rev = rev; -+ -+- if (soc_is_qca955x()) -++ if (soc_is_qca953x() || soc_is_qca955x()) -+ sprintf(ath79_sys_type, "Qualcomm Atheros QCA%s rev %u", -+ chip, rev); -+ else -+--- a/arch/mips/include/asm/mach-ath79/ar71xx_regs.h -++++ b/arch/mips/include/asm/mach-ath79/ar71xx_regs.h -+@@ -106,6 +106,9 @@ -+ #define AR934X_NFC_BASE 0x1b000200 -+ #define AR934X_NFC_SIZE 0xb8 -+ -++#define QCA953X_WMAC_BASE (AR71XX_APB_BASE + 0x00100000) -++#define QCA953X_WMAC_SIZE 0x20000 -++ -+ #define QCA955X_PCI_MEM_BASE0 0x10000000 -+ #define QCA955X_PCI_MEM_BASE1 0x12000000 -+ #define QCA955X_PCI_MEM_SIZE 0x02000000 -+@@ -280,6 +283,43 @@ -+ -+ #define AR934X_PLL_SWITCH_CLOCK_CONTROL_MDIO_CLK_SEL BIT(6) -+ -++#define QCA953X_PLL_CPU_CONFIG_REG 0x00 -++#define QCA953X_PLL_DDR_CONFIG_REG 0x04 -++#define QCA953X_PLL_CLK_CTRL_REG 0x08 -++#define QCA953X_PLL_ETH_XMII_CONTROL_REG 0x2c -++#define QCA953X_PLL_ETH_SGMII_CONTROL_REG 0x48 -++ -++#define QCA953X_PLL_CPU_CONFIG_NFRAC_SHIFT 0 -++#define QCA953X_PLL_CPU_CONFIG_NFRAC_MASK 0x3f -++#define QCA953X_PLL_CPU_CONFIG_NINT_SHIFT 6 -++#define QCA953X_PLL_CPU_CONFIG_NINT_MASK 0x3f -++#define QCA953X_PLL_CPU_CONFIG_REFDIV_SHIFT 12 -++#define QCA953X_PLL_CPU_CONFIG_REFDIV_MASK 0x1f -++#define QCA953X_PLL_CPU_CONFIG_OUTDIV_SHIFT 19 -++#define QCA953X_PLL_CPU_CONFIG_OUTDIV_MASK 0x3 -++ -++#define QCA953X_PLL_DDR_CONFIG_NFRAC_SHIFT 0 -++#define QCA953X_PLL_DDR_CONFIG_NFRAC_MASK 0x3ff -++#define QCA953X_PLL_DDR_CONFIG_NINT_SHIFT 10 -++#define QCA953X_PLL_DDR_CONFIG_NINT_MASK 0x3f -++#define QCA953X_PLL_DDR_CONFIG_REFDIV_SHIFT 16 -++#define QCA953X_PLL_DDR_CONFIG_REFDIV_MASK 0x1f -++#define QCA953X_PLL_DDR_CONFIG_OUTDIV_SHIFT 23 -++#define QCA953X_PLL_DDR_CONFIG_OUTDIV_MASK 0x7 -++ -++#define QCA953X_PLL_CLK_CTRL_CPU_PLL_BYPASS BIT(2) -++#define QCA953X_PLL_CLK_CTRL_DDR_PLL_BYPASS BIT(3) -++#define QCA953X_PLL_CLK_CTRL_AHB_PLL_BYPASS BIT(4) -++#define QCA953X_PLL_CLK_CTRL_CPU_POST_DIV_SHIFT 5 -++#define QCA953X_PLL_CLK_CTRL_CPU_POST_DIV_MASK 0x1f -++#define QCA953X_PLL_CLK_CTRL_DDR_POST_DIV_SHIFT 10 -++#define QCA953X_PLL_CLK_CTRL_DDR_POST_DIV_MASK 0x1f -++#define QCA953X_PLL_CLK_CTRL_AHB_POST_DIV_SHIFT 15 -++#define QCA953X_PLL_CLK_CTRL_AHB_POST_DIV_MASK 0x1f -++#define QCA953X_PLL_CLK_CTRL_CPUCLK_FROM_CPUPLL BIT(20) -++#define QCA953X_PLL_CLK_CTRL_DDRCLK_FROM_DDRPLL BIT(21) -++#define QCA953X_PLL_CLK_CTRL_AHBCLK_FROM_DDRPLL BIT(24) -++ -+ #define QCA955X_PLL_CPU_CONFIG_REG 0x00 -+ #define QCA955X_PLL_DDR_CONFIG_REG 0x04 -+ #define QCA955X_PLL_CLK_CTRL_REG 0x08 -+@@ -354,6 +394,10 @@ -+ #define AR934X_RESET_REG_BOOTSTRAP 0xb0 -+ #define AR934X_RESET_REG_PCIE_WMAC_INT_STATUS 0xac -+ -++#define QCA953X_RESET_REG_RESET_MODULE 0x1c -++#define QCA953X_RESET_REG_BOOTSTRAP 0xb0 -++#define QCA953X_RESET_REG_EXT_INT_STATUS 0xac -++ -+ #define QCA955X_RESET_REG_BOOTSTRAP 0xb0 -+ #define QCA955X_RESET_REG_EXT_INT_STATUS 0xac -+ -+@@ -468,6 +512,8 @@ -+ #define AR934X_BOOTSTRAP_SDRAM_DISABLED BIT(1) -+ #define AR934X_BOOTSTRAP_DDR1 BIT(0) -+ -++#define QCA953X_BOOTSTRAP_REF_CLK_40 BIT(4) -++ -+ #define QCA955X_BOOTSTRAP_REF_CLK_40 BIT(4) -+ -+ #define AR934X_PCIE_WMAC_INT_WMAC_MISC BIT(0) -+@@ -530,6 +576,7 @@ -+ #define REV_ID_MAJOR_AR9341 0x0120 -+ #define REV_ID_MAJOR_AR9342 0x1120 -+ #define REV_ID_MAJOR_AR9344 0x2120 -++#define REV_ID_MAJOR_QCA9533 0x0140 -+ #define REV_ID_MAJOR_QCA9558 0x1130 -+ -+ #define AR71XX_REV_ID_MINOR_MASK 0x3 -+@@ -603,6 +650,7 @@ -+ #define AR913X_GPIO_COUNT 22 -+ #define AR933X_GPIO_COUNT 30 -+ #define AR934X_GPIO_COUNT 23 -++#define QCA953X_GPIO_COUNT 24 /* (?) */ -+ #define QCA955X_GPIO_COUNT 24 -+ -+ /* -+--- a/arch/mips/include/asm/mach-ath79/ath79.h -++++ b/arch/mips/include/asm/mach-ath79/ath79.h -+@@ -32,6 +32,7 @@ enum ath79_soc_type { -+ ATH79_SOC_AR9341, -+ ATH79_SOC_AR9342, -+ ATH79_SOC_AR9344, -++ ATH79_SOC_QCA9533, -+ ATH79_SOC_QCA9558, -+ }; -+ -+@@ -99,6 +100,16 @@ static inline int soc_is_ar934x(void) -+ return soc_is_ar9341() || soc_is_ar9342() || soc_is_ar9344(); -+ } -+ -++static inline int soc_is_qca9533(void) -++{ -++ return ath79_soc == ATH79_SOC_QCA9533; -++} -++ -++static inline int soc_is_qca953x(void) -++{ -++ return soc_is_qca9533(); -++} -++ -+ static inline int soc_is_qca9558(void) -+ { -+ return ath79_soc == ATH79_SOC_QCA9558; diff --git a/patches/openwrt/0019-ar71xx-add-support-for-the-TP-LINK-TL-WR841N-ND-v9.patch b/patches/openwrt/0019-ar71xx-add-support-for-the-TP-LINK-TL-WR841N-ND-v9.patch deleted file mode 100644 index 721f206c..00000000 --- a/patches/openwrt/0019-ar71xx-add-support-for-the-TP-LINK-TL-WR841N-ND-v9.patch +++ /dev/null @@ -1,297 +0,0 @@ -From: Matthias Schiffer -Date: Sat, 29 Mar 2014 21:12:15 +0100 -Subject: ar71xx: add support for the TP-LINK TL-WR841N/ND v9 - -diff --git a/target/linux/ar71xx/base-files/etc/diag.sh b/target/linux/ar71xx/base-files/etc/diag.sh -index b206438..0bf2dd1 100755 ---- a/target/linux/ar71xx/base-files/etc/diag.sh -+++ b/target/linux/ar71xx/base-files/etc/diag.sh -@@ -144,6 +144,9 @@ get_status_led() { - tl-wr703n) - status_led="tp-link:blue:system" - ;; -+ tl-wr841n-v9) -+ status_led="tp-link:green:qss" -+ ;; - tl-wr2543n) - status_led="tp-link:green:wps" - ;; -diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/leds b/target/linux/ar71xx/base-files/etc/uci-defaults/leds -index 48b8154..43bc24d 100755 ---- a/target/linux/ar71xx/base-files/etc/uci-defaults/leds -+++ b/target/linux/ar71xx/base-files/etc/uci-defaults/leds -@@ -163,6 +163,15 @@ tl-wr841n-v8) - ucidef_set_led_wlan "wlan" "WLAN" "tp-link:green:wlan" "phy0tpt" - ;; - -+tl-wr841n-v9) -+ ucidef_set_led_netdev "wan" "WAN" "tp-link:green:wan" "eth1" -+ ucidef_set_led_switch "lan1" "LAN1" "tp-link:green:lan1" "switch0" "0x10" -+ ucidef_set_led_switch "lan2" "LAN2" "tp-link:green:lan2" "switch0" "0x08" -+ ucidef_set_led_switch "lan3" "LAN3" "tp-link:green:lan3" "switch0" "0x04" -+ ucidef_set_led_switch "lan4" "LAN4" "tp-link:green:lan4" "switch0" "0x02" -+ ucidef_set_led_wlan "wlan" "WLAN" "tp-link:green:wlan" "phy0tpt" -+ ;; -+ - tl-wr941nd | \ - tl-wr1041n-v2) - ucidef_set_led_wlan "wlan" "WLAN" "tp-link:green:wlan" "phy0tpt" -diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/network b/target/linux/ar71xx/base-files/etc/uci-defaults/network -index a36036f..a1dfda0 100755 ---- a/target/linux/ar71xx/base-files/etc/uci-defaults/network -+++ b/target/linux/ar71xx/base-files/etc/uci-defaults/network -@@ -192,6 +192,7 @@ tl-wdr3500 |\ - tl-wr741nd |\ - tl-wr741nd-v4 |\ - tl-wr841n-v7 |\ -+tl-wr841n-v9 |\ - whr-g301n |\ - whr-hp-g300n |\ - whr-hp-gn |\ -diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh -index 8d71352..ca174da 100755 ---- a/target/linux/ar71xx/base-files/lib/ar71xx.sh -+++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh -@@ -381,6 +381,9 @@ ar71xx_board_detect() { - *"TL-WR841N/ND v8") - name="tl-wr841n-v8" - ;; -+ *"TL-WR841N/ND v9") -+ name="tl-wr841n-v9" -+ ;; - *TL-WR941ND) - name="tl-wr941nd" - ;; -diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh -index e52ad9e..7168b4e 100755 ---- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh -+++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh -@@ -163,6 +163,7 @@ platform_check_image() { - tl-wr841n-v1 | \ - tl-wr841n-v7 | \ - tl-wr841n-v8 | \ -+ tl-wr841n-v9 | \ - tl-wr941nd | \ - tl-wr1041n-v2 | \ - tl-wr1043nd | \ -diff --git a/target/linux/ar71xx/config-3.3 b/target/linux/ar71xx/config-3.3 -index 1c3ba3c..82d4d21 100644 ---- a/target/linux/ar71xx/config-3.3 -+++ b/target/linux/ar71xx/config-3.3 -@@ -70,6 +70,7 @@ CONFIG_ATH79_MACH_TL_WR741ND=y - CONFIG_ATH79_MACH_TL_WR741ND_V4=y - CONFIG_ATH79_MACH_TL_WR841N_V1=y - CONFIG_ATH79_MACH_TL_WR841N_V8=y -+CONFIG_ATH79_MACH_TL_WR841N_V9=y - CONFIG_ATH79_MACH_TL_WR941ND=y - CONFIG_ATH79_MACH_UBNT=y - CONFIG_ATH79_MACH_UBNT_XM=y -diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr841n-v9.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr841n-v9.c -new file mode 100644 -index 0000000..c28afc6 ---- /dev/null -+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr841n-v9.c -@@ -0,0 +1,138 @@ -+/* -+ * TP-LINK TL-WR841N/ND v9 -+ * -+ * Copyright (C) 2014 Matthias Schiffer -+ * -+ * 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 -+#include -+ -+#include -+#include -+ -+#include "common.h" -+#include "dev-eth.h" -+#include "dev-gpio-buttons.h" -+#include "dev-leds-gpio.h" -+#include "dev-m25p80.h" -+#include "dev-wmac.h" -+#include "machtypes.h" -+ -+#define TL_WR841NV9_GPIO_LED_WLAN 13 -+#define TL_WR841NV9_GPIO_LED_QSS 3 -+#define TL_WR841NV9_GPIO_LED_WAN 4 -+#define TL_WR841NV9_GPIO_LED_LAN1 16 -+#define TL_WR841NV9_GPIO_LED_LAN2 15 -+#define TL_WR841NV9_GPIO_LED_LAN3 14 -+#define TL_WR841NV9_GPIO_LED_LAN4 11 -+ -+#define TL_WR841NV9_GPIO_BTN_RESET 12 -+#define TL_WR841NV9_GPIO_BTN_WIFI 17 -+ -+#define TL_WR841NV9_KEYS_POLL_INTERVAL 20 /* msecs */ -+#define TL_WR841NV9_KEYS_DEBOUNCE_INTERVAL (3 * TL_WR841NV9_KEYS_POLL_INTERVAL) -+ -+static const char *tl_wr841n_v9_part_probes[] = { -+ "tp-link", -+ NULL, -+}; -+ -+static struct flash_platform_data tl_wr841n_v9_flash_data = { -+ .part_probes = tl_wr841n_v9_part_probes, -+}; -+ -+static struct gpio_led tl_wr841n_v9_leds_gpio[] __initdata = { -+ { -+ .name = "tp-link:green:lan1", -+ .gpio = TL_WR841NV9_GPIO_LED_LAN1, -+ .active_low = 1, -+ }, { -+ .name = "tp-link:green:lan2", -+ .gpio = TL_WR841NV9_GPIO_LED_LAN2, -+ .active_low = 1, -+ }, { -+ .name = "tp-link:green:lan3", -+ .gpio = TL_WR841NV9_GPIO_LED_LAN3, -+ .active_low = 1, -+ }, { -+ .name = "tp-link:green:lan4", -+ .gpio = TL_WR841NV9_GPIO_LED_LAN4, -+ .active_low = 1, -+ }, { -+ .name = "tp-link:green:qss", -+ .gpio = TL_WR841NV9_GPIO_LED_QSS, -+ .active_low = 1, -+ }, { -+ .name = "tp-link:green:wan", -+ .gpio = TL_WR841NV9_GPIO_LED_WAN, -+ .active_low = 1, -+ }, { -+ .name = "tp-link:green:wlan", -+ .gpio = TL_WR841NV9_GPIO_LED_WLAN, -+ .active_low = 1, -+ }, -+}; -+ -+static struct gpio_keys_button tl_wr841n_v9_gpio_keys[] __initdata = { -+ { -+ .desc = "Reset button", -+ .type = EV_KEY, -+ .code = KEY_RESTART, -+ .debounce_interval = TL_WR841NV9_KEYS_DEBOUNCE_INTERVAL, -+ .gpio = TL_WR841NV9_GPIO_BTN_RESET, -+ .active_low = 1, -+ }, { -+ .desc = "WIFI button", -+ .type = EV_KEY, -+ .code = KEY_RFKILL, -+ .debounce_interval = TL_WR841NV9_KEYS_DEBOUNCE_INTERVAL, -+ .gpio = TL_WR841NV9_GPIO_BTN_WIFI, -+ .active_low = 1, -+ } -+}; -+ -+ -+static void __init tl_ap143_setup(void) -+{ -+ u8 *mac = (u8 *) KSEG1ADDR(0x1f01fc00); -+ u8 *ee = (u8 *) KSEG1ADDR(0x1fff1000); -+ u8 tmpmac[ETH_ALEN]; -+ -+ ath79_register_m25p80(&tl_wr841n_v9_flash_data); -+ -+ ath79_setup_ar933x_phy4_switch(false, false); -+ -+ ath79_register_mdio(0, 0x0); -+ -+ /* LAN */ -+ ath79_init_mac(ath79_eth1_data.mac_addr, mac, 0); -+ ath79_register_eth(1); -+ -+ /* WAN */ -+ ath79_switch_data.phy4_mii_en = 1; -+ ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_MII; -+ ath79_init_mac(ath79_eth0_data.mac_addr, mac, 1); -+ ath79_register_eth(0); -+ -+ ath79_init_mac(tmpmac, mac, 0); -+ ath79_register_wmac(ee, tmpmac); -+} -+ -+static void __init tl_wr841n_v9_setup(void) -+{ -+ tl_ap143_setup(); -+ -+ ath79_register_leds_gpio(-1, ARRAY_SIZE(tl_wr841n_v9_leds_gpio), -+ tl_wr841n_v9_leds_gpio); -+ -+ ath79_register_gpio_keys_polled(1, TL_WR841NV9_KEYS_POLL_INTERVAL, -+ ARRAY_SIZE(tl_wr841n_v9_gpio_keys), -+ tl_wr841n_v9_gpio_keys); -+} -+ -+MIPS_MACHINE(ATH79_MACH_TL_WR841N_V9, "TL-WR841N-v9", "TP-LINK TL-WR841N/ND v9", -+ tl_wr841n_v9_setup); -diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile -index 01d1e67..c270f73 100644 ---- a/target/linux/ar71xx/image/Makefile -+++ b/target/linux/ar71xx/image/Makefile -@@ -879,6 +879,7 @@ $(eval $(call SingleProfile,TPLINK-LZMA,$(fs_64kraw),TLWR703,tl-wr703n-v1,TL-WR7 - $(eval $(call SingleProfile,TPLINK-LZMA,$(fs_64kraw),TLWR740NV4,tl-wr740n-v4,TL-WR741ND-v4,ttyATH0,115200,0x07400004,1,4Mlzma)) - $(eval $(call SingleProfile,TPLINK-LZMA,$(fs_64kraw),TLWR741NV4,tl-wr741nd-v4,TL-WR741ND-v4,ttyATH0,115200,0x07410004,1,4Mlzma)) - $(eval $(call SingleProfile,TPLINK-LZMA,$(fs_64kraw),TLWR841NV8,tl-wr841n-v8,TL-WR841N-v8,ttyS0,115200,0x08410008,1,4Mlzma)) -+$(eval $(call SingleProfile,TPLINK-LZMA,$(fs_64kraw),TLWR841NV9,tl-wr841n-v9,TL-WR841N-v9,ttyS0,115200,0x08410009,1,4Mlzma)) - $(eval $(call SingleProfile,TPLINK-LZMA,$(fs_64kraw),TLWR1041,tl-wr1041n-v2,TL-WR1041N-v2,ttyS0,115200,0x10410002,1,4Mlzma)) - $(eval $(call SingleProfile,TPLINK-LZMA,$(fs_64kraw),TLWR2543,tl-wr2543-v1,TL-WR2543N,ttyS0,115200,0x25430001,1,8Mlzma,-v 3.13.99)) - $(eval $(call SingleProfile,TPLINK-LZMA,$(fs_64kraw),TLWDR3500V1,tl-wdr3500-v1,TL-WDR3500,ttyS0,115200,0x35000001,1,8Mlzma)) -@@ -924,7 +925,7 @@ $(eval $(call MultiProfile,TLWA901,TLWA901NV1 TLWA901NV2)) - $(eval $(call MultiProfile,TLWA7510,TLWA7510NV1)) - $(eval $(call MultiProfile,TLWR740,TLWR740NV1 TLWR740NV3 TLWR740NV4)) - $(eval $(call MultiProfile,TLWR741,TLWR741NV1 TLWR741NV2 TLWR741NV4)) --$(eval $(call MultiProfile,TLWR841,TLWR841NV15 TLWR841NV3 TLWR841NV5 TLWR841NV7 TLWR841NV8)) -+$(eval $(call MultiProfile,TLWR841,TLWR841NV15 TLWR841NV3 TLWR841NV5 TLWR841NV7 TLWR841NV8 TLWR841NV9)) - $(eval $(call MultiProfile,TLWR941,TLWR941NV2 TLWR941NV3 TLWR941NV4)) - $(eval $(call MultiProfile,TLWDR4300,TLWDR3500V1 TLWDR3600V1 TLWDR4300V1 TLWDR4310V1)) - $(eval $(call MultiProfile,UBNT,UBNTAIRROUTER UBNTRS UBNTRSPRO UBNTLSSR71 UBNTBULLETM UBNTROCKETM UBNTNANOM UBNTUNIFI UBNTUNIFIOUTDOOR)) -diff --git a/target/linux/ar71xx/patches-3.3/708-MIPS-ath79-TL-WR841v9-support.patch b/target/linux/ar71xx/patches-3.3/708-MIPS-ath79-TL-WR841v9-support.patch -new file mode 100644 -index 0000000..37425a6 ---- /dev/null -+++ b/target/linux/ar71xx/patches-3.3/708-MIPS-ath79-TL-WR841v9-support.patch -@@ -0,0 +1,38 @@ -+--- a/arch/mips/ath79/Kconfig -++++ b/arch/mips/ath79/Kconfig -+@@ -547,6 +547,15 @@ config ATH79_MACH_TL_WR841N_V8 -+ select ATH79_DEV_M25P80 -+ select ATH79_DEV_WMAC -+ -++config ATH79_MACH_TL_WR841N_V9 -++ bool "TP-LINK TL-WR841N/ND v9 support" -++ select SOC_QCA953X -++ select ATH79_DEV_ETH -++ select ATH79_DEV_GPIO_BUTTONS -++ select ATH79_DEV_LEDS_GPIO -++ select ATH79_DEV_M25P80 -++ select ATH79_DEV_WMAC -++ -+ config ATH79_MACH_TL_WR941ND -+ bool "TP-LINK TL-WR941ND support" -+ select SOC_AR913X -+--- a/arch/mips/ath79/Makefile -++++ b/arch/mips/ath79/Makefile -+@@ -85,6 +85,7 @@ obj-$(CONFIG_ATH79_MACH_TL_WR741ND) += m -+ obj-$(CONFIG_ATH79_MACH_TL_WR741ND_V4) += mach-tl-wr741nd-v4.o -+ obj-$(CONFIG_ATH79_MACH_TL_WR841N_V1) += mach-tl-wr841n.o -+ obj-$(CONFIG_ATH79_MACH_TL_WR841N_V8) += mach-tl-wr841n-v8.o -++obj-$(CONFIG_ATH79_MACH_TL_WR841N_V9) += mach-tl-wr841n-v9.o -+ obj-$(CONFIG_ATH79_MACH_TL_WR941ND) += mach-tl-wr941nd.o -+ obj-$(CONFIG_ATH79_MACH_TL_WR1041N_V2) += mach-tl-wr1041n-v2.o -+ obj-$(CONFIG_ATH79_MACH_TL_WR1043ND) += mach-tl-wr1043nd.o -+--- a/arch/mips/ath79/machtypes.h -++++ b/arch/mips/ath79/machtypes.h -+@@ -90,6 +90,7 @@ enum ath79_mach_type { -+ ATH79_MACH_TL_WR841N_V1, /* TP-LINK TL-WR841N v1 */ -+ ATH79_MACH_TL_WR841N_V7, /* TP-LINK TL-WR841N/ND v7 */ -+ ATH79_MACH_TL_WR841N_V8, /* TP-LINK TL-WR841N/ND v8 */ -++ ATH79_MACH_TL_WR841N_V9, /* TP-LINK TL-WR841N/ND v9 */ -+ ATH79_MACH_TL_WR941ND, /* TP-LINK TL-WR941ND */ -+ ATH79_MACH_UBNT_AIRROUTER, /* Ubiquiti AirRouter */ -+ ATH79_MACH_UBNT_BULLET_M, /* Ubiquiti Bullet M */ diff --git a/patches/openwrt/0020-Backport-support-for-TL-WR842N-v2-and-TL-MR3420-v2.patch b/patches/openwrt/0020-Backport-support-for-TL-WR842N-v2-and-TL-MR3420-v2.patch deleted file mode 100644 index ff50ae72..00000000 --- a/patches/openwrt/0020-Backport-support-for-TL-WR842N-v2-and-TL-MR3420-v2.patch +++ /dev/null @@ -1,427 +0,0 @@ -From: Matthias Schiffer -Date: Thu, 1 May 2014 02:26:02 +0200 -Subject: Backport support for TL-WR842N v2 and TL-MR3420 v2 - -diff --git a/target/linux/ar71xx/base-files/etc/diag.sh b/target/linux/ar71xx/base-files/etc/diag.sh -index 0bf2dd1..0d01119 100755 ---- a/target/linux/ar71xx/base-files/etc/diag.sh -+++ b/target/linux/ar71xx/base-files/etc/diag.sh -@@ -127,6 +127,7 @@ get_status_led() { - ;; - tl-mr3220 | \ - tl-mr3420 | \ -+ tl-mr3420-v2 | \ - tl-wa901nd | \ - tl-wa901nd-v2 | \ - tl-wdr3500 | \ -@@ -137,6 +138,7 @@ get_status_led() { - tl-wr841n-v1 | \ - tl-wr841n-v7 | \ - tl-wr841n-v8 | \ -+ tl-wr842n-v2 | \ - tl-wr941nd) - status_led="tp-link:green:system" - ;; -diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/leds b/target/linux/ar71xx/base-files/etc/uci-defaults/leds -index 43bc24d..f1ac9ec 100755 ---- a/target/linux/ar71xx/base-files/etc/uci-defaults/leds -+++ b/target/linux/ar71xx/base-files/etc/uci-defaults/leds -@@ -118,6 +118,16 @@ tl-mr3420 ) - ucidef_set_led_usbdev "usb" "USB" "tp-link:green:3g" "1-1" - ;; - -+tl-mr3420-v2) -+ ucidef_set_led_netdev "wan" "WAN" "tp-link:green:wan" "eth0" -+ ucidef_set_led_switch "lan1" "LAN1" "tp-link:green:lan1" "switch0" "0x04" -+ ucidef_set_led_switch "lan2" "LAN2" "tp-link:green:lan2" "switch0" "0x08" -+ ucidef_set_led_switch "lan3" "LAN3" "tp-link:green:lan3" "switch0" "0x10" -+ ucidef_set_led_switch "lan4" "LAN4" "tp-link:green:lan4" "switch0" "0x02" -+ ucidef_set_led_wlan "wlan" "WLAN" "tp-link:green:wlan" "phy0tpt" -+ ucidef_set_led_usbdev "usb" "USB" "tp-link:green:3g" "1-1" -+ ;; -+ - tl-wa901nd) - ucidef_set_led_netdev "lan" "LAN" "tp-link:green:lan" "eth0" - ;; -@@ -172,6 +182,16 @@ tl-wr841n-v9) - ucidef_set_led_wlan "wlan" "WLAN" "tp-link:green:wlan" "phy0tpt" - ;; - -+tl-wr842n-v2) -+ ucidef_set_led_netdev "wan" "WAN" "tp-link:green:wan" "eth0" -+ ucidef_set_led_switch "lan1" "LAN1" "tp-link:green:lan1" "switch0" "0x04" -+ ucidef_set_led_switch "lan2" "LAN2" "tp-link:green:lan2" "switch0" "0x08" -+ ucidef_set_led_switch "lan3" "LAN3" "tp-link:green:lan3" "switch0" "0x10" -+ ucidef_set_led_switch "lan4" "LAN4" "tp-link:green:lan4" "switch0" "0x02" -+ ucidef_set_led_wlan "wlan" "WLAN" "tp-link:green:wlan" "phy0tpt" -+ ucidef_set_led_usbdev "usb" "USB" "tp-link:green:3g" "1-1" -+ ;; -+ - tl-wr941nd | \ - tl-wr1041n-v2) - ucidef_set_led_wlan "wlan" "WLAN" "tp-link:green:wlan" "phy0tpt" -diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/network b/target/linux/ar71xx/base-files/etc/uci-defaults/network -index a1dfda0..e38a9b8 100755 ---- a/target/linux/ar71xx/base-files/etc/uci-defaults/network -+++ b/target/linux/ar71xx/base-files/etc/uci-defaults/network -@@ -128,7 +128,9 @@ tl-wr941nd) - ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4" "wan" - ;; - --tl-wr841n-v8) -+tl-mr3420-v2 |\ -+tl-wr841n-v8 |\ -+tl-wr842n-v2) - ucidef_set_interfaces_lan_wan "eth1" "eth0" - ucidef_add_switch "switch0" "1" "1" - ucidef_add_switch_vlan "switch0" "1" "0 1 2 3 4" -diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh -index ca174da..11aa31b 100755 ---- a/target/linux/ar71xx/base-files/lib/ar71xx.sh -+++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh -@@ -351,6 +351,9 @@ ar71xx_board_detect() { - *TL-MR3420) - name="tl-mr3420" - ;; -+ *"TL-MR3420 v2") -+ name="tl-mr3420-v2" -+ ;; - *TL-WA7510N) - name="tl-wa7510n" - ;; -@@ -384,6 +387,9 @@ ar71xx_board_detect() { - *"TL-WR841N/ND v9") - name="tl-wr841n-v9" - ;; -+ *"TL-WR842N/ND v2") -+ name="tl-wr842n-v2" -+ ;; - *TL-WR941ND) - name="tl-wr941nd" - ;; -diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh -index 7168b4e..b25df6c 100755 ---- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh -+++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh -@@ -152,6 +152,7 @@ platform_check_image() { - tl-mr3040 | \ - tl-mr3220 | \ - tl-mr3420 | \ -+ tl-mr3420-v2 | \ - tl-wa7510n | \ - tl-wa901nd | \ - tl-wa901nd-v2 | \ -@@ -164,6 +165,7 @@ platform_check_image() { - tl-wr841n-v7 | \ - tl-wr841n-v8 | \ - tl-wr841n-v9 | \ -+ tl-wr842n-v2 | \ - tl-wr941nd | \ - tl-wr1041n-v2 | \ - tl-wr1043nd | \ -diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr841n-v8.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr841n-v8.c -index ffaf8d1..0099b15 100644 ---- a/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr841n-v8.c -+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr841n-v8.c -@@ -1,5 +1,5 @@ - /* -- * TP-LINK TL-WR841N/ND v8 board support -+ * TP-LINK TL-WR841N/ND v8/TL-MR3420 v2 board support - * - * Copyright (C) 2012 Gabor Juhos - * -@@ -8,6 +8,7 @@ - * by the Free Software Foundation. - */ - -+#include - #include - - #include -@@ -18,6 +19,7 @@ - #include "dev-gpio-buttons.h" - #include "dev-leds-gpio.h" - #include "dev-m25p80.h" -+#include "dev-usb.h" - #include "dev-wmac.h" - #include "machtypes.h" - -@@ -31,7 +33,10 @@ - #define TL_WR841NV8_GPIO_LED_SYSTEM 14 - - #define TL_WR841NV8_GPIO_BTN_RESET 17 --#define TL_WR841NV8_GPIO_SW_RFKILL 16 -+#define TL_WR841NV8_GPIO_SW_RFKILL 16 /* WPS for MR3420 v2 */ -+ -+#define TL_MR3420V2_GPIO_LED_3G 11 -+#define TL_MR3420V2_GPIO_USB_POWER 4 - - #define TL_WR841NV8_KEYS_POLL_INTERVAL 20 /* msecs */ - #define TL_WR841NV8_KEYS_DEBOUNCE_INTERVAL (3 * TL_WR841NV8_KEYS_POLL_INTERVAL) -@@ -78,6 +83,11 @@ static struct gpio_led tl_wr841n_v8_leds_gpio[] __initdata = { - .name = "tp-link:green:wlan", - .gpio = TL_WR841NV8_GPIO_LED_WLAN, - .active_low = 1, -+ }, { -+ /* the 3G LED is only present on the MR3420 v2 */ -+ .name = "tp-link:green:3g", -+ .gpio = TL_MR3420V2_GPIO_LED_3G, -+ .active_low = 1, - }, - }; - -@@ -99,17 +109,37 @@ static struct gpio_keys_button tl_wr841n_v8_gpio_keys[] __initdata = { - } - }; - --static void __init tl_wr841n_v8_setup(void) -+static struct gpio_keys_button tl_mr3420v2_gpio_keys[] __initdata = { -+ { -+ .desc = "Reset button", -+ .type = EV_KEY, -+ .code = KEY_RESTART, -+ .debounce_interval = TL_WR841NV8_KEYS_DEBOUNCE_INTERVAL, -+ .gpio = TL_WR841NV8_GPIO_BTN_RESET, -+ .active_low = 1, -+ }, { -+ .desc = "WPS", -+ .type = EV_KEY, -+ .code = KEY_WPS_BUTTON, -+ .debounce_interval = TL_WR841NV8_KEYS_DEBOUNCE_INTERVAL, -+ .gpio = TL_WR841NV8_GPIO_SW_RFKILL, -+ .active_low = 0, -+ } -+}; -+ -+static void __init tl_ap123_setup(void) - { - u8 *mac = (u8 *) KSEG1ADDR(0x1f01fc00); - u8 *ee = (u8 *) KSEG1ADDR(0x1fff1000); - -- ath79_register_leds_gpio(-1, ARRAY_SIZE(tl_wr841n_v8_leds_gpio), -- tl_wr841n_v8_leds_gpio); -+ /* Disable JTAG, enabling GPIOs 0-3 */ -+ /* Configure OBS4 line, for GPIO 4*/ -+ ath79_gpio_function_setup(AR934X_GPIO_FUNC_JTAG_DISABLE, -+ AR934X_GPIO_FUNC_CLK_OBS4_EN); - -- ath79_register_gpio_keys_polled(1, TL_WR841NV8_KEYS_POLL_INTERVAL, -- ARRAY_SIZE(tl_wr841n_v8_gpio_keys), -- tl_wr841n_v8_gpio_keys); -+ /* config gpio4 as normal gpio function */ -+ ath79_gpio_output_select(TL_MR3420V2_GPIO_USB_POWER, -+ AR934X_GPIO_OUT_GPIO); - - ath79_register_m25p80(&tl_wr841n_v8_flash_data); - -@@ -135,5 +165,61 @@ static void __init tl_wr841n_v8_setup(void) - ath79_register_wmac(ee, mac); - } - -+static void __init tl_wr841n_v8_setup(void) -+{ -+ tl_ap123_setup(); -+ -+ ath79_register_leds_gpio(-1, ARRAY_SIZE(tl_wr841n_v8_leds_gpio) - 1, -+ tl_wr841n_v8_leds_gpio); -+ -+ ath79_register_gpio_keys_polled(1, TL_WR841NV8_KEYS_POLL_INTERVAL, -+ ARRAY_SIZE(tl_wr841n_v8_gpio_keys), -+ tl_wr841n_v8_gpio_keys); -+} -+ - MIPS_MACHINE(ATH79_MACH_TL_WR841N_V8, "TL-WR841N-v8", "TP-LINK TL-WR841N/ND v8", - tl_wr841n_v8_setup); -+ -+ -+static void __init tl_wr842n_v2_setup(void) -+{ -+ tl_ap123_setup(); -+ -+ ath79_register_leds_gpio(-1, ARRAY_SIZE(tl_wr841n_v8_leds_gpio), -+ tl_wr841n_v8_leds_gpio); -+ -+ ath79_register_gpio_keys_polled(1, TL_WR841NV8_KEYS_POLL_INTERVAL, -+ ARRAY_SIZE(tl_wr841n_v8_gpio_keys), -+ tl_wr841n_v8_gpio_keys); -+ -+ gpio_request_one(TL_MR3420V2_GPIO_USB_POWER, -+ GPIOF_OUT_INIT_HIGH | GPIOF_EXPORT_DIR_FIXED, -+ "USB power"); -+ -+ ath79_register_usb(); -+} -+ -+MIPS_MACHINE(ATH79_MACH_TL_WR842N_V2, "TL-WR842N-v2", "TP-LINK TL-WR842N/ND v2", -+ tl_wr842n_v2_setup); -+ -+static void __init tl_mr3420v2_setup(void) -+{ -+ tl_ap123_setup(); -+ -+ ath79_register_leds_gpio(-1, ARRAY_SIZE(tl_wr841n_v8_leds_gpio), -+ tl_wr841n_v8_leds_gpio); -+ -+ ath79_register_gpio_keys_polled(1, TL_WR841NV8_KEYS_POLL_INTERVAL, -+ ARRAY_SIZE(tl_mr3420v2_gpio_keys), -+ tl_mr3420v2_gpio_keys); -+ -+ /* enable power for the USB port */ -+ gpio_request_one(TL_MR3420V2_GPIO_USB_POWER, -+ GPIOF_OUT_INIT_HIGH | GPIOF_EXPORT_DIR_FIXED, -+ "USB power"); -+ -+ ath79_register_usb(); -+} -+ -+MIPS_MACHINE(ATH79_MACH_TL_MR3420_V2, "TL-MR3420-v2", "TP-LINK TL-MR3420 v2", -+ tl_mr3420v2_setup); -diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile -index c270f73..a055521 100644 ---- a/target/linux/ar71xx/image/Makefile -+++ b/target/linux/ar71xx/image/Makefile -@@ -853,7 +853,7 @@ $(eval $(call SingleProfile,Planex,$(fs_64k),MZKW300NH,mzk-w300nh,MZK-W300NH,tty - $(eval $(call SingleProfile,TPLINKOLD,$(fs_squash),TLWR841NV15,tl-wr841nd-v1.5,TL-WR841N-v1.5,ttyS0,115200,0x08410002,2,4M)) - - $(eval $(call SingleProfile,TPLINK,$(fs_64kraw),TLMR3220,tl-mr3220-v1,TL-MR3220,ttyS0,115200,0x32200001,1,4M)) --$(eval $(call SingleProfile,TPLINK,$(fs_64kraw),TLMR3420,tl-mr3420-v1,TL-MR3420,ttyS0,115200,0x34200001,1,4M)) -+$(eval $(call SingleProfile,TPLINK,$(fs_64kraw),TLMR3420V1,tl-mr3420-v1,TL-MR3420,ttyS0,115200,0x34200001,1,4M)) - $(eval $(call SingleProfile,TPLINK,$(fs_64kraw),TLWA701,tl-wa701n-v1,TL-WA901ND,ttyS0,115200,0x07010001,1,4M)) - $(eval $(call SingleProfile,TPLINK,$(fs_64kraw),TLWA7510NV1,tl-wa7510n,TL-WA7510N,ttyS0,115200,0x75100001,1,4M)) - $(eval $(call SingleProfile,TPLINK,$(fs_64kraw),TLWA901NV1,tl-wa901nd-v1,TL-WA901ND,ttyS0,115200,0x09010001,1,4M)) -@@ -866,7 +866,7 @@ $(eval $(call SingleProfile,TPLINK,$(fs_64kraw),TLWR743,tl-wr743nd-v1,TL-WR741ND - $(eval $(call SingleProfile,TPLINK,$(fs_64kraw),TLWR841NV3,tl-wr841nd-v3,TL-WR941ND,ttyS0,115200,0x08410003,3,4M)) - $(eval $(call SingleProfile,TPLINK,$(fs_64kraw),TLWR841NV5,tl-wr841nd-v5,TL-WR741ND,ttyS0,115200,0x08410005,1,4M)) - $(eval $(call SingleProfile,TPLINK,$(fs_64kraw),TLWR841NV7,tl-wr841nd-v7,TL-WR841N-v7,ttyS0,115200,0x08410007,1,4M)) --$(eval $(call SingleProfile,TPLINK,$(fs_64kraw),TLWR842,tl-wr842n-v1,TL-MR3420,ttyS0,115200,0x08420001,1,8M)) -+$(eval $(call SingleProfile,TPLINK,$(fs_64kraw),TLWR842V1,tl-wr842n-v1,TL-MR3420,ttyS0,115200,0x08420001,1,8M)) - $(eval $(call SingleProfile,TPLINK,$(fs_64kraw),TLWR941NV2,tl-wr941nd-v2,TL-WR941ND,ttyS0,115200,0x09410002,2,4M)) - $(eval $(call SingleProfile,TPLINK,$(fs_64kraw),TLWR941NV3,tl-wr941nd-v3,TL-WR941ND,ttyS0,115200,0x09410002,2,4M)) - $(eval $(call SingleProfile,TPLINK,$(fs_64kraw),TLWR941NV4,tl-wr941nd-v4,TL-WR741ND,ttyS0,115200,0x09410004,1,4M)) -@@ -875,11 +875,13 @@ $(eval $(call SingleProfile,TPLINK,$(fs_64kraw),TLWR1043,tl-wr1043nd-v1,TL-WR104 - $(eval $(call SingleProfile,TPLINK-LZMA,$(fs_64kraw),TLMR11U,tl-mr11u-v1,TL-MR11U,ttyATH0,115200,0x00110101,1,4Mlzma)) - $(eval $(call SingleProfile,TPLINK-LZMA,$(fs_64kraw),TLMR3020,tl-mr3020-v1,TL-MR3020,ttyATH0,115200,0x30200001,1,4Mlzma)) - $(eval $(call SingleProfile,TPLINK-LZMA,$(fs_64kraw),TLMR3040,tl-mr3040-v1,TL-MR3040,ttyATH0,115200,0x30400001,1,4Mlzma)) -+$(eval $(call SingleProfile,TPLINK-LZMA,$(fs_64kraw),TLMR3420V2,tl-mr3420-v2,TL-MR3420-v2,ttyS0,115200,0x34200002,1,4Mlzma)) - $(eval $(call SingleProfile,TPLINK-LZMA,$(fs_64kraw),TLWR703,tl-wr703n-v1,TL-WR703N,ttyATH0,115200,0x07030101,1,4Mlzma)) - $(eval $(call SingleProfile,TPLINK-LZMA,$(fs_64kraw),TLWR740NV4,tl-wr740n-v4,TL-WR741ND-v4,ttyATH0,115200,0x07400004,1,4Mlzma)) - $(eval $(call SingleProfile,TPLINK-LZMA,$(fs_64kraw),TLWR741NV4,tl-wr741nd-v4,TL-WR741ND-v4,ttyATH0,115200,0x07410004,1,4Mlzma)) - $(eval $(call SingleProfile,TPLINK-LZMA,$(fs_64kraw),TLWR841NV8,tl-wr841n-v8,TL-WR841N-v8,ttyS0,115200,0x08410008,1,4Mlzma)) - $(eval $(call SingleProfile,TPLINK-LZMA,$(fs_64kraw),TLWR841NV9,tl-wr841n-v9,TL-WR841N-v9,ttyS0,115200,0x08410009,1,4Mlzma)) -+$(eval $(call SingleProfile,TPLINK-LZMA,$(fs_64kraw),TLWR842V2,tl-wr842n-v2,TL-WR842N-v2,ttyS0,115200,0x8420002,1,8Mlzma)) - $(eval $(call SingleProfile,TPLINK-LZMA,$(fs_64kraw),TLWR1041,tl-wr1041n-v2,TL-WR1041N-v2,ttyS0,115200,0x10410002,1,4Mlzma)) - $(eval $(call SingleProfile,TPLINK-LZMA,$(fs_64kraw),TLWR2543,tl-wr2543-v1,TL-WR2543N,ttyS0,115200,0x25430001,1,8Mlzma,-v 3.13.99)) - $(eval $(call SingleProfile,TPLINK-LZMA,$(fs_64kraw),TLWDR3500V1,tl-wdr3500-v1,TL-WDR3500,ttyS0,115200,0x35000001,1,8Mlzma)) -@@ -921,11 +923,13 @@ $(eval $(call SingleProfile,ZyXEL,$(fs_64k),NBG_460N_550N_550NH,nbg460n_550n_550 - $(eval $(call MultiProfile,AP121,AP121_2M AP121_4M)) - $(eval $(call MultiProfile,EWDORIN, EWDORINAP EWDORINRT)) - $(eval $(call MultiProfile,TEW652BRP,TEW652BRP_FW TEW652BRP_RECOVERY)) -+$(eval $(call MultiProfile,TLMR3420,TLMR3420V1 TLMR3420V2)) - $(eval $(call MultiProfile,TLWA901,TLWA901NV1 TLWA901NV2)) - $(eval $(call MultiProfile,TLWA7510,TLWA7510NV1)) - $(eval $(call MultiProfile,TLWR740,TLWR740NV1 TLWR740NV3 TLWR740NV4)) - $(eval $(call MultiProfile,TLWR741,TLWR741NV1 TLWR741NV2 TLWR741NV4)) - $(eval $(call MultiProfile,TLWR841,TLWR841NV15 TLWR841NV3 TLWR841NV5 TLWR841NV7 TLWR841NV8 TLWR841NV9)) -+$(eval $(call MultiProfile,TLWR842,TLWR842V1 TLWR842V2)) - $(eval $(call MultiProfile,TLWR941,TLWR941NV2 TLWR941NV3 TLWR941NV4)) - $(eval $(call MultiProfile,TLWDR4300,TLWDR3500V1 TLWDR3600V1 TLWDR4300V1 TLWDR4310V1)) - $(eval $(call MultiProfile,UBNT,UBNTAIRROUTER UBNTRS UBNTRSPRO UBNTLSSR71 UBNTBULLETM UBNTROCKETM UBNTNANOM UBNTUNIFI UBNTUNIFIOUTDOOR)) -diff --git a/target/linux/ar71xx/patches-3.3/610-MIPS-ath79-openwrt-machines.patch b/target/linux/ar71xx/patches-3.3/610-MIPS-ath79-openwrt-machines.patch -index 0230908..6d67f5f 100644 ---- a/target/linux/ar71xx/patches-3.3/610-MIPS-ath79-openwrt-machines.patch -+++ b/target/linux/ar71xx/patches-3.3/610-MIPS-ath79-openwrt-machines.patch -@@ -1,6 +1,6 @@ - --- a/arch/mips/ath79/machtypes.h - +++ b/arch/mips/ath79/machtypes.h --@@ -16,18 +16,102 @@ -+@@ -16,18 +16,104 @@ - - enum ath79_mach_type { - ATH79_MACH_GENERIC = 0, -@@ -61,6 +61,7 @@ - + ATH79_MACH_TL_MR3040, /* TP-LINK TL-MR3040 */ - + ATH79_MACH_TL_MR3220, /* TP-LINK TL-MR3220 */ - + ATH79_MACH_TL_MR3420, /* TP-LINK TL-MR3420 */ -++ ATH79_MACH_TL_MR3420_V2, /* TP-LINK TL-MR3420 v2 */ - + ATH79_MACH_TL_WA901ND, /* TP-LINK TL-WA901ND */ - + ATH79_MACH_TL_WA901ND_V2, /* TP-LINK TL-WA901ND v2 */ - + ATH79_MACH_TL_WDR4300, /* TP-LINK TL-WDR4300 */ -@@ -73,6 +74,7 @@ - + ATH79_MACH_TL_WR841N_V1, /* TP-LINK TL-WR841N v1 */ - + ATH79_MACH_TL_WR841N_V7, /* TP-LINK TL-WR841N/ND v7 */ - + ATH79_MACH_TL_WR841N_V8, /* TP-LINK TL-WR841N/ND v8 */ -++ ATH79_MACH_TL_WR842N_V2, /* TP-LINK TL-WR842N/ND v2 */ - + ATH79_MACH_TL_WR941ND, /* TP-LINK TL-WR941ND */ - ATH79_MACH_UBNT_AIRROUTER, /* Ubiquiti AirRouter */ - ATH79_MACH_UBNT_BULLET_M, /* Ubiquiti Bullet M */ -diff --git a/target/linux/ar71xx/patches-3.3/612-MIPS-ath79-TL-WA7510N-v1-support.patch b/target/linux/ar71xx/patches-3.3/612-MIPS-ath79-TL-WA7510N-v1-support.patch -index 6bd58b0..dba879e 100644 ---- a/target/linux/ar71xx/patches-3.3/612-MIPS-ath79-TL-WA7510N-v1-support.patch -+++ b/target/linux/ar71xx/patches-3.3/612-MIPS-ath79-TL-WA7510N-v1-support.patch -@@ -1,9 +1,9 @@ - --- a/arch/mips/ath79/machtypes.h - +++ b/arch/mips/ath79/machtypes.h --@@ -74,6 +74,7 @@ enum ath79_mach_type { -- ATH79_MACH_TL_MR3040, /* TP-LINK TL-MR3040 */ -+@@ -75,6 +75,7 @@ enum ath79_mach_type { - ATH79_MACH_TL_MR3220, /* TP-LINK TL-MR3220 */ - ATH79_MACH_TL_MR3420, /* TP-LINK TL-MR3420 */ -+ ATH79_MACH_TL_MR3420_V2, /* TP-LINK TL-MR3420 v2 */ - + ATH79_MACH_TL_WA7510N_V1, /* TP-LINK TL-WA7510N v1*/ - ATH79_MACH_TL_WA901ND, /* TP-LINK TL-WA901ND */ - ATH79_MACH_TL_WA901ND_V2, /* TP-LINK TL-WA901ND v2 */ -diff --git a/target/linux/ar71xx/patches-3.3/613-MIPS-ath79-add-TL-WDR3500-support.patch b/target/linux/ar71xx/patches-3.3/613-MIPS-ath79-add-TL-WDR3500-support.patch -index 0a2c3bd..059089b 100644 ---- a/target/linux/ar71xx/patches-3.3/613-MIPS-ath79-add-TL-WDR3500-support.patch -+++ b/target/linux/ar71xx/patches-3.3/613-MIPS-ath79-add-TL-WDR3500-support.patch -@@ -1,6 +1,6 @@ - --- a/arch/mips/ath79/machtypes.h - +++ b/arch/mips/ath79/machtypes.h --@@ -84,6 +84,7 @@ enum ath79_mach_type { -+@@ -78,6 +78,7 @@ enum ath79_mach_type { - ATH79_MACH_TL_WA7510N_V1, /* TP-LINK TL-WA7510N v1*/ - ATH79_MACH_TL_WA901ND, /* TP-LINK TL-WA901ND */ - ATH79_MACH_TL_WA901ND_V2, /* TP-LINK TL-WA901ND v2 */ -@@ -10,7 +10,7 @@ - ATH79_MACH_TL_WR1043ND, /* TP-LINK TL-WR1043ND */ - --- a/arch/mips/ath79/Kconfig - +++ b/arch/mips/ath79/Kconfig --@@ -514,6 +514,17 @@ config ATH79_MACH_TL_WA901ND_V2 -+@@ -469,6 +469,17 @@ config ATH79_MACH_TL_WA901ND_V2 - select ATH79_DEV_M25P80 - select ATH79_DEV_WMAC - -@@ -30,7 +30,7 @@ - select SOC_AR934X - --- a/arch/mips/ath79/Makefile - +++ b/arch/mips/ath79/Makefile --@@ -81,6 +81,7 @@ obj-$(CONFIG_ATH79_MACH_TL_MR3020) += ma -+@@ -78,6 +78,7 @@ obj-$(CONFIG_ATH79_MACH_TL_MR3020) += ma - obj-$(CONFIG_ATH79_MACH_TL_MR3X20) += mach-tl-mr3x20.o - obj-$(CONFIG_ATH79_MACH_TL_WA901ND) += mach-tl-wa901nd.o - obj-$(CONFIG_ATH79_MACH_TL_WA901ND_V2) += mach-tl-wa901nd-v2.o -diff --git a/target/linux/ar71xx/patches-3.3/613-MIPS-ath79-ubnt-xm-add-unifi-outdoor.patch b/target/linux/ar71xx/patches-3.3/613-MIPS-ath79-ubnt-xm-add-unifi-outdoor.patch -index 8a1c770..9766afe 100644 ---- a/target/linux/ar71xx/patches-3.3/613-MIPS-ath79-ubnt-xm-add-unifi-outdoor.patch -+++ b/target/linux/ar71xx/patches-3.3/613-MIPS-ath79-ubnt-xm-add-unifi-outdoor.patch -@@ -56,7 +56,7 @@ - + ubnt_unifi_outdoor_setup); - --- a/arch/mips/ath79/machtypes.h - +++ b/arch/mips/ath79/machtypes.h --@@ -97,6 +97,7 @@ enum ath79_mach_type { -+@@ -100,6 +100,7 @@ enum ath79_mach_type { - ATH79_MACH_UBNT_RSPRO, /* Ubiquiti RouterStation Pro */ - ATH79_MACH_UBNT_RS, /* Ubiquiti RouterStation */ - ATH79_MACH_UBNT_UNIFI, /* Ubiquiti Unifi */ -diff --git a/target/linux/ar71xx/patches-3.3/708-MIPS-ath79-TL-WR841v9-support.patch b/target/linux/ar71xx/patches-3.3/708-MIPS-ath79-TL-WR841v9-support.patch -index 37425a6..612970b 100644 ---- a/target/linux/ar71xx/patches-3.3/708-MIPS-ath79-TL-WR841v9-support.patch -+++ b/target/linux/ar71xx/patches-3.3/708-MIPS-ath79-TL-WR841v9-support.patch -@@ -33,6 +33,6 @@ - ATH79_MACH_TL_WR841N_V7, /* TP-LINK TL-WR841N/ND v7 */ - ATH79_MACH_TL_WR841N_V8, /* TP-LINK TL-WR841N/ND v8 */ - + ATH79_MACH_TL_WR841N_V9, /* TP-LINK TL-WR841N/ND v9 */ -+ ATH79_MACH_TL_WR842N_V2, /* TP-LINK TL-WR842N/ND v2 */ - ATH79_MACH_TL_WR941ND, /* TP-LINK TL-WR941ND */ - ATH79_MACH_UBNT_AIRROUTER, /* Ubiquiti AirRouter */ -- ATH79_MACH_UBNT_BULLET_M, /* Ubiquiti Bullet M */ diff --git a/patches/openwrt/0021-x86-add-grub2-iso-support.patch b/patches/openwrt/0021-x86-add-grub2-iso-support.patch deleted file mode 100644 index 274127c5..00000000 --- a/patches/openwrt/0021-x86-add-grub2-iso-support.patch +++ /dev/null @@ -1,110 +0,0 @@ -From: nbd -Date: Sun, 7 Oct 2012 23:01:52 +0000 -Subject: x86: add grub2 iso support - -diff --git a/Config.in b/Config.in -index 5b4522e..54df7c8 100644 ---- a/Config.in -+++ b/Config.in -@@ -81,7 +81,7 @@ menu "Target Images" - config TARGET_ROOTFS_ISO - bool "iso" - default n -- depends TARGET_ROOTFS_INITRAMFS && TARGET_x86 -+ depends on TARGET_x86_generic - help - Create some bootable ISO image - -diff --git a/target/linux/x86/base-files/lib/preinit/20_check_iso b/target/linux/x86/base-files/lib/preinit/20_check_iso -new file mode 100644 -index 0000000..beff6eb ---- /dev/null -+++ b/target/linux/x86/base-files/lib/preinit/20_check_iso -@@ -0,0 +1,5 @@ -+check_for_iso() { -+ grep -qE '/dev/root.*iso9660' /proc/mounts && ramoverlay -+} -+ -+boot_hook_add preinit_mount_root check_for_iso -diff --git a/target/linux/x86/image/Makefile b/target/linux/x86/image/Makefile -index 13da511..8f0debd 100644 ---- a/target/linux/x86/image/Makefile -+++ b/target/linux/x86/image/Makefile -@@ -9,7 +9,8 @@ include $(INCLUDE_DIR)/image.mk - - export PATH=$(TARGET_PATH):/sbin - --GRUB2_MODULES = biosdisk boot chain configfile ext2 linux ls part_msdos reboot serial vga -+GRUB2_MODULES = at_keyboard biosdisk boot chain configfile ext2 linux ls part_msdos reboot serial vga -+GRUB2_MODULES_ISO = at_keyboard biosdisk boot chain configfile iso9660 linux ls part_msdos reboot serial vga - GRUB_TERMINALS = - GRUB_SERIAL_CONFIG = - GRUB_TERMINAL_CONFIG = -@@ -51,7 +52,7 @@ ifneq ($(CONFIG_X86_GRUB_IMAGES),) - define Image/cmdline/ext4 - root=$(ROOTPART) rootfstype=ext4 rootwait - endef -- -+ - define Image/cmdline/jffs2-64k - block2mtd.block2mtd=$(ROOTPART),65536,rootfs root=/dev/mtdblock0 rootfstype=jffs2 rootwait - endef -@@ -165,7 +166,31 @@ define Image/Build/squashfs - $(call prepare_generic_squashfs,$(KDIR)/root.squashfs) - endef - --define Image/Build/iso -+ifdef CONFIG_X86_USE_GRUB2 -+ define Image/Build/iso -+ $(INSTALL_DIR) $(KDIR)/root.grub/boot/grub $(KDIR)/grub2 -+ $(CP) $(KDIR)/bzImage $(KDIR)/root.grub/boot/vmlinuz -+ grub-mkimage \ -+ -o $(KDIR)/grub2/eltorito.img \ -+ -O i386-pc \ -+ -c ./grub-early.cfg \ -+ $(GRUB2_MODULES_ISO) -+ cat \ -+ $(STAGING_DIR_HOST)/lib/grub/i386-pc/cdboot.img \ -+ $(KDIR)/grub2/eltorito.img \ -+ > $(KDIR)/root.grub/boot/grub/eltorito.img -+ sed \ -+ -e 's#@SERIAL_CONFIG@#$(strip $(GRUB_SERIAL_CONFIG))#g' \ -+ -e 's#@TERMINAL_CONFIG@#$(strip $(GRUB_TERMINAL_CONFIG))#g' \ -+ -e 's#@CMDLINE@#root=/dev/sr0 rootfstype=iso9660 rootwait $(strip $(call Image/cmdline/$(1)) $(BOOTOPTS) $(GRUB_CONSOLE_CMDLINE))#g' \ -+ -e 's#@TIMEOUT@#$(GRUB_TIMEOUT)#g' \ -+ ./grub-iso.cfg > $(KDIR)/root.grub/boot/grub/grub.cfg -+ $(CP) $(KDIR)/bzImage $(KDIR)/root.grub/boot/vmlinuz -+ mkisofs -R -b boot/grub/eltorito.img -no-emul-boot -boot-info-table \ -+ -o $(KDIR)/root.iso $(KDIR)/root.grub $(TARGET_DIR) -+ endef -+else -+ define Image/Build/iso - $(INSTALL_DIR) $(KDIR)/root.grub/boot/grub - $(CP) \ - $(KDIR)/stage2_eltorito \ -@@ -179,7 +204,8 @@ define Image/Build/iso - $(CP) $(KDIR)/bzImage $(KDIR)/root.grub/boot/vmlinuz - mkisofs -R -b boot/grub/stage2_eltorito -no-emul-boot -boot-load-size 4 -boot-info-table \ - -o $(KDIR)/root.iso $(KDIR)/root.grub --endef -+ endef -+endif - - ifneq ($(CONFIG_X86_VDI_IMAGES),) - define Image/Build/vdi -diff --git a/target/linux/x86/image/grub-iso.cfg b/target/linux/x86/image/grub-iso.cfg -new file mode 100644 -index 0000000..4d5d697 ---- /dev/null -+++ b/target/linux/x86/image/grub-iso.cfg -@@ -0,0 +1,10 @@ -+@SERIAL_CONFIG@ -+@TERMINAL_CONFIG@ -+ -+set default="0" -+set timeout="@TIMEOUT@" -+set root='(cd)' -+ -+menuentry "OpenWrt" { -+ linux /boot/vmlinuz @CMDLINE@ noinitrd reboot=bios -+} diff --git a/patches/openwrt/0022-x86-explicitely-pass-staging-directory-to-grub-mkimage-instead-of-relying-on-build-time-defaults-12821.patch b/patches/openwrt/0022-x86-explicitely-pass-staging-directory-to-grub-mkimage-instead-of-relying-on-build-time-defaults-12821.patch deleted file mode 100644 index 2701ca97..00000000 --- a/patches/openwrt/0022-x86-explicitely-pass-staging-directory-to-grub-mkimage-instead-of-relying-on-build-time-defaults-12821.patch +++ /dev/null @@ -1,24 +0,0 @@ -From: jow -Date: Thu, 17 Jan 2013 15:46:26 +0000 -Subject: x86: explicitely pass staging directory to grub-mkimage instead of relying on build time defaults (#12821) - -diff --git a/target/linux/x86/image/Makefile b/target/linux/x86/image/Makefile -index 8f0debd..6e2bd54 100644 ---- a/target/linux/x86/image/Makefile -+++ b/target/linux/x86/image/Makefile -@@ -102,6 +102,7 @@ ifneq ($(CONFIG_X86_GRUB_IMAGES),) - $(INSTALL_DIR) $(KDIR)/root.grub/boot/grub $(KDIR)/grub2 - $(CP) $(KDIR)/bzImage $(KDIR)/root.grub/boot/vmlinuz - grub-mkimage \ -+ -d $(STAGING_DIR_HOST)/lib/grub/i386-pc \ - -o $(KDIR)/grub2/core.img \ - -O i386-pc \ - -c ./grub-early.cfg \ -@@ -171,6 +172,7 @@ ifdef CONFIG_X86_USE_GRUB2 - $(INSTALL_DIR) $(KDIR)/root.grub/boot/grub $(KDIR)/grub2 - $(CP) $(KDIR)/bzImage $(KDIR)/root.grub/boot/vmlinuz - grub-mkimage \ -+ -d $(STAGING_DIR_HOST)/lib/grub/i386-pc \ - -o $(KDIR)/grub2/eltorito.img \ - -O i386-pc \ - -c ./grub-early.cfg \ diff --git a/patches/openwrt/0023-grub2-Add-sub-package-grub-editenv-for-target-installation.patch b/patches/openwrt/0023-grub2-Add-sub-package-grub-editenv-for-target-installation.patch deleted file mode 100644 index 1029c37a..00000000 --- a/patches/openwrt/0023-grub2-Add-sub-package-grub-editenv-for-target-installation.patch +++ /dev/null @@ -1,57 +0,0 @@ -From: blogic -Date: Tue, 7 May 2013 12:35:07 +0000 -Subject: grub2: Add sub package grub-editenv for target installation - -grub-editenv allows to modify grub2 environment files. Add a new package -that build grub2 for the target and packs up grub-editenv. - -Signed-off-by: Helmut Schaa - -diff --git a/package/grub2/Makefile b/package/grub2/Makefile -index b606f54..dd490ff 100644 ---- a/package/grub2/Makefile -+++ b/package/grub2/Makefile -@@ -16,7 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz - PKG_SOURCE_URL:=@GNU/grub - PKG_MD5SUM:=e927540b6eda8b024fb0391eeaa4091c - --PKG_HOST_ONLY:=1 - HOST_BUILD_PARALLEL:=1 - PKG_BUILD_DEPENDS:=grub2/host - -@@ -32,6 +31,23 @@ define Package/grub2 - DEPENDS:=@TARGET_x86 - endef - -+define Package/grub2-editenv -+ CATEGORY:=Utilities -+ SECTION:=utils -+ TITLE:=Grub2 Environment editor -+ URL:=http://www.gnu.org/software/grub/ -+ DEPENDS:=@TARGET_x86 -+endef -+ -+define Package/grub2-editenv/description -+ Edit grub2 environment files. -+endef -+ -+CONFIGURE_ARGS += \ -+ --target=$(REAL_GNU_TARGET_NAME) \ -+ --disable-werror \ -+ --disable-nls -+ - HOST_CONFIGURE_ARGS += \ - --target=$(REAL_GNU_TARGET_NAME) \ - --sbindir="$(STAGING_DIR_HOST)/bin" \ -@@ -47,5 +63,11 @@ define Host/Configure - $(Host/Configure/Default) - endef - -+define Package/grub2-editenv/install -+ $(INSTALL_DIR) $(1)/usr/sbin -+ $(INSTALL_BIN) $(PKG_BUILD_DIR)/grub-editenv $(1)/usr/sbin/ -+endef -+ - $(eval $(call HostBuild)) - $(eval $(call BuildPackage,grub2)) -+$(eval $(call BuildPackage,grub2-editenv)) diff --git a/patches/openwrt/0024-x86-Fix-CONFIG_X86_GRUB_SERIAL.patch b/patches/openwrt/0024-x86-Fix-CONFIG_X86_GRUB_SERIAL.patch deleted file mode 100644 index 286fd163..00000000 --- a/patches/openwrt/0024-x86-Fix-CONFIG_X86_GRUB_SERIAL.patch +++ /dev/null @@ -1,37 +0,0 @@ -From: nbd -Date: Sat, 10 Aug 2013 18:35:29 +0000 -Subject: x86: Fix CONFIG_X86_GRUB_SERIAL="" - -With - - .config:CONFIG_X86_GRUB_SERIAL="" - -which (AFAICT) is the way to tell GRUB not to use a serial console, in - - target/linux/x86/image/Makefile:ifneq ($(CONFIG_X86_GRUB_SERIAL),) - -$(CONFIG_X86_GRUB_SERIAL) expands to `""' (a literal double double-quote), -making the condition unconditionally false. - -This patch fixes the situation by passing CONFIG_X86_GRUB_SERIAL through -qstrip before testing. - -Signed-off-by: Tamas TEVESZ - -diff --git a/target/linux/x86/image/Makefile b/target/linux/x86/image/Makefile -index 6e2bd54..2e73519 100644 ---- a/target/linux/x86/image/Makefile -+++ b/target/linux/x86/image/Makefile -@@ -27,8 +27,10 @@ ifneq ($(strip $(foreach subtarget,$(USE_ATKBD),$(CONFIG_TARGET_x86_$(subtarget) - GRUB2_MODULES += at_keyboard - endif - --ifneq ($(CONFIG_X86_GRUB_SERIAL),) -- GRUB_CONSOLE_CMDLINE += console=$(call qstrip,$(CONFIG_X86_GRUB_SERIAL)),$(CONFIG_X86_GRUB_BAUDRATE)n8 -+GRUB_SERIAL:=$(call qstrip,$(CONFIG_X86_GRUB_SERIAL)) -+ -+ifneq ($(GRUB_SERIAL),) -+ GRUB_CONSOLE_CMDLINE += console=$(GRUB_SERIAL),$(CONFIG_X86_GRUB_BAUDRATE)n8 - GRUB_SERIAL_CONFIG := serial --unit=0 --speed=$(CONFIG_X86_GRUB_BAUDRATE) --word=8 --parity=no --stop=1 - GRUB_TERMINALS += serial - endif diff --git a/patches/openwrt/0025-grub2-update-to-2.02-beta2-fixes-mac-os-x-10.9-support-and-many-other-things.patch b/patches/openwrt/0025-grub2-update-to-2.02-beta2-fixes-mac-os-x-10.9-support-and-many-other-things.patch deleted file mode 100644 index f7b763cc..00000000 --- a/patches/openwrt/0025-grub2-update-to-2.02-beta2-fixes-mac-os-x-10.9-support-and-many-other-things.patch +++ /dev/null @@ -1,218 +0,0 @@ -From: nbd -Date: Wed, 12 Mar 2014 11:21:16 +0000 -Subject: grub2: update to 2.02-beta2, fixes mac os x 10.9 support (and many other things) - -Signed-off-by: Felix Fietkau - -diff --git a/package/grub2/Makefile b/package/grub2/Makefile -index dd490ff..4edd92b 100644 ---- a/package/grub2/Makefile -+++ b/package/grub2/Makefile -@@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk - include $(INCLUDE_DIR)/kernel.mk - - PKG_NAME:=grub --PKG_VERSION:=2.00 -+PKG_VERSION:=2.02~beta2 - PKG_RELEASE:=1 - --PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz --PKG_SOURCE_URL:=@GNU/grub --PKG_MD5SUM:=e927540b6eda8b024fb0391eeaa4091c -+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz -+PKG_SOURCE_URL:=http://alpha.gnu.org/gnu/grub -+PKG_MD5SUM:=be62932eade308a364ea4bbc91295930 - - HOST_BUILD_PARALLEL:=1 - PKG_BUILD_DEPENDS:=grub2/host -diff --git a/package/grub2/patches/100-grub_setup_root.patch b/package/grub2/patches/100-grub_setup_root.patch -index 7775b2a..9619c41 100644 ---- a/package/grub2/patches/100-grub_setup_root.patch -+++ b/package/grub2/patches/100-grub_setup_root.patch -@@ -1,41 +1,6 @@ - --- a/util/grub-setup.c - +++ b/util/grub-setup.c --@@ -141,12 +141,11 @@ write_rootdev (char *core_img, grub_devi -- static void -- setup (const char *dir, -- const char *boot_file, const char *core_file, --- const char *dest, int force, --+ const char *root, const char *dest, int force, -- int fs_probe, int allow_floppy) -- { -- char *boot_path, *core_path, *core_path_dev, *core_path_dev_full; -- char *boot_img, *core_img; --- char *root = 0; -- size_t boot_size, core_size; -- grub_uint16_t core_sectors; -- grub_device_t root_dev = 0, dest_dev, core_dev; --@@ -253,7 +252,10 @@ setup (const char *dir, -- -- core_dev = dest_dev; -- --- { --+ if (root) --+ root_dev = grub_device_open(root); --+ --+ if (!root_dev) { -- char **root_devices = grub_guess_root_devices (dir); -- char **cur; -- int found = 0; --@@ -263,6 +265,8 @@ setup (const char *dir, -- char *drive; -- grub_device_t try_dev; -- --+ if (root_dev) --+ break; -- drive = grub_util_get_grub_dev (*cur); -- if (!drive) -- continue; --@@ -956,6 +960,8 @@ static struct argp_option options[] = { -+@@ -87,6 +87,8 @@ static struct argp_option options[] = { - N_("install even if problems are detected"), 0}, - {"skip-fs-probe",'s',0, 0, - N_("do not probe for filesystems in DEVICE"), 0}, -@@ -44,7 +9,7 @@ - {"verbose", 'v', 0, 0, N_("print verbose messages."), 0}, - {"allow-floppy", 'a', 0, 0, - /* TRANSLATORS: The potential breakage isn't limited to floppies but it's --@@ -993,6 +999,7 @@ struct arguments -+@@ -130,6 +132,7 @@ struct arguments - char *core_file; - char *dir; - char *dev_map; -@@ -52,7 +17,7 @@ - int force; - int fs_probe; - int allow_floppy; --@@ -1040,6 +1047,13 @@ argp_parser (int key, char *arg, struct -+@@ -178,6 +181,13 @@ argp_parser (int key, char *arg, struct - arguments->dev_map = xstrdup (arg); - break; - -@@ -66,12 +31,88 @@ - case 'f': - arguments->force = 1; - break; --@@ -1172,7 +1186,7 @@ main (int argc, char *argv[]) -- setup (arguments.dir ? : DEFAULT_DIRECTORY, -- arguments.boot_file ? : DEFAULT_BOOT_FILE, -- arguments.core_file ? : DEFAULT_CORE_FILE, --- dest_dev, arguments.force, --+ arguments.root_dev, dest_dev, arguments.force, -- arguments.fs_probe, arguments.allow_floppy); -+@@ -313,7 +323,7 @@ main (int argc, char *argv[]) -+ GRUB_SETUP_FUNC (arguments.dir ? : DEFAULT_DIRECTORY, -+ arguments.boot_file ? : DEFAULT_BOOT_FILE, -+ arguments.core_file ? : DEFAULT_CORE_FILE, -+- dest_dev, arguments.force, -++ arguments.root_dev, dest_dev, arguments.force, -+ arguments.fs_probe, arguments.allow_floppy, -+ arguments.add_rs_codes); -+ -+--- a/util/setup.c -++++ b/util/setup.c -+@@ -247,13 +247,12 @@ identify_partmap (grub_disk_t disk __att -+ void -+ SETUP (const char *dir, -+ const char *boot_file, const char *core_file, -+- const char *dest, int force, -++ const char *root, const char *dest, int force, -+ int fs_probe, int allow_floppy, -+ int add_rs_codes __attribute__ ((unused))) /* unused on sparc64 */ -+ { -+ char *core_path; -+ char *boot_img, *core_img, *boot_path; -+- char *root = 0; -+ size_t boot_size, core_size; -+ #ifdef GRUB_SETUP_BIOS -+ grub_uint16_t core_sectors; -+@@ -307,7 +306,10 @@ SETUP (const char *dir, -+ -+ core_dev = dest_dev; -+ -+- { -++ if (root) -++ root_dev = grub_device_open(root); -++ -++ if (!root_dev) { -+ char **root_devices = grub_guess_root_devices (dir); -+ char **cur; -+ int found = 0; -+@@ -317,6 +319,8 @@ SETUP (const char *dir, -+ char *drive; -+ grub_device_t try_dev; -+ -++ if (root_dev) -++ break; -+ drive = grub_util_get_grub_dev (*cur); -+ if (!drive) -+ continue; -+--- a/include/grub/util/install.h -++++ b/include/grub/util/install.h -+@@ -182,13 +182,13 @@ grub_install_get_image_target (const cha -+ void -+ grub_util_bios_setup (const char *dir, -+ const char *boot_file, const char *core_file, -+- const char *dest, int force, -++ const char *root, const char *dest, int force, -+ int fs_probe, int allow_floppy, -+ int add_rs_codes); -+ void -+ grub_util_sparc_setup (const char *dir, -+ const char *boot_file, const char *core_file, -+- const char *dest, int force, -++ const char *root, const char *dest, int force, -+ int fs_probe, int allow_floppy, -+ int add_rs_codes); - -- /* Free resources. */ -+--- a/util/grub-install.c -++++ b/util/grub-install.c -+@@ -1660,7 +1660,7 @@ main (int argc, char *argv[]) -+ /* Now perform the installation. */ -+ if (install_bootsector) -+ grub_util_bios_setup (platdir, "boot.img", "core.img", -+- install_drive, force, -++ NULL, install_drive, force, -+ fs_probe, allow_floppy, add_rs_codes); -+ break; -+ } -+@@ -1686,7 +1686,7 @@ main (int argc, char *argv[]) -+ /* Now perform the installation. */ -+ if (install_bootsector) -+ grub_util_sparc_setup (platdir, "boot.img", "core.img", -+- install_device, force, -++ NULL, install_device, force, -+ fs_probe, allow_floppy, -+ 0 /* unused */ ); -+ break; -diff --git a/package/grub2/patches/200-fix-gets-removal.patch b/package/grub2/patches/200-fix-gets-removal.patch -index 4370fb5..737fb97 100644 ---- a/package/grub2/patches/200-fix-gets-removal.patch -+++ b/package/grub2/patches/200-fix-gets-removal.patch -@@ -1,15 +1,16 @@ - --- a/grub-core/gnulib/stdio.in.h - +++ b/grub-core/gnulib/stdio.in.h --@@ -137,12 +137,6 @@ -- "use gnulib module fflush for portable POSIX compliance"); -+@@ -695,13 +695,6 @@ _GL_WARN_ON_USE (getline, "getline is un -+ # endif - #endif - - -/* It is very rare that the developer ever has full control of stdin, --- so any use of gets warrants an unconditional warning. Assume it is --- always declared, since it is required by C89. */ -+- so any use of gets warrants an unconditional warning; besides, C11 -+- removed it. */ - -#undef gets ---_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); -+-#if HAVE_RAW_DECL_GETS -+-#endif - - -- #if @GNULIB_FOPEN@ -- # if @REPLACE_FOPEN@ -- # if !(defined __cplusplus && defined GNULIB_NAMESPACE) -+ -+ #if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@ -+ struct obstack; diff --git a/patches/openwrt/0026-grub2-disable-libdevmapper-fix-build-when-it-s-available.patch b/patches/openwrt/0026-grub2-disable-libdevmapper-fix-build-when-it-s-available.patch deleted file mode 100644 index d758d24a..00000000 --- a/patches/openwrt/0026-grub2-disable-libdevmapper-fix-build-when-it-s-available.patch +++ /dev/null @@ -1,20 +0,0 @@ -From: nbd -Date: Sun, 30 Mar 2014 19:55:39 +0000 -Subject: grub2: disable libdevmapper - fix build when it's available - -Signed-off-by: Alexander Couzens - -diff --git a/package/grub2/Makefile b/package/grub2/Makefile -index 4edd92b..ed86fff 100644 ---- a/package/grub2/Makefile -+++ b/package/grub2/Makefile -@@ -46,7 +46,8 @@ endef - CONFIGURE_ARGS += \ - --target=$(REAL_GNU_TARGET_NAME) \ - --disable-werror \ -- --disable-nls -+ --disable-nls \ -+ --disable-device-mapper - - HOST_CONFIGURE_ARGS += \ - --target=$(REAL_GNU_TARGET_NAME) \ diff --git a/patches/openwrt/0027-grub2-disable-mkfont-fix-build-on-Archlinux.patch b/patches/openwrt/0027-grub2-disable-mkfont-fix-build-on-Archlinux.patch deleted file mode 100644 index e2026c08..00000000 --- a/patches/openwrt/0027-grub2-disable-mkfont-fix-build-on-Archlinux.patch +++ /dev/null @@ -1,20 +0,0 @@ -From: nbd -Date: Sun, 30 Mar 2014 19:55:43 +0000 -Subject: grub2: disable mkfont - fix build on Archlinux - -Signed-off-by: Alexander Couzens - -diff --git a/package/grub2/Makefile b/package/grub2/Makefile -index ed86fff..509fb60 100644 ---- a/package/grub2/Makefile -+++ b/package/grub2/Makefile -@@ -47,7 +47,8 @@ CONFIGURE_ARGS += \ - --target=$(REAL_GNU_TARGET_NAME) \ - --disable-werror \ - --disable-nls \ -- --disable-device-mapper -+ --disable-device-mapper \ -+ --disable-grub-mkfont - - HOST_CONFIGURE_ARGS += \ - --target=$(REAL_GNU_TARGET_NAME) \ diff --git a/patches/openwrt/0028-ar71xx-add-support-for-dlink-dir-615-e1.patch b/patches/openwrt/0028-ar71xx-add-support-for-dlink-dir-615-e1.patch deleted file mode 100644 index d2ead709..00000000 --- a/patches/openwrt/0028-ar71xx-add-support-for-dlink-dir-615-e1.patch +++ /dev/null @@ -1,155 +0,0 @@ -From: Zhao, Gang -Date: Wed, 21 May 2014 23:26:28 +0800 -Subject: ar71xx: add support for dlink dir-615-e1 - -Dlink dir-615-e1 can use dir-600-a1's image, but the image can't be -uploaded through dlink's normal firmware update web page. - -Add profile for dir-615-e1 so the generated image can be uploaded -through the firmware update web page. - -Signed-off-by: Zhao, Gang - -diff --git a/target/linux/ar71xx/base-files/etc/diag.sh b/target/linux/ar71xx/base-files/etc/diag.sh -index 0d01119..c86044b 100755 ---- a/target/linux/ar71xx/base-files/etc/diag.sh -+++ b/target/linux/ar71xx/base-files/etc/diag.sh -@@ -61,6 +61,7 @@ get_status_led() { - status_led="db120:green:status" - ;; - dir-600-a1 |\ -+ dir-615-e1 |\ - dir-615-e4) - status_led="d-link:green:power" - ;; -diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/leds b/target/linux/ar71xx/base-files/etc/uci-defaults/leds -index f1ac9ec..98568fa 100755 ---- a/target/linux/ar71xx/base-files/etc/uci-defaults/leds -+++ b/target/linux/ar71xx/base-files/etc/uci-defaults/leds -@@ -52,6 +52,7 @@ rb750) - ;; - - dir-600-a1|\ -+dir-615-e1|\ - dir-615-e4) - ucidef_set_led_netdev "wan" "WAN" "d-link:green:wan" "eth1" - ucidef_set_led_switch "lan1" "LAN1" "d-link:green:lan1" "switch0" "0x02" -diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/network b/target/linux/ar71xx/base-files/etc/uci-defaults/network -index e38a9b8..a2ac224 100755 ---- a/target/linux/ar71xx/base-files/etc/uci-defaults/network -+++ b/target/linux/ar71xx/base-files/etc/uci-defaults/network -@@ -182,6 +182,7 @@ ap96 |\ - airrouter |\ - dir-600-a1 |\ - dir-615-c1 |\ -+dir-615-e1 |\ - dir-615-e4 |\ - ja76pf |\ - rb-750 |\ -diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh -index 11aa31b..9273012 100755 ---- a/target/linux/ar71xx/base-files/lib/ar71xx.sh -+++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh -@@ -201,6 +201,9 @@ ar71xx_board_detect() { - *"DIR-600 rev. A1") - name="dir-600-a1" - ;; -+ *"DIR-615 rev. E1") -+ name="dir-615-e1" -+ ;; - *"DIR-615 rev. E4") - name="dir-615-e4" - ;; -diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh -index b25df6c..5fdd564 100755 ---- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh -+++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh -@@ -104,6 +104,7 @@ platform_check_image() { - ap83 | \ - dir-600-a1 | \ - dir-615-c1 | \ -+ dir-615-e1 | \ - dir-615-e4 | \ - ew-dorin | \ - ew-dorin-router | \ -diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-dir-600-a1.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-dir-600-a1.c -index c0fa900..321fdce 100644 ---- a/target/linux/ar71xx/files/arch/mips/ath79/mach-dir-600-a1.c -+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-dir-600-a1.c -@@ -141,6 +141,14 @@ static void __init dir_600_a1_setup(void) - MIPS_MACHINE(ATH79_MACH_DIR_600_A1, "DIR-600-A1", "D-Link DIR-600 rev. A1", - dir_600_a1_setup); - -+static void __init dir_615_e1_setup(void) -+{ -+ dir_600_a1_setup(); -+} -+ -+MIPS_MACHINE(ATH79_MACH_DIR_615_E1, "DIR-615-E1", "D-Link DIR-615 rev. E1", -+ dir_615_e1_setup); -+ - static void __init dir_615_e4_setup(void) - { - dir_600_a1_setup(); -diff --git a/target/linux/ar71xx/generic/profiles/d-link.mk b/target/linux/ar71xx/generic/profiles/d-link.mk -index 98fe00f..9a8ab1b 100644 ---- a/target/linux/ar71xx/generic/profiles/d-link.mk -+++ b/target/linux/ar71xx/generic/profiles/d-link.mk -@@ -38,6 +38,16 @@ endef - - $(eval $(call Profile,DIR615C1)) - -+define Profile/DIR615E1 -+ NAME:=D-Link DIR-615 rev. E1 -+ PACKAGES:= -+endef -+ -+define Profile/DIR615E1/Description -+ Package set optimized for the D-Link DIR-615 rev. E1. -+endef -+ -+$(eval $(call Profile,DIR615E1)) - - define Profile/DIR615E4 - NAME:=D-Link DIR-615 rev. E4 -diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile -index a055521..11ba068 100644 ---- a/target/linux/ar71xx/image/Makefile -+++ b/target/linux/ar71xx/image/Makefile -@@ -804,6 +804,7 @@ $(eval $(call SingleProfile,AthLzma,$(fs_64k),PB92,pb92,PB92,ttyS0,115200,$$(pb9 - - $(eval $(call SingleProfile,Cameo7240,$(fs_64k),DIR600A1,dir-600-a1,DIR-600-A1,ttyS0,115200,"AP91-AR7240-RT-090223-00")) - $(eval $(call SingleProfile,Cameo7240,$(fs_64k),DIR601A1,dir-601-a1,DIR-600-A1,ttyS0,115200,"AP91-AR7240-RT-090223-02")) -+$(eval $(call SingleProfile,Cameo7240,$(fs_64k),DIR615E1,dir-615-e1,DIR-615-E1,ttyS0,115200,"AP93-AR7240-RT-081028-00")) - $(eval $(call SingleProfile,Cameo7240,$(fs_64k),DIR615E4,dir-615-e4,DIR-615-E4,ttyS0,115200,"AP99-AR7240-RT-091105-05")) - $(eval $(call SingleProfile,Cameo7240,$(fs_64k),FR54RTR,fr-54rtr,DIR-600-A1,ttyS0,115200,"AP91-AR7240-RT-090223-01")) - -diff --git a/target/linux/ar71xx/patches-3.3/610-MIPS-ath79-openwrt-machines.patch b/target/linux/ar71xx/patches-3.3/610-MIPS-ath79-openwrt-machines.patch -index 6d67f5f..c7d0220 100644 ---- a/target/linux/ar71xx/patches-3.3/610-MIPS-ath79-openwrt-machines.patch -+++ b/target/linux/ar71xx/patches-3.3/610-MIPS-ath79-openwrt-machines.patch -@@ -1,6 +1,6 @@ - --- a/arch/mips/ath79/machtypes.h - +++ b/arch/mips/ath79/machtypes.h --@@ -16,18 +16,104 @@ -+@@ -16,18 +16,105 @@ - - enum ath79_mach_type { - ATH79_MACH_GENERIC = 0, -@@ -21,6 +21,7 @@ - ATH79_MACH_PB44, /* Atheros PB44 reference board */ - + ATH79_MACH_DIR_600_A1, /* D-Link DIR-600 rev. A1 */ - + ATH79_MACH_DIR_615_C1, /* D-Link DIR-615 rev. C1 */ -++ ATH79_MACH_DIR_615_E1, /* D-Link DIR-615 rev. E1 */ - + ATH79_MACH_DIR_615_E4, /* D-Link DIR-615 rev. E4 */ - + ATH79_MACH_DIR_825_B1, /* D-Link DIR-825 rev. B1 */ - + ATH79_MACH_EW_DORIN, /* embedded wireless Dorin Platform */ -@@ -306,7 +307,7 @@ - + select MYLOADER - + - +config ATH79_MACH_DIR_600_A1 --+ bool "D-Link DIR-600 A1/DIR-615 E4 support" -++ bool "D-Link DIR-600 A1/DIR-615 E1/DIR-615 E4 support" - + select SOC_AR724X - + select ATH79_DEV_AP9X_PCI if PCI - + select ATH79_DEV_ETH diff --git a/patches/openwrt/0029-iptables-avoid-file-conflicts-due-to-unneeded-libip6t_-.so-in-ip6tables-package.patch b/patches/openwrt/0029-iptables-avoid-file-conflicts-due-to-unneeded-libip6t_-.so-in-ip6tables-package.patch deleted file mode 100644 index 04c68aa3..00000000 --- a/patches/openwrt/0029-iptables-avoid-file-conflicts-due-to-unneeded-libip6t_-.so-in-ip6tables-package.patch +++ /dev/null @@ -1,19 +0,0 @@ -From: Matthias Schiffer -Date: Sat, 5 Jul 2014 22:30:34 +0200 -Subject: iptables: avoid file conflicts due to unneeded libip6t_*.so in ip6tables package - -diff --git a/package/iptables/Makefile b/package/iptables/Makefile -index e36a093..0c7a380 100644 ---- a/package/iptables/Makefile -+++ b/package/iptables/Makefile -@@ -406,10 +406,6 @@ define Package/ip6tables/install - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ip6tables $(1)/usr/sbin/ - $(LN) ip6tables $(1)/usr/sbin/ip6tables-save - $(LN) ip6tables $(1)/usr/sbin/ip6tables-restore -- $(INSTALL_DIR) $(1)/usr/lib/iptables -- (cd $(PKG_INSTALL_DIR)/usr/lib/iptables ; \ -- $(CP) libip6t_*.so $(1)/usr/lib/iptables/ \ -- ) - endef - - define Package/libiptc/install diff --git a/patches/openwrt/0030-mac80211-add-another-ath9k-patch.patch b/patches/openwrt/0030-mac80211-add-another-ath9k-patch.patch deleted file mode 100644 index 0ffe111f..00000000 --- a/patches/openwrt/0030-mac80211-add-another-ath9k-patch.patch +++ /dev/null @@ -1,73 +0,0 @@ -From: Matthias Schiffer -Date: Thu, 24 Jul 2014 03:00:23 +0200 -Subject: mac80211: add another ath9k patch - -diff --git a/package/mac80211/patches/300-pending_work.patch b/package/mac80211/patches/300-pending_work.patch -index ba05bde..6197e0e 100644 ---- a/package/mac80211/patches/300-pending_work.patch -+++ b/package/mac80211/patches/300-pending_work.patch -@@ -1,3 +1,21 @@ -+commit ff354dbdd743e5fe186df8cd17982db19f78231a -+Author: Felix Fietkau -+Date: Wed Jul 23 15:33:26 2014 +0200 -+ -+ ath9k: fix aggregation session lockup -+ -+ If an aggregation session fails, frames still end up in the driver queue -+ with IEEE80211_TX_CTL_AMPDU set. -+ This causes tx for the affected station/tid to stall, since -+ ath_tx_get_tid_subframe returning packets to send. -+ -+ Fix this by clearing IEEE80211_TX_CTL_AMPDU as long as no aggregation -+ session is running. -+ -+ Cc: stable@vger.kernel.org -+ Reported-by: Antonio Quartulli -+ Signed-off-by: Felix Fietkau -+ - commit 38695a6e5a940e6a524523b88a33916b016fb2a1 - Author: Felix Fietkau - Date: Fri Jul 11 12:06:18 2014 +0200 -@@ -2990,7 +3008,23 @@ Date: Mon May 19 21:20:49 2014 +0200 - if (WARN_ON(--txq->pending_frames < 0)) - txq->pending_frames = 0; - --@@ -1999,6 +1997,7 @@ static void setup_frame_info(struct ieee -+@@ -887,6 +885,15 @@ ath_tx_get_tid_subframe(struct ath_softc -+ -+ tx_info = IEEE80211_SKB_CB(skb); -+ tx_info->flags &= ~IEEE80211_TX_CTL_CLEAR_PS_FILT; -++ -++ /* -++ * No aggregation session is running, but there may be frames -++ * from a previous session or a failed attempt in the queue. -++ * Send them out as normal data frames -++ */ -++ if (!tid->active) -++ tx_info->flags &= ~IEEE80211_TX_CTL_AMPDU; -++ -+ if (!(tx_info->flags & IEEE80211_TX_CTL_AMPDU)) { -+ bf->bf_state.bf_type = 0; -+ return bf; -+@@ -1999,6 +2006,7 @@ static void setup_frame_info(struct ieee - an = (struct ath_node *) sta->drv_priv; - - memset(fi, 0, sizeof(*fi)); -@@ -2998,7 +3032,7 @@ Date: Mon May 19 21:20:49 2014 +0200 - if (hw_key) - fi->keyix = hw_key->hw_key_idx; - else if (an && ieee80211_is_data(hdr->frame_control) && an->ps_key > 0) --@@ -2150,6 +2149,7 @@ int ath_tx_start(struct ieee80211_hw *hw -+@@ -2150,6 +2158,7 @@ int ath_tx_start(struct ieee80211_hw *hw - struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); - struct ieee80211_sta *sta = txctl->sta; - struct ieee80211_vif *vif = info->control.vif; -@@ -3006,7 +3040,7 @@ Date: Mon May 19 21:20:49 2014 +0200 - struct ath_softc *sc = hw->priv; - struct ath_txq *txq = txctl->txq; - struct ath_atx_tid *tid = NULL; --@@ -2170,11 +2170,13 @@ int ath_tx_start(struct ieee80211_hw *hw -+@@ -2170,11 +2179,13 @@ int ath_tx_start(struct ieee80211_hw *hw - q = skb_get_queue_mapping(skb); - - ath_txq_lock(sc, txq); diff --git a/patches/openwrt/0031-Reduce-fw3-log-spam-in-netifd-scripts.patch b/patches/openwrt/0031-Reduce-fw3-log-spam-in-netifd-scripts.patch deleted file mode 100644 index 0798c380..00000000 --- a/patches/openwrt/0031-Reduce-fw3-log-spam-in-netifd-scripts.patch +++ /dev/null @@ -1,30 +0,0 @@ -From: Matthias Schiffer -Date: Sat, 26 Jul 2014 17:03:40 +0200 -Subject: Reduce fw3 log spam in netifd scripts - -diff --git a/package/netifd/files/lib/netifd/dhcp.script b/package/netifd/files/lib/netifd/dhcp.script -index db3fc01..a7ce0d8 100755 ---- a/package/netifd/files/lib/netifd/dhcp.script -+++ b/package/netifd/files/lib/netifd/dhcp.script -@@ -50,7 +50,7 @@ setup_interface () { - ip6rd="${ip6rd#* }" - local ip6rdbr="${ip6rd%% *}" - -- [ -n "$ZONE" ] || ZONE=$(fw3 network $INTERFACE) -+ [ -n "$ZONE" ] || ZONE=$(fw3 network $INTERFACE 2>/dev/null) - [ -z "$IFACE6RD" -o "$IFACE6RD" = 1 ] && IFACE6RD=${INTERFACE}_6rd - - json_init -diff --git a/package/odhcp6c/files/dhcpv6.script b/package/odhcp6c/files/dhcpv6.script -index 8c1ba18..146a966 100755 ---- a/package/odhcp6c/files/dhcpv6.script -+++ b/package/odhcp6c/files/dhcpv6.script -@@ -97,7 +97,7 @@ setup_interface () { - MAPRULE="$LW4O6" - fi - -- [ -n "$ZONE" ] || ZONE=$(fw3 network $INTERFACE) -+ [ -n "$ZONE" ] || ZONE=$(fw3 network $INTERFACE 2>/dev/null) - - if [ "$IFACE_MAP" != 0 -a -n "$MAPTYPE" -a -n "$MAPRULE" ]; then - [ -z "$IFACE_MAP" -o "$IFACE_MAP" = 1 ] && IFACE_MAP=${INTERFACE}_map diff --git a/targets/ar71xx-generic/kernel-config b/targets/ar71xx-generic/kernel-config index 20398206..551d0054 100644 --- a/targets/ar71xx-generic/kernel-config +++ b/targets/ar71xx-generic/kernel-config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/mips 3.3.8 Kernel Configuration +# Linux/mips 3.10.49 Kernel Configuration # CONFIG_MIPS=y @@ -19,17 +19,16 @@ CONFIG_ATH79=y # CONFIG_LANTIQ is not set # CONFIG_LASAT is not set # CONFIG_MACH_LOONGSON is not set +# CONFIG_MACH_LOONGSON1 is not set # CONFIG_MIPS_MALTA is not set -# CONFIG_MIPS_SIM is not set +# CONFIG_MIPS_SEAD3 is not set # CONFIG_NEC_MARKEINS is not set # CONFIG_MACH_VR41XX is not set # CONFIG_NXP_STB220 is not set # CONFIG_NXP_STB225 is not set -# CONFIG_PNX8550_JBS is not set -# CONFIG_PNX8550_STB810 is not set # CONFIG_PMC_MSP is not set -# CONFIG_PMC_YOSEMITE is not set # CONFIG_POWERTV is not set +# CONFIG_RALINK is not set # CONFIG_SGI_IP22 is not set # CONFIG_SGI_IP27 is not set # CONFIG_SGI_IP28 is not set @@ -59,10 +58,12 @@ CONFIG_ATH79=y CONFIG_ATH79_MACH_ALFA_AP96=y CONFIG_ATH79_MACH_HORNET_UB=y CONFIG_ATH79_MACH_ALFA_NX=y +CONFIG_ATH79_MACH_TUBE2H=y CONFIG_ATH79_MACH_ALL0258N=y CONFIG_ATH79_MACH_ALL0315N=y CONFIG_ATH79_MACH_AP113=y CONFIG_ATH79_MACH_AP121=y +CONFIG_ATH79_MACH_AP132=y CONFIG_ATH79_MACH_AP136=y CONFIG_ATH79_MACH_AP81=y CONFIG_ATH79_MACH_AP83=y @@ -72,42 +73,67 @@ CONFIG_ATH79_MACH_PB42=y CONFIG_ATH79_MACH_PB44=y CONFIG_ATH79_MACH_PB92=y CONFIG_ATH79_MACH_AW_NR580=y +CONFIG_ATH79_MACH_ESR1750=y CONFIG_ATH79_MACH_WHR_HP_G300N=y CONFIG_ATH79_MACH_WLAE_AG300N=y +CONFIG_ATH79_MACH_WLR8100=y CONFIG_ATH79_MACH_WZR_HP_AG300H=y CONFIG_ATH79_MACH_WZR_HP_G300NH=y CONFIG_ATH79_MACH_WZR_HP_G300NH2=y CONFIG_ATH79_MACH_WZR_HP_G450H=y CONFIG_ATH79_MACH_WP543=y CONFIG_ATH79_MACH_WPE72=y +CONFIG_ATH79_MACH_DIR_505_A1=y CONFIG_ATH79_MACH_DIR_600_A1=y CONFIG_ATH79_MACH_DIR_615_C1=y CONFIG_ATH79_MACH_DIR_825_B1=y +CONFIG_ATH79_MACH_DIR_825_C1=y +CONFIG_ATH79_MACH_DRAGINO2=y +CONFIG_ATH79_MACH_ESR900=y CONFIG_ATH79_MACH_EW_DORIN=y +CONFIG_ATH79_MACH_EL_M150=y +CONFIG_ATH79_MACH_EL_MINI=y +CONFIG_ATH79_MACH_GL_INET=y +CONFIG_ATH79_MACH_EAP300V2=y +CONFIG_ATH79_MACH_GS_OOLITE=y +CONFIG_ATH79_MACH_HIWIFI_HC6361=y CONFIG_ATH79_MACH_JA76PF=y CONFIG_ATH79_MACH_JWAP003=y CONFIG_ATH79_MACH_WRT160NL=y CONFIG_ATH79_MACH_WRT400N=y -CONFIG_ATH79_MACH_RB4XX=y -CONFIG_ATH79_MACH_RB750=y -CONFIG_ATH79_MACH_RB2011=y +# CONFIG_ATH79_MACH_RB4XX is not set +# CONFIG_ATH79_MACH_RB750 is not set +# CONFIG_ATH79_MACH_RB91X is not set +# CONFIG_ATH79_MACH_RB95X is not set +# CONFIG_ATH79_MACH_RB2011 is not set +# CONFIG_ATH79_MACH_RBSXTLITE is not set +CONFIG_ATH79_MACH_WNDAP360=y CONFIG_ATH79_MACH_WNDR3700=y +CONFIG_ATH79_MACH_WNDR4300=y CONFIG_ATH79_MACH_WNR2000=y +CONFIG_ATH79_MACH_WNR2000_V3=y +CONFIG_ATH79_MACH_WNR2200=y CONFIG_ATH79_MACH_OM2P=y +CONFIG_ATH79_MACH_OM5P=y CONFIG_ATH79_MACH_MR600=y CONFIG_ATH79_MACH_MZK_W04NU=y CONFIG_ATH79_MACH_MZK_W300NH=y CONFIG_ATH79_MACH_RW2458N=y CONFIG_ATH79_MACH_CAP4200AG=y CONFIG_ATH79_MACH_EAP7660D=y +CONFIG_ATH79_MACH_ARCHER_C7=y CONFIG_ATH79_MACH_TL_MR11U=y +CONFIG_ATH79_MACH_TL_MR13U=y CONFIG_ATH79_MACH_TL_MR3020=y CONFIG_ATH79_MACH_TL_MR3X20=y +CONFIG_ATH79_MACH_TL_WAX50RE=y +CONFIG_ATH79_MACH_TL_WA830RE_V2=y CONFIG_ATH79_MACH_TL_WA901ND=y CONFIG_ATH79_MACH_TL_WA901ND_V2=y CONFIG_ATH79_MACH_TL_WDR3500=y CONFIG_ATH79_MACH_TL_WDR4300=y CONFIG_ATH79_MACH_TL_WR703N=y +CONFIG_ATH79_MACH_TL_WR720N_V3=y CONFIG_ATH79_MACH_TL_WR741ND=y CONFIG_ATH79_MACH_TL_WR741ND_V4=y CONFIG_ATH79_MACH_TL_WR841N_V1=y @@ -116,14 +142,22 @@ CONFIG_ATH79_MACH_TL_WR841N_V9=y CONFIG_ATH79_MACH_TL_WR941ND=y CONFIG_ATH79_MACH_TL_WR1041N_V2=y CONFIG_ATH79_MACH_TL_WR1043ND=y +CONFIG_ATH79_MACH_TL_WR1043ND_V2=y CONFIG_ATH79_MACH_TL_WR2543N=y CONFIG_ATH79_MACH_TEW_632BRP=y CONFIG_ATH79_MACH_TEW_673GRU=y CONFIG_ATH79_MACH_TEW_712BR=y +CONFIG_ATH79_MACH_TEW_732BR=y CONFIG_ATH79_MACH_UBNT=y CONFIG_ATH79_MACH_UBNT_XM=y +CONFIG_ATH79_MACH_MYNET_N600=y +CONFIG_ATH79_MACH_MYNET_N750=y +CONFIG_ATH79_MACH_MYNET_REXT=y CONFIG_ATH79_MACH_ZCN_1523H=y CONFIG_ATH79_MACH_NBG460N=y +CONFIG_ATH79_MACH_NBG6716=y +CONFIG_ATH79_MACH_CARAMBOLA2=y +CONFIG_ATH79_MACH_BHU_BXU2000N2_A=y CONFIG_SOC_AR71XX=y CONFIG_SOC_AR724X=y CONFIG_SOC_AR913X=y @@ -131,10 +165,10 @@ CONFIG_SOC_AR933X=y CONFIG_SOC_AR934X=y CONFIG_SOC_QCA953X=y CONFIG_SOC_QCA955X=y +CONFIG_ATH79_DEV_M25P80=y CONFIG_ATH79_DEV_AP9X_PCI=y CONFIG_ATH79_DEV_DSA=y CONFIG_ATH79_DEV_ETH=y -CONFIG_ATH79_DEV_M25P80=y CONFIG_ATH79_DEV_GPIO_BUTTONS=y CONFIG_ATH79_DEV_LEDS_GPIO=y CONFIG_ATH79_DEV_NFC=y @@ -143,19 +177,15 @@ CONFIG_ATH79_DEV_USB=y CONFIG_ATH79_DEV_WMAC=y CONFIG_ATH79_NVRAM=y CONFIG_ATH79_PCI_ATH9K_FIXUP=y -CONFIG_ATH79_ROUTERBOOT=y +# CONFIG_ATH79_ROUTERBOOT is not set CONFIG_PCI_AR724X=y CONFIG_RWSEM_GENERIC_SPINLOCK=y # CONFIG_ARCH_HAS_ILOG2_U32 is not set # CONFIG_ARCH_HAS_ILOG2_U64 is not set CONFIG_GENERIC_HWEIGHT=y CONFIG_GENERIC_CALIBRATE_DELAY=y -CONFIG_GENERIC_CLOCKEVENTS=y -CONFIG_GENERIC_CMOS_UPDATE=y CONFIG_SCHED_OMIT_FRAME_POINTER=y -CONFIG_CEVT_R4K_LIB=y CONFIG_CEVT_R4K=y -CONFIG_CSRC_R4K_LIB=y CONFIG_CSRC_R4K=y # CONFIG_ARCH_DMA_ADDR_T_64BIT is not set CONFIG_DMA_NONCOHERENT=y @@ -166,9 +196,9 @@ CONFIG_MYLOADER=y CONFIG_MIPS_MACHINE=y CONFIG_IMAGE_CMDLINE_HACK=y # CONFIG_NO_IOPORT is not set -CONFIG_GENERIC_GPIO=y CONFIG_CPU_BIG_ENDIAN=y CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y +# CONFIG_MIPS_HUGE_TLB_SUPPORT is not set CONFIG_IRQ_CPU=y CONFIG_MIPS_L1_CACHE_SHIFT=5 @@ -187,23 +217,26 @@ CONFIG_HARDWARE_WATCHPOINTS=y # Kernel type # CONFIG_32BIT=y +# CONFIG_KVM_GUEST is not set CONFIG_PAGE_SIZE_4KB=y # CONFIG_PAGE_SIZE_16KB is not set # CONFIG_PAGE_SIZE_64KB is not set CONFIG_FORCE_MAX_ZONEORDER=11 CONFIG_CPU_HAS_PREFETCH=y +CONFIG_CPU_GENERIC_DUMP_TLB=y +CONFIG_CPU_R4K_FPU=y +CONFIG_CPU_R4K_CACHE_TLB=y CONFIG_MIPS_MT_DISABLED=y # CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set CONFIG_CPU_HAS_SYNC=y CONFIG_CPU_SUPPORTS_HIGHMEM=y CONFIG_ARCH_FLATMEM_ENABLE=y -CONFIG_SELECT_MEMORY_MODEL=y -CONFIG_FLATMEM_MANUAL=y CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y CONFIG_HAVE_MEMBLOCK=y CONFIG_HAVE_MEMBLOCK_NODE_MAP=y CONFIG_ARCH_DISCARD_MEMBLOCK=y +# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set CONFIG_PAGEFLAGS_EXTENDED=y CONFIG_SPLIT_PTLOCK_CPUS=4 # CONFIG_COMPACTION is not set @@ -212,12 +245,10 @@ CONFIG_ZONE_DMA_FLAG=0 CONFIG_VIRT_TO_BUS=y # CONFIG_KSM is not set CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 +# CONFIG_CROSS_MEMORY_ATTACH is not set CONFIG_NEED_PER_CPU_KM=y # CONFIG_CLEANCACHE is not set -CONFIG_TICK_ONESHOT=y -# CONFIG_NO_HZ is not set -CONFIG_HIGH_RES_TIMERS=y -CONFIG_GENERIC_CLOCKEVENTS_BUILD=y +# CONFIG_FRONTSWAP is not set # CONFIG_HZ_48 is not set CONFIG_HZ_100=y # CONFIG_HZ_128 is not set @@ -231,18 +262,18 @@ CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set # CONFIG_KEXEC is not set +# CONFIG_CRASH_DUMP is not set # CONFIG_SECCOMP is not set -# CONFIG_USE_OF is not set CONFIG_BOOT_RAW=y CONFIG_LOCKDEP_SUPPORT=y CONFIG_STACKTRACE_SUPPORT=y CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" -CONFIG_HAVE_IRQ_WORK=y +CONFIG_IRQ_WORK=y +CONFIG_BUILDTIME_EXTABLE_SORT=y # # General setup # -CONFIG_EXPERIMENTAL=y CONFIG_BROKEN_ON_SMP=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_CROSS_COMPILE="" @@ -253,9 +284,7 @@ CONFIG_SWAP=y CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y # CONFIG_POSIX_MQUEUE is not set -# CONFIG_BSD_PROCESS_ACCT is not set # CONFIG_FHANDLE is not set -# CONFIG_TASKSTATS is not set # CONFIG_AUDIT is not set CONFIG_HAVE_GENERIC_HARDIRQS=y @@ -265,16 +294,38 @@ CONFIG_HAVE_GENERIC_HARDIRQS=y CONFIG_GENERIC_HARDIRQS=y CONFIG_GENERIC_IRQ_PROBE=y CONFIG_GENERIC_IRQ_SHOW=y +CONFIG_IRQ_DOMAIN=y +# CONFIG_IRQ_DOMAIN_DEBUG is not set CONFIG_IRQ_FORCED_THREADING=y +CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_GENERIC_CLOCKEVENTS_BUILD=y +CONFIG_GENERIC_CMOS_UPDATE=y + +# +# Timers subsystem +# +CONFIG_TICK_ONESHOT=y +CONFIG_HZ_PERIODIC=y +# CONFIG_NO_HZ_IDLE is not set +# CONFIG_NO_HZ is not set +CONFIG_HIGH_RES_TIMERS=y + +# +# CPU/Task time and stats accounting +# +CONFIG_TICK_CPU_ACCOUNTING=y +# CONFIG_BSD_PROCESS_ACCT is not set +# CONFIG_TASKSTATS is not set # # RCU Subsystem # CONFIG_TINY_RCU=y # CONFIG_PREEMPT_RCU is not set -# CONFIG_RCU_TRACE is not set +# CONFIG_RCU_STALL_COMMON is not set # CONFIG_TREE_RCU_TRACE is not set -# CONFIG_IKCONFIG is not set +CONFIG_IKCONFIG=m +CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=17 # CONFIG_CGROUPS is not set # CONFIG_CHECKPOINT_RESTORE is not set @@ -287,16 +338,18 @@ CONFIG_BLK_DEV_INITRD=y CONFIG_INITRAMFS_SOURCE="" # CONFIG_RD_GZIP is not set # CONFIG_RD_BZIP2 is not set -CONFIG_RD_LZMA=y +# CONFIG_RD_LZMA is not set # CONFIG_RD_XZ is not set # CONFIG_RD_LZO is not set CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_SYSCTL=y CONFIG_ANON_INODES=y +# CONFIG_KALLSYMS_UNCOMPRESSED is not set +CONFIG_HOTPLUG=y CONFIG_EXPERT=y # CONFIG_SYSCTL_SYSCALL is not set -# CONFIG_KALLSYMS is not set -CONFIG_HOTPLUG=y +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_ALL is not set CONFIG_PRINTK=y CONFIG_BUG=y CONFIG_ELF_CORE=y @@ -308,6 +361,7 @@ CONFIG_TIMERFD=y CONFIG_EVENTFD=y CONFIG_SHMEM=y # CONFIG_AIO is not set +CONFIG_PCI_QUIRKS=y CONFIG_EMBEDDED=y CONFIG_HAVE_PERF_EVENTS=y CONFIG_PERF_USE_VMALLOC=y @@ -316,9 +370,7 @@ CONFIG_PERF_USE_VMALLOC=y # Kernel Performance Events And Counters # # CONFIG_PERF_EVENTS is not set -# CONFIG_PERF_COUNTERS is not set # CONFIG_VM_EVENT_COUNTERS is not set -CONFIG_PCI_QUIRKS=y # CONFIG_SLUB_DEBUG is not set # CONFIG_COMPAT_BRK is not set # CONFIG_SLAB is not set @@ -328,11 +380,18 @@ CONFIG_SLUB=y CONFIG_HAVE_OPROFILE=y # CONFIG_KPROBES is not set # CONFIG_JUMP_LABEL is not set +# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set CONFIG_HAVE_KPROBES=y CONFIG_HAVE_KRETPROBES=y CONFIG_HAVE_DMA_ATTRS=y +CONFIG_GENERIC_SMP_IDLE_THREAD=y +CONFIG_HAVE_CLK=y CONFIG_HAVE_DMA_API_DEBUG=y CONFIG_HAVE_ARCH_JUMP_LABEL=y +CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y +CONFIG_HAVE_MOD_ARCH_SPECIFIC=y +CONFIG_MODULES_USE_ELF_REL=y +CONFIG_CLONE_BACKWARDS=y # # GCOV-based kernel profiling @@ -347,9 +406,11 @@ CONFIG_MODULE_UNLOAD=y # CONFIG_MODULE_FORCE_UNLOAD is not set # CONFIG_MODVERSIONS is not set # CONFIG_MODULE_SRCVERSION_ALL is not set +# CONFIG_MODULE_SIG is not set +CONFIG_MODULE_STRIPPED=y CONFIG_BLOCK=y CONFIG_LBDAF=y -CONFIG_BLK_DEV_BSG=y +# CONFIG_BLK_DEV_BSG is not set # CONFIG_BLK_DEV_BSGLIB is not set # CONFIG_BLK_DEV_INTEGRITY is not set @@ -384,35 +445,11 @@ CONFIG_IOSCHED_DEADLINE=y CONFIG_DEFAULT_DEADLINE=y # CONFIG_DEFAULT_NOOP is not set CONFIG_DEFAULT_IOSCHED="deadline" -# CONFIG_INLINE_SPIN_TRYLOCK is not set -# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set -# CONFIG_INLINE_SPIN_LOCK is not set -# CONFIG_INLINE_SPIN_LOCK_BH is not set -# CONFIG_INLINE_SPIN_LOCK_IRQ is not set -# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set -CONFIG_INLINE_SPIN_UNLOCK=y -# CONFIG_INLINE_SPIN_UNLOCK_BH is not set CONFIG_INLINE_SPIN_UNLOCK_IRQ=y -# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set -# CONFIG_INLINE_READ_TRYLOCK is not set -# CONFIG_INLINE_READ_LOCK is not set -# CONFIG_INLINE_READ_LOCK_BH is not set -# CONFIG_INLINE_READ_LOCK_IRQ is not set -# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set CONFIG_INLINE_READ_UNLOCK=y -# CONFIG_INLINE_READ_UNLOCK_BH is not set CONFIG_INLINE_READ_UNLOCK_IRQ=y -# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set -# CONFIG_INLINE_WRITE_TRYLOCK is not set -# CONFIG_INLINE_WRITE_LOCK is not set -# CONFIG_INLINE_WRITE_LOCK_BH is not set -# CONFIG_INLINE_WRITE_LOCK_IRQ is not set -# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set CONFIG_INLINE_WRITE_UNLOCK=y -# CONFIG_INLINE_WRITE_UNLOCK_BH is not set CONFIG_INLINE_WRITE_UNLOCK_IRQ=y -# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set -# CONFIG_MUTEX_SPIN_ON_OWNER is not set # CONFIG_FREEZER is not set # @@ -421,13 +458,14 @@ CONFIG_INLINE_WRITE_UNLOCK_IRQ=y CONFIG_HW_HAS_PCI=y CONFIG_PCI=y CONFIG_PCI_DOMAINS=y -# CONFIG_ARCH_SUPPORTS_MSI is not set # CONFIG_PCI_DEBUG is not set +# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set # CONFIG_PCI_STUB is not set CONFIG_PCI_DISABLE_COMMON_QUIRKS=y # CONFIG_PCI_IOV is not set # CONFIG_PCI_PRI is not set # CONFIG_PCI_PASID is not set +# CONFIG_PCIEPORTBUS is not set CONFIG_MMU=y # CONFIG_PCCARD is not set # CONFIG_HOTPLUG_PCI is not set @@ -439,8 +477,10 @@ CONFIG_MMU=y CONFIG_BINFMT_ELF=y CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set +CONFIG_BINFMT_SCRIPT=y # CONFIG_HAVE_AOUT is not set # CONFIG_BINFMT_MISC is not set +CONFIG_COREDUMP=y CONFIG_TRAD_SIGNALS=y # @@ -458,9 +498,11 @@ CONFIG_ETHERNET_PACKET_MANGLE=y # Networking options # CONFIG_PACKET=y +# CONFIG_PACKET_DIAG is not set CONFIG_UNIX=y # CONFIG_UNIX_DIAG is not set CONFIG_XFRM=y +CONFIG_XFRM_ALGO=m CONFIG_XFRM_USER=m # CONFIG_XFRM_SUB_POLICY is not set # CONFIG_XFRM_MIGRATE is not set @@ -479,6 +521,7 @@ CONFIG_IP_ROUTE_CLASSID=y # CONFIG_IP_PNP is not set CONFIG_NET_IPIP=m CONFIG_NET_IPGRE_DEMUX=m +CONFIG_NET_IP_TUNNEL=m CONFIG_NET_IPGRE=m CONFIG_NET_IPGRE_BROADCAST=y CONFIG_IP_MROUTE=y @@ -487,6 +530,7 @@ CONFIG_IP_MROUTE_MULTIPLE_TABLES=y # CONFIG_IP_PIMSM_V2 is not set CONFIG_ARPD=y CONFIG_SYN_COOKIES=y +# CONFIG_NET_IPVTI is not set CONFIG_INET_AH=m CONFIG_INET_ESP=m CONFIG_INET_IPCOMP=m @@ -532,6 +576,7 @@ CONFIG_IPV6_SIT=m CONFIG_IPV6_SIT_6RD=y CONFIG_IPV6_NDISC_NODETYPE=y CONFIG_IPV6_TUNNEL=m +CONFIG_IPV6_GRE=m CONFIG_IPV6_MULTIPLE_TABLES=y CONFIG_IPV6_SUBTREES=y CONFIG_IPV6_MROUTE=y @@ -556,6 +601,7 @@ CONFIG_NF_CONNTRACK_MARK=y # CONFIG_NF_CONNTRACK_ZONES is not set CONFIG_NF_CONNTRACK_PROCFS=y # CONFIG_NF_CONNTRACK_EVENTS is not set +# CONFIG_NF_CONNTRACK_TIMEOUT is not set # CONFIG_NF_CONNTRACK_TIMESTAMP is not set # CONFIG_NF_CT_PROTO_DCCP is not set CONFIG_NF_CT_PROTO_GRE=m @@ -573,6 +619,15 @@ CONFIG_NF_CONNTRACK_PPTP=m CONFIG_NF_CONNTRACK_SIP=m CONFIG_NF_CONNTRACK_TFTP=m CONFIG_NF_CT_NETLINK=m +# CONFIG_NF_CT_NETLINK_TIMEOUT is not set +# CONFIG_NETFILTER_NETLINK_QUEUE_CT is not set +CONFIG_NF_NAT=m +CONFIG_NF_NAT_NEEDED=y +CONFIG_NF_NAT_AMANDA=m +CONFIG_NF_NAT_FTP=m +CONFIG_NF_NAT_IRC=m +CONFIG_NF_NAT_SIP=m +CONFIG_NF_NAT_TFTP=m CONFIG_NETFILTER_TPROXY=m CONFIG_NETFILTER_XTABLES=m @@ -587,17 +642,21 @@ CONFIG_NETFILTER_XT_CONNMARK=m # # CONFIG_NETFILTER_XT_TARGET_CHECKSUM is not set CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m -CONFIG_NETFILTER_XT_TARGET_CONNMARK=m +# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set CONFIG_NETFILTER_XT_TARGET_CT=m CONFIG_NETFILTER_XT_TARGET_DSCP=m CONFIG_NETFILTER_XT_TARGET_HL=m +# CONFIG_NETFILTER_XT_TARGET_HMARK is not set # CONFIG_NETFILTER_XT_TARGET_IDLETIMER is not set CONFIG_NETFILTER_XT_TARGET_LED=m -CONFIG_NETFILTER_XT_TARGET_MARK=m +CONFIG_NETFILTER_XT_TARGET_LOG=m +# CONFIG_NETFILTER_XT_TARGET_MARK is not set +CONFIG_NETFILTER_XT_TARGET_NETMAP=m # CONFIG_NETFILTER_XT_TARGET_NFLOG is not set # CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set CONFIG_NETFILTER_XT_TARGET_NOTRACK=m # CONFIG_NETFILTER_XT_TARGET_RATEEST is not set +CONFIG_NETFILTER_XT_TARGET_REDIRECT=m CONFIG_NETFILTER_XT_TARGET_TEE=m CONFIG_NETFILTER_XT_TARGET_TPROXY=m # CONFIG_NETFILTER_XT_TARGET_TRACE is not set @@ -607,12 +666,14 @@ CONFIG_NETFILTER_XT_TARGET_TCPMSS=m # # Xtables matches # -# CONFIG_NETFILTER_XT_MATCH_ADDRTYPE is not set +CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m +# CONFIG_NETFILTER_XT_MATCH_BPF is not set # CONFIG_NETFILTER_XT_MATCH_CLUSTER is not set CONFIG_NETFILTER_XT_MATCH_COMMENT=m CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m -# CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set -CONFIG_NETFILTER_XT_MATCH_CONNMARK=m +# CONFIG_NETFILTER_XT_MATCH_CONNLABEL is not set +CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m +# CONFIG_NETFILTER_XT_MATCH_CONNMARK is not set CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m # CONFIG_NETFILTER_XT_MATCH_CPU is not set # CONFIG_NETFILTER_XT_MATCH_DCCP is not set @@ -624,12 +685,10 @@ CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m CONFIG_NETFILTER_XT_MATCH_HELPER=m CONFIG_NETFILTER_XT_MATCH_HL=m CONFIG_NETFILTER_XT_MATCH_IPRANGE=m -CONFIG_NETFILTER_XT_MATCH_LAYER7=m -# CONFIG_NETFILTER_XT_MATCH_LAYER7_DEBUG is not set CONFIG_NETFILTER_XT_MATCH_LENGTH=m CONFIG_NETFILTER_XT_MATCH_LIMIT=m CONFIG_NETFILTER_XT_MATCH_MAC=m -CONFIG_NETFILTER_XT_MATCH_MARK=m +# CONFIG_NETFILTER_XT_MATCH_MARK is not set CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m # CONFIG_NETFILTER_XT_MATCH_NFACCT is not set # CONFIG_NETFILTER_XT_MATCH_OSF is not set @@ -658,7 +717,6 @@ CONFIG_NETFILTER_XT_MATCH_U32=m CONFIG_NF_DEFRAG_IPV4=m CONFIG_NF_CONNTRACK_IPV4=m # CONFIG_NF_CONNTRACK_PROC_COMPAT is not set -CONFIG_IP_NF_QUEUE=m CONFIG_IP_NF_IPTABLES=m CONFIG_IP_NF_MATCH_AH=m # CONFIG_IP_NF_MATCH_ECN is not set @@ -666,22 +724,15 @@ CONFIG_IP_NF_MATCH_AH=m # CONFIG_IP_NF_MATCH_TTL is not set CONFIG_IP_NF_FILTER=m CONFIG_IP_NF_TARGET_REJECT=m -CONFIG_IP_NF_TARGET_LOG=m CONFIG_IP_NF_TARGET_ULOG=m -CONFIG_NF_NAT=m -CONFIG_NF_NAT_NEEDED=y +CONFIG_NF_NAT_IPV4=m CONFIG_IP_NF_TARGET_MASQUERADE=m CONFIG_IP_NF_TARGET_NETMAP=m CONFIG_IP_NF_TARGET_REDIRECT=m CONFIG_NF_NAT_SNMP_BASIC=m CONFIG_NF_NAT_PROTO_GRE=m -CONFIG_NF_NAT_FTP=m -CONFIG_NF_NAT_IRC=m -CONFIG_NF_NAT_TFTP=m -CONFIG_NF_NAT_AMANDA=m CONFIG_NF_NAT_PPTP=m CONFIG_NF_NAT_H323=m -CONFIG_NF_NAT_SIP=m CONFIG_IP_NF_MANGLE=m # CONFIG_IP_NF_TARGET_CLUSTERIP is not set CONFIG_IP_NF_TARGET_ECN=m @@ -696,7 +747,6 @@ CONFIG_IP_NF_ARP_MANGLE=m # CONFIG_NF_DEFRAG_IPV6=m CONFIG_NF_CONNTRACK_IPV6=m -CONFIG_IP6_NF_QUEUE=m CONFIG_IP6_NF_IPTABLES=m CONFIG_IP6_NF_MATCH_AH=m CONFIG_IP6_NF_MATCH_EUI64=m @@ -708,11 +758,13 @@ CONFIG_IP6_NF_MATCH_MH=m # CONFIG_IP6_NF_MATCH_RPFILTER is not set CONFIG_IP6_NF_MATCH_RT=m # CONFIG_IP6_NF_TARGET_HL is not set -CONFIG_IP6_NF_TARGET_LOG=m CONFIG_IP6_NF_FILTER=m CONFIG_IP6_NF_TARGET_REJECT=m CONFIG_IP6_NF_MANGLE=m CONFIG_IP6_NF_RAW=m +CONFIG_NF_NAT_IPV6=m +CONFIG_IP6_NF_TARGET_MASQUERADE=m +CONFIG_IP6_NF_TARGET_NPT=m CONFIG_BRIDGE_NF_EBTABLES=m CONFIG_BRIDGE_EBT_BROUTE=m CONFIG_BRIDGE_EBT_T_FILTER=m @@ -739,9 +791,11 @@ CONFIG_BRIDGE_EBT_NFLOG=m CONFIG_IP_SCTP=m # CONFIG_SCTP_DBG_MSG is not set # CONFIG_SCTP_DBG_OBJCNT is not set -# CONFIG_SCTP_HMAC_NONE is not set -# CONFIG_SCTP_HMAC_SHA1 is not set -CONFIG_SCTP_HMAC_MD5=y +CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5=y +# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1 is not set +# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set +CONFIG_SCTP_COOKIE_HMAC_MD5=y +# CONFIG_SCTP_COOKIE_HMAC_SHA1 is not set # CONFIG_RDS is not set # CONFIG_TIPC is not set CONFIG_ATM=m @@ -758,12 +812,13 @@ CONFIG_L2TP_ETH=m CONFIG_STP=y CONFIG_BRIDGE=y CONFIG_BRIDGE_IGMP_SNOOPING=y +# CONFIG_BRIDGE_VLAN_FILTERING is not set +CONFIG_HAVE_NET_DSA=y CONFIG_NET_DSA=y -# CONFIG_NET_DSA_TAG_DSA is not set -# CONFIG_NET_DSA_TAG_EDSA is not set CONFIG_NET_DSA_TAG_TRAILER=y CONFIG_VLAN_8021Q=y # CONFIG_VLAN_8021Q_GVRP is not set +# CONFIG_VLAN_8021Q_MVRP is not set # CONFIG_DECNET is not set CONFIG_LLC=y # CONFIG_LLC2 is not set @@ -772,11 +827,8 @@ CONFIG_ATALK=m CONFIG_DEV_APPLETALK=m CONFIG_IPDDP=m CONFIG_IPDDP_ENCAP=y -CONFIG_IPDDP_DECAP=y # CONFIG_X25 is not set # CONFIG_LAPB is not set -# CONFIG_ECONET is not set -# CONFIG_WAN_ROUTER is not set # CONFIG_PHONET is not set # CONFIG_IEEE802154 is not set CONFIG_NET_SCHED=y @@ -805,8 +857,9 @@ CONFIG_NET_SCH_NETEM=m # CONFIG_NET_SCH_CHOKE is not set # CONFIG_NET_SCH_QFQ is not set CONFIG_NET_SCH_CODEL=m -CONFIG_NET_SCH_FQ_CODEL=m +CONFIG_NET_SCH_FQ_CODEL=y CONFIG_NET_SCH_INGRESS=m +# CONFIG_NET_SCH_PLUG is not set # # Classification @@ -817,7 +870,7 @@ CONFIG_NET_CLS_TCINDEX=m CONFIG_NET_CLS_ROUTE4=m CONFIG_NET_CLS_FW=m CONFIG_NET_CLS_U32=m -CONFIG_CLS_U32_PERF=y +# CONFIG_CLS_U32_PERF is not set CONFIG_CLS_U32_MARK=y # CONFIG_NET_CLS_RSVP is not set # CONFIG_NET_CLS_RSVP6 is not set @@ -829,6 +882,7 @@ CONFIG_NET_EMATCH_NBYTE=m CONFIG_NET_EMATCH_U32=m CONFIG_NET_EMATCH_META=m CONFIG_NET_EMATCH_TEXT=m +# CONFIG_NET_EMATCH_CANID is not set CONFIG_NET_CLS_ACT=y CONFIG_NET_ACT_POLICE=m # CONFIG_NET_ACT_GACT is not set @@ -843,8 +897,12 @@ CONFIG_NET_ACT_CONNMARK=m CONFIG_NET_CLS_IND=y CONFIG_NET_SCH_FIFO=y # CONFIG_DCB is not set +CONFIG_DNS_RESOLVER=m # CONFIG_BATMAN_ADV is not set # CONFIG_OPENVSWITCH is not set +# CONFIG_VSOCKETS is not set +# CONFIG_NETLINK_MMAP is not set +# CONFIG_NETLINK_DIAG is not set CONFIG_BQL=y # @@ -870,7 +928,37 @@ CONFIG_MKISS=m # CONFIG_BAYCOM_SER_FDX is not set # CONFIG_BAYCOM_SER_HDX is not set # CONFIG_YAM is not set -# CONFIG_CAN is not set +CONFIG_CAN=m +CONFIG_CAN_RAW=m +CONFIG_CAN_BCM=m +CONFIG_CAN_GW=m + +# +# CAN Device Drivers +# +CONFIG_CAN_VCAN=m +CONFIG_CAN_SLCAN=m +CONFIG_CAN_DEV=m +CONFIG_CAN_CALC_BITTIMING=y +CONFIG_CAN_LEDS=y +# CONFIG_CAN_MCP251X is not set +# CONFIG_PCH_CAN is not set +# CONFIG_CAN_SJA1000 is not set +CONFIG_CAN_C_CAN=m +CONFIG_CAN_C_CAN_PLATFORM=m +CONFIG_CAN_C_CAN_PCI=m +# CONFIG_CAN_CC770 is not set + +# +# CAN USB interfaces +# +CONFIG_CAN_EMS_USB=m +CONFIG_CAN_ESD_USB2=m +CONFIG_CAN_KVASER_USB=m +CONFIG_CAN_PEAK_USB=m +CONFIG_CAN_8DEV_USB=m +# CONFIG_CAN_SOFTING is not set +# CONFIG_CAN_DEBUG_DEVICES is not set # CONFIG_IRDA is not set CONFIG_BT=m CONFIG_BT_RFCOMM=m @@ -891,13 +979,16 @@ CONFIG_BT_HCIUART_H4=y CONFIG_BT_HCIUART_BCSP=y # CONFIG_BT_HCIUART_ATH3K is not set # CONFIG_BT_HCIUART_LL is not set +# CONFIG_BT_HCIUART_3WIRE is not set # CONFIG_BT_HCIBCM203X is not set # CONFIG_BT_HCIBPA10X is not set # CONFIG_BT_HCIBFUSB is not set # CONFIG_BT_HCIVHCI is not set # CONFIG_BT_MRVL is not set # CONFIG_BT_ATH3K is not set -# CONFIG_AF_RXRPC is not set +CONFIG_AF_RXRPC=m +# CONFIG_AF_RXRPC_DEBUG is not set +CONFIG_RXKAD=m CONFIG_FIB_RULES=y CONFIG_WIRELESS=y CONFIG_WIRELESS_EXT=y @@ -906,7 +997,6 @@ CONFIG_WEXT_PROC=y CONFIG_WEXT_SPY=y CONFIG_WEXT_PRIV=y # CONFIG_CFG80211 is not set -# CONFIG_WIRELESS_EXT_SYSFS is not set CONFIG_LIB80211=m CONFIG_LIB80211_CRYPT_WEP=m CONFIG_LIB80211_CRYPT_CCMP=m @@ -917,9 +1007,7 @@ CONFIG_LIB80211_CRYPT_TKIP=m # CFG80211 needs to be enabled for MAC80211 # # CONFIG_WIMAX is not set -CONFIG_RFKILL=m -CONFIG_RFKILL_LEDS=y -CONFIG_RFKILL_INPUT=y +# CONFIG_RFKILL is not set # CONFIG_NET_9P is not set # CONFIG_CAIF is not set # CONFIG_CEPH_LIB is not set @@ -939,19 +1027,44 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y CONFIG_FW_LOADER=y # CONFIG_FIRMWARE_IN_KERNEL is not set CONFIG_EXTRA_FIRMWARE="" +CONFIG_FW_LOADER_USER_HELPER=y # CONFIG_DEBUG_DRIVER is not set # CONFIG_DEBUG_DEVRES is not set # CONFIG_SYS_HYPERVISOR is not set # CONFIG_GENERIC_CPU_DEVICES is not set -CONFIG_REGMAP=y +CONFIG_REGMAP=m CONFIG_REGMAP_I2C=m CONFIG_REGMAP_SPI=m -# CONFIG_DMA_SHARED_BUFFER is not set +CONFIG_DMA_SHARED_BUFFER=y + +# +# Bus devices +# # CONFIG_CONNECTOR is not set CONFIG_MTD=y -CONFIG_MTD_TESTS=m + +# +# OpenWrt specific MTD options +# CONFIG_MTD_ROOTFS_ROOT_DEV=y CONFIG_MTD_ROOTFS_SPLIT=y +CONFIG_MTD_SPLIT_FIRMWARE=y +CONFIG_MTD_SPLIT_FIRMWARE_NAME="firmware" +# CONFIG_MTD_UIMAGE_SPLIT is not set + +# +# Rootfs partition parsers +# +CONFIG_MTD_SPLIT_SQUASHFS_ROOT=y + +# +# Firmware partition parsers +# +CONFIG_MTD_SPLIT_SEAMA_FW=y +CONFIG_MTD_SPLIT_UIMAGE_FW=y +CONFIG_MTD_SPLIT_LZMA_FW=y +CONFIG_MTD_SPLIT=y +CONFIG_MTD_TESTS=m CONFIG_MTD_REDBOOT_PARTS=y CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-2 # CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set @@ -965,7 +1078,6 @@ CONFIG_MTD_TPLINK_PARTS=y # # User Modules And Translation Layers # -CONFIG_MTD_CHAR=y CONFIG_MTD_BLKDEVS=y CONFIG_MTD_BLOCK=y # CONFIG_FTL is not set @@ -981,19 +1093,24 @@ CONFIG_MTD_BLOCK=y # RAM/ROM/Flash chip drivers # CONFIG_MTD_CFI=y -CONFIG_MTD_JEDECPROBE=y +# CONFIG_MTD_JEDECPROBE is not set CONFIG_MTD_GEN_PROBE=y -# CONFIG_MTD_CFI_ADV_OPTIONS is not set -CONFIG_MTD_MAP_BANK_WIDTH_1=y +CONFIG_MTD_CFI_ADV_OPTIONS=y +CONFIG_MTD_CFI_NOSWAP=y +# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set +# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set +CONFIG_MTD_CFI_GEOMETRY=y +# CONFIG_MTD_MAP_BANK_WIDTH_1 is not set CONFIG_MTD_MAP_BANK_WIDTH_2=y -CONFIG_MTD_MAP_BANK_WIDTH_4=y +# CONFIG_MTD_MAP_BANK_WIDTH_4 is not set # CONFIG_MTD_MAP_BANK_WIDTH_8 is not set # CONFIG_MTD_MAP_BANK_WIDTH_16 is not set # CONFIG_MTD_MAP_BANK_WIDTH_32 is not set CONFIG_MTD_CFI_I1=y -CONFIG_MTD_CFI_I2=y +# CONFIG_MTD_CFI_I2 is not set # CONFIG_MTD_CFI_I4 is not set # CONFIG_MTD_CFI_I8 is not set +# CONFIG_MTD_OTP is not set # CONFIG_MTD_CFI_INTELEXT is not set CONFIG_MTD_CFI_AMDSTD=y # CONFIG_MTD_CFI_STAA is not set @@ -1031,28 +1148,23 @@ CONFIG_MTD_BLOCK2MTD=m # # Disk-On-Chip Device Drivers # -# CONFIG_MTD_DOC2000 is not set -# CONFIG_MTD_DOC2001 is not set -# CONFIG_MTD_DOC2001PLUS is not set # CONFIG_MTD_DOCG3 is not set CONFIG_MTD_NAND_ECC=m # CONFIG_MTD_NAND_ECC_SMC is not set CONFIG_MTD_NAND=m -# CONFIG_MTD_NAND_VERIFY_WRITE is not set # CONFIG_MTD_NAND_ECC_BCH is not set # CONFIG_MTD_SM_COMMON is not set -# CONFIG_MTD_NAND_MUSEUM_IDS is not set # CONFIG_MTD_NAND_DENALI is not set CONFIG_MTD_NAND_IDS=m # CONFIG_MTD_NAND_RICOH is not set # CONFIG_MTD_NAND_DISKONCHIP is not set +# CONFIG_MTD_NAND_DOCG4 is not set # CONFIG_MTD_NAND_CAFE is not set CONFIG_MTD_NAND_NANDSIM=m # CONFIG_MTD_NAND_PLATFORM is not set # CONFIG_MTD_ALAUDA is not set -# CONFIG_MTD_NAND_RB4XX is not set -# CONFIG_MTD_NAND_RB750 is not set CONFIG_MTD_NAND_AR934X=m +CONFIG_MTD_NAND_AR934X_HW_ECC=y # CONFIG_MTD_ONENAND is not set # @@ -1071,30 +1183,30 @@ CONFIG_BLK_DEV=y CONFIG_BLK_DEV_LOOP=m CONFIG_BLK_DEV_LOOP_MIN_COUNT=8 # CONFIG_BLK_DEV_CRYPTOLOOP is not set - -# -# DRBD disabled because PROC_FS, INET or CONNECTOR not selected -# +# CONFIG_BLK_DEV_DRBD is not set CONFIG_BLK_DEV_NBD=m # CONFIG_BLK_DEV_NVME is not set # CONFIG_BLK_DEV_SX8 is not set -# CONFIG_BLK_DEV_UB is not set # CONFIG_BLK_DEV_RAM is not set # CONFIG_CDROM_PKTCDVD is not set CONFIG_ATA_OVER_ETH=m # CONFIG_BLK_DEV_HD is not set # CONFIG_BLK_DEV_RBD is not set +# CONFIG_BLK_DEV_RSXX is not set # # Misc devices # # CONFIG_SENSORS_LIS3LV02D is not set # CONFIG_AD525X_DPOT is not set +# CONFIG_ATMEL_PWM is not set +# CONFIG_DUMMY_IRQ is not set # CONFIG_PHANTOM is not set # CONFIG_INTEL_MID_PTI is not set # CONFIG_SGI_IOC4 is not set # CONFIG_TIFM_CORE is not set # CONFIG_ICS932S401 is not set +# CONFIG_ATMEL_SSC is not set # CONFIG_ENCLOSURE_SERVICES is not set # CONFIG_HP_ILO is not set # CONFIG_APDS9802ALS is not set @@ -1107,9 +1219,12 @@ CONFIG_ATA_OVER_ETH=m # CONFIG_HMC6352 is not set # CONFIG_DS1682 is not set # CONFIG_TI_DAC7512 is not set -# CONFIG_BMP085 is not set +# CONFIG_BMP085_I2C is not set +# CONFIG_BMP085_SPI is not set # CONFIG_PCH_PHUB is not set # CONFIG_USB_SWITCH_FSA9480 is not set +# CONFIG_LATTICE_ECP3_CONFIG is not set +# CONFIG_SRAM is not set # CONFIG_C2PORT is not set # @@ -1122,7 +1237,6 @@ CONFIG_EEPROM_AT25=m CONFIG_EEPROM_93CX6=m # CONFIG_EEPROM_93XX46 is not set # CONFIG_CB710_CORE is not set -# CONFIG_IWMC3200TOP is not set # # Texas Instruments shared transport line discipline @@ -1216,7 +1330,6 @@ CONFIG_SCSI_MULTI_LUN=y # CONFIG_SCSI_CONSTANTS is not set # CONFIG_SCSI_LOGGING is not set # CONFIG_SCSI_SCAN_ASYNC is not set -CONFIG_SCSI_WAIT_SCAN=m # # SCSI Transports @@ -1224,10 +1337,8 @@ CONFIG_SCSI_WAIT_SCAN=m # CONFIG_SCSI_SPI_ATTRS is not set # CONFIG_SCSI_FC_ATTRS is not set # CONFIG_SCSI_ISCSI_ATTRS is not set -CONFIG_SCSI_SAS_ATTRS=m -CONFIG_SCSI_SAS_LIBSAS=m -CONFIG_SCSI_SAS_ATA=y -CONFIG_SCSI_SAS_HOST_SMP=y +# CONFIG_SCSI_SAS_ATTRS is not set +# CONFIG_SCSI_SAS_LIBSAS is not set # CONFIG_SCSI_SRP_ATTRS is not set CONFIG_SCSI_LOWLEVEL=y # CONFIG_ISCSI_TCP is not set @@ -1256,6 +1367,8 @@ CONFIG_SCSI_LOWLEVEL=y # CONFIG_MEGARAID_LEGACY is not set # CONFIG_MEGARAID_SAS is not set # CONFIG_SCSI_MPT2SAS is not set +# CONFIG_SCSI_MPT3SAS is not set +# CONFIG_SCSI_UFSHCD is not set # CONFIG_SCSI_HPTIOP is not set # CONFIG_LIBFC is not set # CONFIG_LIBFCOE is not set @@ -1280,6 +1393,7 @@ CONFIG_SCSI_LOWLEVEL=y # CONFIG_SCSI_PM8001 is not set # CONFIG_SCSI_SRP is not set # CONFIG_SCSI_BFA_FC is not set +# CONFIG_SCSI_CHELSIO_FCOE is not set # CONFIG_SCSI_DH is not set # CONFIG_SCSI_OSD_INITIATOR is not set CONFIG_ATA=m @@ -1309,11 +1423,12 @@ CONFIG_ATA_BMDMA=y # SATA SFF controllers with BMDMA # CONFIG_ATA_PIIX=m +# CONFIG_SATA_HIGHBANK is not set CONFIG_SATA_MV=m CONFIG_SATA_NV=m # CONFIG_SATA_PROMISE is not set CONFIG_SATA_SIL=m -CONFIG_SATA_SIS=m +# CONFIG_SATA_SIS is not set # CONFIG_SATA_SVW is not set # CONFIG_SATA_ULI is not set CONFIG_SATA_VIA=m @@ -1354,7 +1469,7 @@ CONFIG_PATA_PDC_OLD=m # CONFIG_PATA_SCH is not set # CONFIG_PATA_SERVERWORKS is not set # CONFIG_PATA_SIL680 is not set -CONFIG_PATA_SIS=m +# CONFIG_PATA_SIS is not set # CONFIG_PATA_TOSHIBA is not set # CONFIG_PATA_TRIFLEX is not set # CONFIG_PATA_VIA is not set @@ -1384,11 +1499,14 @@ CONFIG_MD_RAID10=m CONFIG_MD_RAID456=m CONFIG_MD_MULTIPATH=m # CONFIG_MD_FAULTY is not set +# CONFIG_BCACHE is not set +CONFIG_BLK_DEV_DM_BUILTIN=y CONFIG_BLK_DEV_DM=m # CONFIG_DM_DEBUG is not set CONFIG_DM_CRYPT=m # CONFIG_DM_SNAPSHOT is not set # CONFIG_DM_THIN_PROVISIONING is not set +# CONFIG_DM_CACHE is not set CONFIG_DM_MIRROR=m # CONFIG_DM_RAID is not set # CONFIG_DM_LOG_USERSPACE is not set @@ -1397,6 +1515,7 @@ CONFIG_DM_MIRROR=m # CONFIG_DM_DELAY is not set # CONFIG_DM_UEVENT is not set # CONFIG_DM_FLAKEY is not set +# CONFIG_DM_VERITY is not set # CONFIG_TARGET_CORE is not set # CONFIG_FUSION is not set @@ -1405,7 +1524,6 @@ CONFIG_DM_MIRROR=m # CONFIG_FIREWIRE=m CONFIG_FIREWIRE_OHCI=m -CONFIG_FIREWIRE_OHCI_DEBUG=y CONFIG_FIREWIRE_SBP2=m CONFIG_FIREWIRE_NET=m # CONFIG_FIREWIRE_NOSY is not set @@ -1421,11 +1539,12 @@ CONFIG_IFB=m # CONFIG_NET_TEAM is not set CONFIG_MACVLAN=m # CONFIG_MACVTAP is not set +# CONFIG_VXLAN is not set # CONFIG_NETCONSOLE is not set # CONFIG_NETPOLL is not set # CONFIG_NET_POLL_CONTROLLER is not set CONFIG_TUN=m -# CONFIG_VETH is not set +CONFIG_VETH=m # CONFIG_ARCNET is not set CONFIG_ATM_DRIVERS=y # CONFIG_ATM_DUMMY is not set @@ -1472,10 +1591,14 @@ CONFIG_ATL2=m CONFIG_ATL1=m CONFIG_ATL1E=m CONFIG_ATL1C=m +# CONFIG_ALX is not set CONFIG_AG71XX=y # CONFIG_AG71XX_DEBUG is not set # CONFIG_AG71XX_DEBUG_FS is not set CONFIG_AG71XX_AR8216_SUPPORT=y +CONFIG_NET_CADENCE=y +# CONFIG_ARM_AT91_ETHER is not set +# CONFIG_MACB is not set CONFIG_NET_VENDOR_BROADCOM=y CONFIG_B44=m CONFIG_B44_PCI_AUTOSELECT=y @@ -1507,7 +1630,7 @@ CONFIG_TULIP_MWI=y CONFIG_TULIP_MMIO=y CONFIG_TULIP_NAPI=y CONFIG_TULIP_NAPI_HW_MITIGATION=y -CONFIG_DE4X5=m +# CONFIG_DE4X5 is not set CONFIG_WINBOND_840=m CONFIG_DM9102=m CONFIG_ULI526X=m @@ -1525,7 +1648,8 @@ CONFIG_NET_VENDOR_INTEL=y CONFIG_E100=m CONFIG_E1000=m # CONFIG_E1000E is not set -# CONFIG_IGB is not set +CONFIG_IGB=m +# CONFIG_IGB_HWMON is not set # CONFIG_IGBVF is not set # CONFIG_IXGB is not set # CONFIG_IXGBE is not set @@ -1533,6 +1657,7 @@ CONFIG_NET_VENDOR_I825XX=y # CONFIG_IP1000 is not set # CONFIG_JME is not set CONFIG_NET_VENDOR_MARVELL=y +# CONFIG_MVMDIO is not set CONFIG_SKGE=m # CONFIG_SKGE_DEBUG is not set # CONFIG_SKGE_GENESIS is not set @@ -1557,7 +1682,7 @@ CONFIG_NET_VENDOR_8390=y # CONFIG_AX88796 is not set CONFIG_NE2K_PCI=m CONFIG_NET_VENDOR_NVIDIA=y -# CONFIG_FORCEDETH is not set +CONFIG_FORCEDETH=m CONFIG_NET_VENDOR_OKI=y # CONFIG_PCH_GBE is not set # CONFIG_ETHOC is not set @@ -1578,7 +1703,6 @@ CONFIG_R8169=m CONFIG_NET_VENDOR_RDC=y CONFIG_R6040=m CONFIG_NET_VENDOR_SEEQ=y -# CONFIG_SEEQ8005 is not set CONFIG_NET_VENDOR_SILAN=y # CONFIG_SC92031 is not set CONFIG_NET_VENDOR_SIS=y @@ -1607,6 +1731,7 @@ CONFIG_NET_VENDOR_VIA=y CONFIG_VIA_RHINE=m CONFIG_VIA_RHINE_MMIO=y CONFIG_VIA_VELOCITY=m +# CONFIG_NET_VENDOR_WIZNET is not set # CONFIG_FDDI is not set # CONFIG_HIPPI is not set CONFIG_PHYLIB=y @@ -1617,6 +1742,8 @@ CONFIG_SWCONFIG_LEDS=y # # MII PHY device drivers # +# CONFIG_AT803X_PHY is not set +# CONFIG_AMD_PHY is not set CONFIG_MARVELL_PHY=y # CONFIG_DAVICOM_PHY is not set # CONFIG_QSEMI_PHY is not set @@ -1625,6 +1752,7 @@ CONFIG_MARVELL_PHY=y # CONFIG_VITESSE_PHY is not set # CONFIG_SMSC_PHY is not set # CONFIG_BROADCOM_PHY is not set +# CONFIG_BCM87XX_PHY is not set # CONFIG_ICPLUS_PHY is not set # CONFIG_REALTEK_PHY is not set # CONFIG_NATIONAL_PHY is not set @@ -1635,6 +1763,7 @@ CONFIG_MICREL_PHY=y # CONFIG_MVSWITCH_PHY is not set CONFIG_IP17XX_PHY=y CONFIG_AR8216_PHY=y +CONFIG_AR8216_PHY_LEDS=y CONFIG_RTL8306_PHY=y # CONFIG_FIXED_PHY is not set # CONFIG_MDIO_BITBANG is not set @@ -1644,6 +1773,7 @@ CONFIG_RTL8366S_PHY=y CONFIG_RTL8366RB_PHY=y CONFIG_RTL8367_PHY=y # CONFIG_RTL8367B_PHY is not set +# CONFIG_B53 is not set # CONFIG_MICREL_KS8995MA is not set # CONFIG_PSB6970_PHY is not set CONFIG_PPP=m @@ -1663,7 +1793,6 @@ CONFIG_SLHC=m CONFIG_SLIP_COMPRESSED=y CONFIG_SLIP_SMART=y CONFIG_SLIP_MODE_SLIP6=y -# CONFIG_TR is not set # # USB Network Adapters @@ -1672,24 +1801,33 @@ CONFIG_SLIP_MODE_SLIP6=y CONFIG_USB_KAWETH=m CONFIG_USB_PEGASUS=m # CONFIG_USB_RTL8150 is not set +# CONFIG_USB_RTL8152 is not set CONFIG_USB_USBNET=m CONFIG_USB_NET_AX8817X=m +# CONFIG_USB_NET_AX88179_178A is not set CONFIG_USB_NET_CDCETHER=m -# CONFIG_USB_NET_CDC_EEM is not set -# CONFIG_USB_NET_CDC_NCM is not set +CONFIG_USB_NET_CDC_EEM=m +CONFIG_USB_NET_CDC_NCM=m +CONFIG_USB_NET_CDC_MBIM=m CONFIG_USB_NET_DM9601=m # CONFIG_USB_NET_SMSC75XX is not set -# CONFIG_USB_NET_SMSC95XX is not set +CONFIG_USB_NET_SMSC95XX=m # CONFIG_USB_NET_GL620A is not set # CONFIG_USB_NET_NET1080 is not set # CONFIG_USB_NET_PLUSB is not set CONFIG_USB_NET_MCS7830=m CONFIG_USB_NET_RNDIS_HOST=m -# CONFIG_USB_NET_CDC_SUBSET is not set +CONFIG_USB_NET_CDC_SUBSET=m +CONFIG_USB_ALI_M5632=y +CONFIG_USB_AN2720=y +CONFIG_USB_BELKIN=y +CONFIG_USB_ARMLINUX=y +# CONFIG_USB_EPSON2888 is not set +# CONFIG_USB_KC2190 is not set # CONFIG_USB_NET_ZAURUS is not set # CONFIG_USB_NET_CX82310_ETH is not set -# CONFIG_USB_NET_KALMIA is not set -CONFIG_USB_HSO=m +CONFIG_USB_NET_KALMIA=m +CONFIG_USB_NET_QMI_WWAN=m # CONFIG_USB_NET_INT51X1 is not set CONFIG_USB_IPHETH=m CONFIG_USB_SIERRA_NET=m @@ -1703,12 +1841,13 @@ CONFIG_HOSTAP_FIRMWARE=y CONFIG_HOSTAP_FIRMWARE_NVRAM=y CONFIG_HOSTAP_PLX=m CONFIG_HOSTAP_PCI=m +# CONFIG_WL_TI is not set # # Enable WiMAX (Networking options) to see the WiMAX drivers # # CONFIG_WAN is not set -# CONFIG_VMXNET3 is not set +CONFIG_VMXNET3=m CONFIG_ISDN=y CONFIG_ISDN_I4L=m CONFIG_ISDN_PPP=y @@ -1773,7 +1912,6 @@ CONFIG_MISDN_HFCMULTI=m # CONFIG_MISDN_INFINEON is not set # CONFIG_MISDN_W6692 is not set # CONFIG_MISDN_NETJET is not set -# CONFIG_PHONE is not set # # Input device support @@ -1782,6 +1920,7 @@ CONFIG_INPUT=m # CONFIG_INPUT_FF_MEMLESS is not set CONFIG_INPUT_POLLDEV=m # CONFIG_INPUT_SPARSEKMAP is not set +CONFIG_INPUT_MATRIXKMAP=m # # Userland interfaces @@ -1807,11 +1946,13 @@ CONFIG_KEYBOARD_GPIO_POLLED=m # CONFIG_KEYBOARD_TCA8418 is not set # CONFIG_KEYBOARD_MATRIX is not set # CONFIG_KEYBOARD_LM8323 is not set +# CONFIG_KEYBOARD_LM8333 is not set # CONFIG_KEYBOARD_MAX7359 is not set # CONFIG_KEYBOARD_MCS is not set # CONFIG_KEYBOARD_MPR121 is not set # CONFIG_KEYBOARD_NEWTON is not set # CONFIG_KEYBOARD_OPENCORES is not set +# CONFIG_KEYBOARD_SAMSUNG is not set # CONFIG_KEYBOARD_STOWAWAY is not set # CONFIG_KEYBOARD_SUNKBD is not set # CONFIG_KEYBOARD_XTKBD is not set @@ -1836,6 +1977,7 @@ CONFIG_INPUT_CM109=m # CONFIG_INPUT_PCF8574 is not set CONFIG_INPUT_GPIO_ROTARY_ENCODER=m # CONFIG_INPUT_ADXL34X is not set +# CONFIG_INPUT_IMS_PCU is not set # CONFIG_INPUT_CMA3000 is not set # @@ -1847,6 +1989,7 @@ CONFIG_INPUT_GPIO_ROTARY_ENCODER=m # # Character devices # +CONFIG_TTY=y # CONFIG_VT is not set CONFIG_UNIX98_PTYS=y # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set @@ -1861,7 +2004,9 @@ CONFIG_UNIX98_PTYS=y # Serial drivers # CONFIG_SERIAL_8250=y +# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set CONFIG_SERIAL_8250_CONSOLE=y +# CONFIG_SERIAL_8250_SYSRQ is not set # CONFIG_SERIAL_8250_PCI is not set CONFIG_SERIAL_8250_NR_UARTS=16 CONFIG_SERIAL_8250_RUNTIME_UARTS=16 @@ -1870,36 +2015,39 @@ CONFIG_SERIAL_8250_MANY_PORTS=y CONFIG_SERIAL_8250_SHARE_IRQ=y # CONFIG_SERIAL_8250_DETECT_IRQ is not set # CONFIG_SERIAL_8250_RSA is not set +# CONFIG_SERIAL_8250_DW is not set # # Non-8250 serial port support # # CONFIG_SERIAL_MAX3100 is not set -# CONFIG_SERIAL_MAX3107 is not set +# CONFIG_SERIAL_MAX310X is not set # CONFIG_SERIAL_MFD_HSU is not set CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y # CONFIG_SERIAL_JSM is not set +# CONFIG_SERIAL_SCCNXP is not set # CONFIG_SERIAL_TIMBERDALE is not set # CONFIG_SERIAL_ALTERA_JTAGUART is not set # CONFIG_SERIAL_ALTERA_UART is not set # CONFIG_SERIAL_IFX6X60 is not set # CONFIG_SERIAL_PCH_UART is not set -# CONFIG_SERIAL_XILINX_PS_UART is not set CONFIG_SERIAL_AR933X=y CONFIG_SERIAL_AR933X_CONSOLE=y CONFIG_SERIAL_AR933X_NR_UARTS=2 +# CONFIG_SERIAL_ARC is not set +# CONFIG_SERIAL_RP2 is not set # CONFIG_TTY_PRINTK is not set # CONFIG_IPMI_HANDLER is not set CONFIG_HW_RANDOM=y # CONFIG_HW_RANDOM_TIMERIOMEM is not set +# CONFIG_HW_RANDOM_ATMEL is not set +# CONFIG_HW_RANDOM_EXYNOS is not set # CONFIG_R3964 is not set # CONFIG_APPLICOM is not set -CONFIG_GPIO_DEVICE=m # CONFIG_RAW_DRIVER is not set # CONFIG_TCG_TPM is not set CONFIG_DEVPORT=y -# CONFIG_RAMOOPS is not set CONFIG_I2C=y CONFIG_I2C_BOARDINFO=y # CONFIG_I2C_COMPAT is not set @@ -1947,7 +2095,10 @@ CONFIG_I2C_ALGOPCA=m # # I2C system bus drivers (mostly embedded / system-on-chip) # +# CONFIG_I2C_CBUS_GPIO is not set +# CONFIG_I2C_DESIGNWARE_PLATFORM is not set # CONFIG_I2C_DESIGNWARE_PCI is not set +# CONFIG_I2C_EG20T is not set CONFIG_I2C_GPIO=y # CONFIG_I2C_INTEL_MID is not set # CONFIG_I2C_OCORES is not set @@ -1955,7 +2106,6 @@ CONFIG_I2C_GPIO=y # CONFIG_I2C_PXA_PCI is not set # CONFIG_I2C_SIMTEC is not set # CONFIG_I2C_XILINX is not set -# CONFIG_I2C_EG20T is not set # # External I2C/SMBus adapter drivers @@ -1986,24 +2136,40 @@ CONFIG_SPI_BITBANG=y CONFIG_SPI_GPIO=m CONFIG_SPI_GPIO_OLD=m # CONFIG_SPI_OC_TINY is not set +# CONFIG_SPI_PXA2XX is not set # CONFIG_SPI_PXA2XX_PCI is not set -# CONFIG_SPI_RB4XX is not set +# CONFIG_SPI_SC18IS602 is not set # CONFIG_SPI_TOPCLIFF_PCH is not set +# CONFIG_SPI_XCOMM is not set # CONFIG_SPI_XILINX is not set # CONFIG_SPI_DESIGNWARE is not set # # SPI Protocol Masters # -CONFIG_SPI_SPIDEV=m +CONFIG_SPI_SPIDEV=y # CONFIG_SPI_TLE62X0 is not set -# CONFIG_SPI_RB4XX_CPLD is not set CONFIG_SPI_VSC7385=m +# +# Qualcomm MSM SSBI bus support +# +# CONFIG_SSBI is not set +# CONFIG_HSI is not set + # # PPS support # -# CONFIG_PPS is not set +CONFIG_PPS=m +# CONFIG_PPS_DEBUG is not set +# CONFIG_NTP_PPS is not set + +# +# PPS clients support +# +# CONFIG_PPS_CLIENT_KTIMER is not set +# CONFIG_PPS_CLIENT_LDISC is not set +CONFIG_PPS_CLIENT_GPIO=m # # PPS generators support @@ -2012,11 +2178,15 @@ CONFIG_SPI_VSC7385=m # # PTP clock support # +CONFIG_PTP_1588_CLOCK=m # -# Enable Device Drivers -> PPS to see the PTP clock options. +# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks. # +# CONFIG_PTP_1588_CLOCK_PCH is not set +CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y CONFIG_ARCH_REQUIRE_GPIOLIB=y +CONFIG_GPIO_DEVRES=y CONFIG_GPIOLIB=y # CONFIG_DEBUG_GPIO is not set CONFIG_GPIO_SYSFS=y @@ -2025,6 +2195,7 @@ CONFIG_GPIO_SYSFS=y # Memory mapped GPIO drivers: # # CONFIG_GPIO_GENERIC_PLATFORM is not set +# CONFIG_GPIO_TS5500 is not set # CONFIG_GPIO_VX855 is not set # @@ -2041,6 +2212,7 @@ CONFIG_GPIO_PCF857X=y # PCI GPIO expanders: # # CONFIG_GPIO_BT8XX is not set +# CONFIG_GPIO_AMD8111 is not set # CONFIG_GPIO_ML_IOH is not set # CONFIG_GPIO_RDC321X is not set @@ -2048,7 +2220,7 @@ CONFIG_GPIO_PCF857X=y # SPI GPIO expanders: # # CONFIG_GPIO_MAX7301 is not set -# CONFIG_GPIO_MCP23S08 is not set +CONFIG_GPIO_MCP23S08=m # CONFIG_GPIO_MC33880 is not set # CONFIG_GPIO_74X164 is not set @@ -2060,12 +2232,15 @@ CONFIG_GPIO_PCF857X=y # MODULbus GPIO expanders: # +# +# USB GPIO expanders: +# + # # Other GPIO expanders # CONFIG_GPIO_NXP_74HC153=y -CONFIG_GENERIC_PWM=m -CONFIG_GPIO_PWM=m +# CONFIG_GPIO_LATCH is not set CONFIG_W1=m # @@ -2083,14 +2258,18 @@ CONFIG_W1_MASTER_GPIO=m CONFIG_W1_SLAVE_THERM=m CONFIG_W1_SLAVE_SMEM=m # CONFIG_W1_SLAVE_DS2408 is not set +# CONFIG_W1_SLAVE_DS2413 is not set # CONFIG_W1_SLAVE_DS2423 is not set CONFIG_W1_SLAVE_DS2431=m CONFIG_W1_SLAVE_DS2433=m # CONFIG_W1_SLAVE_DS2433_CRC is not set CONFIG_W1_SLAVE_DS2760=m # CONFIG_W1_SLAVE_DS2780 is not set +# CONFIG_W1_SLAVE_DS2781 is not set +# CONFIG_W1_SLAVE_DS28E04 is not set # CONFIG_W1_SLAVE_BQ27000 is not set # CONFIG_POWER_SUPPLY is not set +# CONFIG_POWER_AVS is not set CONFIG_HWMON=m CONFIG_HWMON_VID=m # CONFIG_HWMON_DEBUG_CHIP is not set @@ -2108,6 +2287,9 @@ CONFIG_HWMON_VID=m # CONFIG_SENSORS_ADM1029 is not set # CONFIG_SENSORS_ADM1031 is not set # CONFIG_SENSORS_ADM9240 is not set +CONFIG_SENSORS_ADT7X10=m +# CONFIG_SENSORS_ADT7310 is not set +CONFIG_SENSORS_ADT7410=m # CONFIG_SENSORS_ADT7411 is not set # CONFIG_SENSORS_ADT7462 is not set # CONFIG_SENSORS_ADT7470 is not set @@ -2123,7 +2305,10 @@ CONFIG_SENSORS_ADT7475=m # CONFIG_SENSORS_G760A is not set # CONFIG_SENSORS_GL518SM is not set # CONFIG_SENSORS_GL520SM is not set -# CONFIG_SENSORS_GPIO_FAN is not set +CONFIG_SENSORS_GSC=m +CONFIG_SENSORS_GPIO_FAN=m +# CONFIG_SENSORS_HIH6130 is not set +# CONFIG_SENSORS_IIO_HWMON is not set # CONFIG_SENSORS_IT87 is not set # CONFIG_SENSORS_JC42 is not set # CONFIG_SENSORS_LINEAGE is not set @@ -2138,21 +2323,26 @@ CONFIG_SENSORS_LM77=m CONFIG_SENSORS_LM85=m # CONFIG_SENSORS_LM87 is not set CONFIG_SENSORS_LM90=m -# CONFIG_SENSORS_LM92 is not set +CONFIG_SENSORS_LM92=m # CONFIG_SENSORS_LM93 is not set # CONFIG_SENSORS_LTC4151 is not set # CONFIG_SENSORS_LTC4215 is not set # CONFIG_SENSORS_LTC4245 is not set # CONFIG_SENSORS_LTC4261 is not set +# CONFIG_SENSORS_LM95234 is not set CONFIG_SENSORS_LM95241=m # CONFIG_SENSORS_LM95245 is not set # CONFIG_SENSORS_MAX1111 is not set # CONFIG_SENSORS_MAX16065 is not set # CONFIG_SENSORS_MAX1619 is not set # CONFIG_SENSORS_MAX1668 is not set +# CONFIG_SENSORS_MAX197 is not set # CONFIG_SENSORS_MAX6639 is not set # CONFIG_SENSORS_MAX6642 is not set # CONFIG_SENSORS_MAX6650 is not set +# CONFIG_SENSORS_MAX6697 is not set +# CONFIG_SENSORS_MCP3021 is not set +# CONFIG_SENSORS_NCT6775 is not set # CONFIG_SENSORS_NTC_THERMISTOR is not set # CONFIG_SENSORS_PC87360 is not set # CONFIG_SENSORS_PC87427 is not set @@ -2176,10 +2366,12 @@ CONFIG_SENSORS_SHT21=m # CONFIG_SENSORS_ADS7828 is not set # CONFIG_SENSORS_ADS7871 is not set # CONFIG_SENSORS_AMC6821 is not set +# CONFIG_SENSORS_INA209 is not set +CONFIG_SENSORS_INA2XX=m # CONFIG_SENSORS_THMC50 is not set # CONFIG_SENSORS_TMP102 is not set # CONFIG_SENSORS_TMP401 is not set -# CONFIG_SENSORS_TMP421 is not set +CONFIG_SENSORS_TMP421=m # CONFIG_SENSORS_VIA686A is not set # CONFIG_SENSORS_VT1211 is not set # CONFIG_SENSORS_VT8231 is not set @@ -2194,7 +2386,7 @@ CONFIG_SENSORS_SHT21=m # CONFIG_SENSORS_W83627EHF is not set # CONFIG_THERMAL is not set CONFIG_WATCHDOG=y -# CONFIG_WATCHDOG_CORE is not set +CONFIG_WATCHDOG_CORE=y # CONFIG_WATCHDOG_NOWAYOUT is not set # @@ -2202,7 +2394,9 @@ CONFIG_WATCHDOG=y # CONFIG_SOFT_WATCHDOG=m # CONFIG_ALIM7101_WDT is not set -CONFIG_ATH79_WDT=m +# CONFIG_I6300ESB_WDT is not set +CONFIG_ATH79_WDT=y +# CONFIG_GPIO_WDT is not set # # PCI-based Watchdog Cards @@ -2231,6 +2425,7 @@ CONFIG_SSB_SILENT=y CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y CONFIG_SSB_DRIVER_PCICORE=y # CONFIG_SSB_DRIVER_MIPS is not set +# CONFIG_SSB_DRIVER_GPIO is not set CONFIG_BCMA_POSSIBLE=y # @@ -2241,180 +2436,114 @@ CONFIG_BCMA_BLOCKIO=y CONFIG_BCMA_HOST_PCI_POSSIBLE=y CONFIG_BCMA_HOST_PCI=y # CONFIG_BCMA_DRIVER_PCI_HOSTMODE is not set +# CONFIG_BCMA_HOST_SOC is not set # CONFIG_BCMA_DRIVER_MIPS is not set # CONFIG_BCMA_DRIVER_GMAC_CMN is not set +# CONFIG_BCMA_DRIVER_GPIO is not set # CONFIG_BCMA_DEBUG is not set # # Multifunction device drivers # # CONFIG_MFD_CORE is not set -# CONFIG_MFD_88PM860X is not set -# CONFIG_MFD_SM501 is not set -# CONFIG_HTC_PASIC3 is not set -# CONFIG_HTC_I2CPLD is not set -# CONFIG_UCB1400_CORE is not set -# CONFIG_TPS6105X is not set -# CONFIG_TPS65010 is not set -# CONFIG_TPS6507X is not set -# CONFIG_MFD_TPS6586X is not set -# CONFIG_MFD_TPS65910 is not set -# CONFIG_MFD_TPS65912_I2C is not set -# CONFIG_MFD_TPS65912_SPI is not set -# CONFIG_TWL4030_CORE is not set -# CONFIG_MFD_STMPE is not set -# CONFIG_MFD_TC3589X is not set -# CONFIG_MFD_TMIO is not set +# CONFIG_MFD_AS3711 is not set +# CONFIG_PMIC_ADP5520 is not set +# CONFIG_MFD_AAT2870_CORE is not set +# CONFIG_MFD_CROS_EC is not set # CONFIG_PMIC_DA903X is not set # CONFIG_MFD_DA9052_SPI is not set # CONFIG_MFD_DA9052_I2C is not set -# CONFIG_PMIC_ADP5520 is not set +# CONFIG_MFD_DA9055 is not set +# CONFIG_MFD_MC13XXX_SPI is not set +# CONFIG_MFD_MC13XXX_I2C is not set +# CONFIG_HTC_PASIC3 is not set +# CONFIG_HTC_I2CPLD is not set +# CONFIG_LPC_ICH is not set +# CONFIG_LPC_SCH is not set +# CONFIG_MFD_JANZ_CMODIO is not set +# CONFIG_MFD_88PM800 is not set +# CONFIG_MFD_88PM805 is not set +# CONFIG_MFD_88PM860X is not set +# CONFIG_MFD_MAX77686 is not set +# CONFIG_MFD_MAX77693 is not set +# CONFIG_MFD_MAX8907 is not set # CONFIG_MFD_MAX8925 is not set # CONFIG_MFD_MAX8997 is not set # CONFIG_MFD_MAX8998 is not set -# CONFIG_MFD_S5M_CORE is not set +# CONFIG_EZX_PCAP is not set +# CONFIG_MFD_VIPERBOARD is not set +# CONFIG_MFD_RETU is not set +# CONFIG_MFD_PCF50633 is not set +# CONFIG_UCB1400_CORE is not set +# CONFIG_MFD_RDC321X is not set +# CONFIG_MFD_RTSX_PCI is not set +# CONFIG_MFD_RC5T583 is not set +# CONFIG_MFD_SEC_CORE is not set +# CONFIG_MFD_SI476X_CORE is not set +# CONFIG_MFD_SM501 is not set +# CONFIG_MFD_SMSC is not set +# CONFIG_ABX500_CORE is not set +# CONFIG_MFD_STMPE is not set +# CONFIG_MFD_SYSCON is not set +# CONFIG_MFD_TI_AM335X_TSCADC is not set +# CONFIG_MFD_LP8788 is not set +# CONFIG_MFD_PALMAS is not set +# CONFIG_TPS6105X is not set +# CONFIG_TPS65010 is not set +# CONFIG_TPS6507X is not set +# CONFIG_MFD_TPS65090 is not set +# CONFIG_MFD_TPS65217 is not set +# CONFIG_MFD_TPS6586X is not set +# CONFIG_MFD_TPS65910 is not set +# CONFIG_MFD_TPS65912 is not set +# CONFIG_MFD_TPS65912_I2C is not set +# CONFIG_MFD_TPS65912_SPI is not set +# CONFIG_MFD_TPS80031 is not set +# CONFIG_TWL4030_CORE is not set +# CONFIG_TWL6040_CORE is not set +# CONFIG_MFD_WL1273_CORE is not set +# CONFIG_MFD_LM3533 is not set +# CONFIG_MFD_TIMBERDALE is not set +# CONFIG_MFD_TC3589X is not set +# CONFIG_MFD_TMIO is not set +# CONFIG_MFD_VX855 is not set +# CONFIG_MFD_ARIZONA_I2C is not set +# CONFIG_MFD_ARIZONA_SPI is not set # CONFIG_MFD_WM8400 is not set # CONFIG_MFD_WM831X_I2C is not set # CONFIG_MFD_WM831X_SPI is not set # CONFIG_MFD_WM8350_I2C is not set # CONFIG_MFD_WM8994 is not set -# CONFIG_MFD_PCF50633 is not set -# CONFIG_MFD_MC13XXX is not set -# CONFIG_ABX500_CORE is not set -# CONFIG_EZX_PCAP is not set -# CONFIG_MFD_TIMBERDALE is not set -# CONFIG_LPC_SCH is not set -# CONFIG_MFD_RDC321X is not set -# CONFIG_MFD_JANZ_CMODIO is not set -# CONFIG_MFD_VX855 is not set -# CONFIG_MFD_WL1273_CORE is not set -# CONFIG_MFD_AAT2870_CORE is not set # CONFIG_REGULATOR is not set CONFIG_MEDIA_SUPPORT=m # # Multimedia core support # +CONFIG_MEDIA_CAMERA_SUPPORT=y +# CONFIG_MEDIA_ANALOG_TV_SUPPORT is not set +# CONFIG_MEDIA_DIGITAL_TV_SUPPORT is not set +# CONFIG_MEDIA_RADIO_SUPPORT is not set +# CONFIG_MEDIA_RC_SUPPORT is not set # CONFIG_MEDIA_CONTROLLER is not set CONFIG_VIDEO_DEV=m -CONFIG_VIDEO_V4L2_COMMON=m -# CONFIG_DVB_CORE is not set -CONFIG_VIDEO_MEDIA=m - -# -# Multimedia drivers -# -# CONFIG_RC_CORE is not set -# CONFIG_MEDIA_ATTACH is not set -CONFIG_MEDIA_TUNER=m -# CONFIG_MEDIA_TUNER_CUSTOMISE is not set -CONFIG_MEDIA_TUNER_SIMPLE=m -CONFIG_MEDIA_TUNER_TDA8290=m -CONFIG_MEDIA_TUNER_TDA827X=m -CONFIG_MEDIA_TUNER_TDA18271=m -CONFIG_MEDIA_TUNER_TDA9887=m -CONFIG_MEDIA_TUNER_TEA5761=m -CONFIG_MEDIA_TUNER_TEA5767=m -CONFIG_MEDIA_TUNER_MT20XX=m -CONFIG_MEDIA_TUNER_XC2028=m -CONFIG_MEDIA_TUNER_XC5000=m -CONFIG_MEDIA_TUNER_XC4000=m -CONFIG_MEDIA_TUNER_MC44S803=m CONFIG_VIDEO_V4L2=m +# CONFIG_VIDEO_ADV_DEBUG is not set +# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set CONFIG_VIDEOBUF2_CORE=m CONFIG_VIDEOBUF2_MEMOPS=m CONFIG_VIDEOBUF2_VMALLOC=m -CONFIG_VIDEO_CAPTURE_DRIVERS=y -# CONFIG_VIDEO_ADV_DEBUG is not set -# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set -# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set +# CONFIG_VIDEO_V4L2_INT_DEVICE is not set +# CONFIG_TTPCI_EEPROM is not set # -# Encoders, decoders, sensors and other helper chips +# Media drivers # +CONFIG_MEDIA_USB_SUPPORT=y # -# Audio decoders, processors and mixers +# Webcam devices # -# CONFIG_VIDEO_TVAUDIO is not set -# CONFIG_VIDEO_TDA7432 is not set -# CONFIG_VIDEO_TDA9840 is not set -# CONFIG_VIDEO_TEA6415C is not set -# CONFIG_VIDEO_TEA6420 is not set -# CONFIG_VIDEO_MSP3400 is not set -# CONFIG_VIDEO_CS5345 is not set -# CONFIG_VIDEO_CS53L32A is not set -# CONFIG_VIDEO_TLV320AIC23B is not set -# CONFIG_VIDEO_WM8775 is not set -# CONFIG_VIDEO_WM8739 is not set -# CONFIG_VIDEO_VP27SMPX is not set - -# -# RDS decoders -# -# CONFIG_VIDEO_SAA6588 is not set - -# -# Video decoders -# -# CONFIG_VIDEO_ADV7180 is not set -# CONFIG_VIDEO_BT819 is not set -# CONFIG_VIDEO_BT856 is not set -# CONFIG_VIDEO_BT866 is not set -# CONFIG_VIDEO_KS0127 is not set -# CONFIG_VIDEO_SAA7110 is not set -# CONFIG_VIDEO_SAA711X is not set -# CONFIG_VIDEO_SAA7191 is not set -# CONFIG_VIDEO_TVP514X is not set -# CONFIG_VIDEO_TVP5150 is not set -# CONFIG_VIDEO_TVP7002 is not set -# CONFIG_VIDEO_VPX3220 is not set - -# -# Video and audio decoders -# -# CONFIG_VIDEO_SAA717X is not set -# CONFIG_VIDEO_CX25840 is not set - -# -# MPEG video encoders -# -# CONFIG_VIDEO_CX2341X is not set - -# -# Video encoders -# -# CONFIG_VIDEO_SAA7127 is not set -# CONFIG_VIDEO_SAA7185 is not set -# CONFIG_VIDEO_ADV7170 is not set -# CONFIG_VIDEO_ADV7175 is not set -# CONFIG_VIDEO_ADV7343 is not set -# CONFIG_VIDEO_AK881X is not set - -# -# Camera sensor devices -# -# CONFIG_VIDEO_OV7670 is not set -# CONFIG_VIDEO_MT9V011 is not set -# CONFIG_VIDEO_TCM825X is not set -# CONFIG_VIDEO_SR030PC30 is not set - -# -# Flash devices -# - -# -# Video improvement chips -# -# CONFIG_VIDEO_UPD64031A is not set -# CONFIG_VIDEO_UPD64083 is not set - -# -# Miscelaneous helper chips -# -# CONFIG_VIDEO_THS7303 is not set -# CONFIG_VIDEO_M52790 is not set -CONFIG_V4L_USB_DRIVERS=y CONFIG_USB_VIDEO_CLASS=m CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y CONFIG_USB_GSPCA=m @@ -2464,12 +2593,6 @@ CONFIG_USB_GSPCA_VC032X=m # CONFIG_USB_GSPCA_VICAM is not set # CONFIG_USB_GSPCA_XIRLINK_CIT is not set CONFIG_USB_GSPCA_ZC3XX=m -# CONFIG_VIDEO_PVRUSB2 is not set -# CONFIG_VIDEO_HDPVR is not set -# CONFIG_VIDEO_EM28XX is not set -# CONFIG_VIDEO_USBVISION is not set -# CONFIG_USB_ET61X251 is not set -CONFIG_USB_SN9C102=m CONFIG_USB_PWC=m # CONFIG_USB_PWC_DEBUG is not set # CONFIG_USB_PWC_INPUT_EVDEV is not set @@ -2477,27 +2600,143 @@ CONFIG_VIDEO_CPIA2=m # CONFIG_USB_ZR364XX is not set # CONFIG_USB_STKWEBCAM is not set # CONFIG_USB_S2255 is not set -CONFIG_V4L_PCI_DRIVERS=y -# CONFIG_VIDEO_HEXIUM_GEMINI is not set -# CONFIG_VIDEO_HEXIUM_ORION is not set -# CONFIG_VIDEO_MXB is not set -# CONFIG_VIDEO_SAA7134 is not set -# CONFIG_VIDEO_ZORAN is not set +CONFIG_USB_SN9C102=m + +# +# Webcam, TV (analog/digital) USB devices +# +# CONFIG_VIDEO_EM28XX is not set +# CONFIG_MEDIA_PCI_SUPPORT is not set CONFIG_V4L_PLATFORM_DRIVERS=y # CONFIG_VIDEO_CAFE_CCIC is not set # CONFIG_SOC_CAMERA is not set # CONFIG_V4L_MEM2MEM_DRIVERS is not set -# CONFIG_RADIO_ADAPTERS is not set +# CONFIG_V4L_TEST_DRIVERS is not set + +# +# Supported MMC/SDIO adapters +# +# CONFIG_CYPRESS_FIRMWARE is not set + +# +# Media ancillary drivers (tuners, sensors, i2c, frontends) +# +# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set + +# +# Encoders, decoders, sensors and other helper chips +# + +# +# Audio decoders, processors and mixers +# +# CONFIG_VIDEO_TVAUDIO is not set +# CONFIG_VIDEO_TDA7432 is not set +# CONFIG_VIDEO_TDA9840 is not set +# CONFIG_VIDEO_TEA6415C is not set +# CONFIG_VIDEO_TEA6420 is not set +# CONFIG_VIDEO_MSP3400 is not set +# CONFIG_VIDEO_CS5345 is not set +# CONFIG_VIDEO_CS53L32A is not set +# CONFIG_VIDEO_TLV320AIC23B is not set +# CONFIG_VIDEO_UDA1342 is not set +# CONFIG_VIDEO_WM8775 is not set +# CONFIG_VIDEO_WM8739 is not set +# CONFIG_VIDEO_VP27SMPX is not set +# CONFIG_VIDEO_SONY_BTF_MPX is not set + +# +# RDS decoders +# +# CONFIG_VIDEO_SAA6588 is not set + +# +# Video decoders +# +# CONFIG_VIDEO_ADV7180 is not set +# CONFIG_VIDEO_ADV7183 is not set +# CONFIG_VIDEO_BT819 is not set +# CONFIG_VIDEO_BT856 is not set +# CONFIG_VIDEO_BT866 is not set +# CONFIG_VIDEO_KS0127 is not set +# CONFIG_VIDEO_SAA7110 is not set +# CONFIG_VIDEO_SAA711X is not set +# CONFIG_VIDEO_SAA7191 is not set +# CONFIG_VIDEO_TVP514X is not set +# CONFIG_VIDEO_TVP5150 is not set +# CONFIG_VIDEO_TVP7002 is not set +# CONFIG_VIDEO_TW2804 is not set +# CONFIG_VIDEO_TW9903 is not set +# CONFIG_VIDEO_TW9906 is not set +# CONFIG_VIDEO_VPX3220 is not set + +# +# Video and audio decoders +# +# CONFIG_VIDEO_SAA717X is not set +# CONFIG_VIDEO_CX25840 is not set + +# +# Video encoders +# +# CONFIG_VIDEO_SAA7127 is not set +# CONFIG_VIDEO_SAA7185 is not set +# CONFIG_VIDEO_ADV7170 is not set +# CONFIG_VIDEO_ADV7175 is not set +# CONFIG_VIDEO_ADV7343 is not set +# CONFIG_VIDEO_ADV7393 is not set +# CONFIG_VIDEO_AK881X is not set + +# +# Camera sensor devices +# +# CONFIG_VIDEO_OV7640 is not set +# CONFIG_VIDEO_OV7670 is not set +# CONFIG_VIDEO_VS6624 is not set +# CONFIG_VIDEO_MT9V011 is not set +# CONFIG_VIDEO_SR030PC30 is not set + +# +# Flash devices +# + +# +# Video improvement chips +# +# CONFIG_VIDEO_UPD64031A is not set +# CONFIG_VIDEO_UPD64083 is not set + +# +# Miscelaneous helper chips +# +# CONFIG_VIDEO_THS7303 is not set +# CONFIG_VIDEO_M52790 is not set + +# +# Sensors used on soc_camera driver +# + +# +# Customise DVB Frontends +# +# CONFIG_DVB_AU8522_V4L is not set +# CONFIG_DVB_TUNER_DIB0070 is not set +# CONFIG_DVB_TUNER_DIB0090 is not set + +# +# Tools to develop new frontends +# +# CONFIG_DVB_DUMMY_FE is not set # # Graphics support # # CONFIG_VGA_ARB is not set # CONFIG_DRM is not set -# CONFIG_STUB_POULSBO is not set # CONFIG_VGASTATE is not set # CONFIG_VIDEO_OUTPUT_CONTROL is not set # CONFIG_FB is not set +# CONFIG_EXYNOS_VIDEO is not set # CONFIG_BACKLIGHT_LCD_SUPPORT is not set CONFIG_SOUND=m CONFIG_SOUND_OSS_CORE=y @@ -2507,6 +2746,7 @@ CONFIG_SND_TIMER=m CONFIG_SND_PCM=m CONFIG_SND_HWDEP=m CONFIG_SND_RAWMIDI=m +CONFIG_SND_COMPRESS_OFFLOAD=m CONFIG_SND_JACK=y CONFIG_SND_SEQUENCER=m CONFIG_SND_SEQ_DUMMY=m @@ -2610,26 +2850,20 @@ CONFIG_SND_USB_AUDIO=m # CONFIG_SND_USB_6FIRE is not set # CONFIG_SND_FIREWIRE is not set CONFIG_SND_SOC=m +# CONFIG_SND_ATMEL_SOC is not set CONFIG_SND_SOC_I2C_AND_SPI=m # CONFIG_SND_SOC_ALL_CODECS is not set +# CONFIG_SND_SIMPLE_CARD is not set # CONFIG_SOUND_PRIME is not set CONFIG_AC97_BUS=m -CONFIG_HID_SUPPORT=y + +# +# HID support +# CONFIG_HID=m -# CONFIG_HIDRAW is not set - -# -# USB Input Devices -# -CONFIG_USB_HID=m -# CONFIG_HID_PID is not set -CONFIG_USB_HIDDEV=y - -# -# USB HID Boot Protocol drivers -# -# CONFIG_USB_KBD is not set -# CONFIG_USB_MOUSE is not set +CONFIG_HIDRAW=y +# CONFIG_UHID is not set +CONFIG_HID_GENERIC=m # # Special HID drivers @@ -2637,6 +2871,8 @@ CONFIG_USB_HIDDEV=y # CONFIG_HID_A4TECH is not set # CONFIG_HID_ACRUX is not set # CONFIG_HID_APPLE is not set +# CONFIG_HID_APPLEIR is not set +# CONFIG_HID_AUREAL is not set # CONFIG_HID_BELKIN is not set # CONFIG_HID_CHERRY is not set # CONFIG_HID_CHICONY is not set @@ -2652,9 +2888,11 @@ CONFIG_USB_HIDDEV=y # CONFIG_HID_UCLOGIC is not set # CONFIG_HID_WALTOP is not set # CONFIG_HID_GYRATION is not set +# CONFIG_HID_ICADE is not set # CONFIG_HID_TWINHAN is not set # CONFIG_HID_KENSINGTON is not set # CONFIG_HID_LCPOWER is not set +# CONFIG_HID_LENOVO_TPKBD is not set # CONFIG_HID_LOGITECH is not set # CONFIG_HID_MAGICMOUSE is not set # CONFIG_HID_MICROSOFT is not set @@ -2666,25 +2904,49 @@ CONFIG_USB_HIDDEV=y # CONFIG_HID_PETALYNX is not set # CONFIG_HID_PICOLCD is not set # CONFIG_HID_PRIMAX is not set +# CONFIG_HID_PS3REMOTE is not set # CONFIG_HID_ROCCAT is not set +# CONFIG_HID_SAITEK is not set # CONFIG_HID_SAMSUNG is not set # CONFIG_HID_SONY is not set # CONFIG_HID_SPEEDLINK is not set +# CONFIG_HID_STEELSERIES is not set # CONFIG_HID_SUNPLUS is not set # CONFIG_HID_GREENASIA is not set # CONFIG_HID_SMARTJOYPLUS is not set +# CONFIG_HID_TIVO is not set # CONFIG_HID_TOPSEED is not set +# CONFIG_HID_THINGM is not set # CONFIG_HID_THRUSTMASTER is not set # CONFIG_HID_WACOM is not set # CONFIG_HID_WIIMOTE is not set # CONFIG_HID_ZEROPLUS is not set # CONFIG_HID_ZYDACRON is not set -CONFIG_USB_SUPPORT=y -CONFIG_USB_COMMON=m -CONFIG_USB_ARCH_HAS_HCD=y +# CONFIG_HID_SENSOR_HUB is not set + +# +# USB HID support +# +CONFIG_USB_HID=m +# CONFIG_HID_PID is not set +CONFIG_USB_HIDDEV=y + +# +# USB HID Boot Protocol drivers +# +# CONFIG_USB_KBD is not set +# CONFIG_USB_MOUSE is not set + +# +# I2C HID support +# +# CONFIG_I2C_HID is not set CONFIG_USB_ARCH_HAS_OHCI=y CONFIG_USB_ARCH_HAS_EHCI=y CONFIG_USB_ARCH_HAS_XHCI=y +CONFIG_USB_SUPPORT=y +CONFIG_USB_COMMON=m +CONFIG_USB_ARCH_HAS_HCD=y CONFIG_USB=m # CONFIG_USB_DEBUG is not set # CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set @@ -2692,24 +2954,25 @@ CONFIG_USB=m # # Miscellaneous USB options # -CONFIG_USB_DEVICEFS=y -# CONFIG_USB_DEVICE_CLASS is not set +CONFIG_USB_DEFAULT_PERSIST=y # CONFIG_USB_DYNAMIC_MINORS is not set # CONFIG_USB_OTG_WHITELIST is not set # CONFIG_USB_OTG_BLACKLIST_HUB is not set -# CONFIG_USB_MON is not set +CONFIG_USB_MON=m # CONFIG_USB_WUSB_CBAF is not set # # USB Host Controller Drivers # # CONFIG_USB_C67X00_HCD is not set -# CONFIG_USB_XHCI_HCD is not set +CONFIG_USB_XHCI_HCD=m +# CONFIG_USB_XHCI_HCD_DEBUGGING is not set CONFIG_USB_EHCI_HCD=m CONFIG_USB_EHCI_ROOT_HUB_TT=y CONFIG_USB_EHCI_TT_NEWSCHED=y -# CONFIG_USB_EHCI_MV is not set +CONFIG_USB_EHCI_PCI=m CONFIG_USB_EHCI_ATH79=y +CONFIG_USB_EHCI_HCD_PLATFORM=m # CONFIG_USB_OXU210HP_HCD is not set # CONFIG_USB_ISP116X_HCD is not set # CONFIG_USB_ISP1760_HCD is not set @@ -2718,20 +2981,21 @@ CONFIG_USB_OHCI_HCD=m CONFIG_USB_OHCI_ATH79=y # CONFIG_USB_OHCI_HCD_SSB is not set CONFIG_USB_OHCI_HCD_PLATFORM=y -CONFIG_USB_EHCI_HCD_PLATFORM=y # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set CONFIG_USB_OHCI_LITTLE_ENDIAN=y CONFIG_USB_UHCI_HCD=m # CONFIG_USB_SL811_HCD is not set # CONFIG_USB_R8A66597_HCD is not set +# CONFIG_USB_HCD_BCMA is not set +# CONFIG_USB_HCD_SSB is not set # # USB Device Class drivers # CONFIG_USB_ACM=m CONFIG_USB_PRINTER=m -# CONFIG_USB_WDM is not set +CONFIG_USB_WDM=m # CONFIG_USB_TMC is not set # @@ -2756,20 +3020,20 @@ CONFIG_USB_STORAGE_ALAUDA=m CONFIG_USB_STORAGE_KARMA=m CONFIG_USB_STORAGE_CYPRESS_ATACB=m # CONFIG_USB_STORAGE_ENE_UB6250 is not set -# CONFIG_USB_UAS is not set -# CONFIG_USB_LIBUSUAL is not set # # USB Imaging devices # # CONFIG_USB_MDC800 is not set # CONFIG_USB_MICROTEK is not set +# CONFIG_USB_DWC3 is not set +CONFIG_USB_CHIPIDEA=m +CONFIG_USB_CHIPIDEA_DEBUG=y # # USB port drivers # CONFIG_USB_SERIAL=m -CONFIG_USB_EZUSB=y CONFIG_USB_SERIAL_GENERIC=y # CONFIG_USB_SERIAL_AIRCABLE is not set CONFIG_USB_SERIAL_ARK3116=m @@ -2787,6 +3051,7 @@ CONFIG_USB_SERIAL_VISOR=m # CONFIG_USB_SERIAL_IR is not set # CONFIG_USB_SERIAL_EDGEPORT is not set # CONFIG_USB_SERIAL_EDGEPORT_TI is not set +# CONFIG_USB_SERIAL_F81232 is not set # CONFIG_USB_SERIAL_GARMIN is not set CONFIG_USB_SERIAL_IPW=m # CONFIG_USB_SERIAL_IUU is not set @@ -2795,6 +3060,7 @@ CONFIG_USB_SERIAL_KEYSPAN=m # CONFIG_USB_SERIAL_KLSI is not set # CONFIG_USB_SERIAL_KOBIL_SCT is not set CONFIG_USB_SERIAL_MCT_U232=m +# CONFIG_USB_SERIAL_METRO is not set CONFIG_USB_SERIAL_MOS7720=m # CONFIG_USB_SERIAL_MOS7840 is not set CONFIG_USB_SERIAL_MOTOROLA=m @@ -2817,8 +3083,12 @@ CONFIG_USB_SERIAL_OPTION=m # CONFIG_USB_SERIAL_OMNINET is not set # CONFIG_USB_SERIAL_OPTICON is not set # CONFIG_USB_SERIAL_VIVOPAY_SERIAL is not set +# CONFIG_USB_SERIAL_XSENS_MT is not set # CONFIG_USB_SERIAL_ZIO is not set +# CONFIG_USB_SERIAL_WISHBONE is not set +# CONFIG_USB_SERIAL_ZTE is not set # CONFIG_USB_SERIAL_SSU100 is not set +# CONFIG_USB_SERIAL_QT2 is not set # CONFIG_USB_SERIAL_DEBUG is not set # @@ -2844,18 +3114,15 @@ CONFIG_USB_SERIAL_OPTION=m CONFIG_USB_TEST=m # CONFIG_USB_ISIGHTFW is not set # CONFIG_USB_YUREX is not set +CONFIG_USB_EZUSB_FX2=m +# CONFIG_USB_HSIC_USB3503 is not set CONFIG_USB_ATM=m CONFIG_USB_SPEEDTOUCH=m CONFIG_USB_CXACRU=m CONFIG_USB_UEAGLEATM=m # CONFIG_USB_XUSBATM is not set +# CONFIG_USB_PHY is not set # CONFIG_USB_GADGET is not set - -# -# OTG and related infrastructure -# -# CONFIG_USB_GPIO_VBUS is not set -# CONFIG_NOP_USB_XCEIV is not set # CONFIG_UWB is not set CONFIG_MMC=m # CONFIG_MMC_DEBUG is not set @@ -2874,7 +3141,9 @@ CONFIG_MMC_BLOCK_BOUNCE=y # # MMC/SD/SDIO Host Controller Drivers # -# CONFIG_MMC_SDHCI is not set +CONFIG_MMC_SDHCI=m +# CONFIG_MMC_SDHCI_PCI is not set +CONFIG_MMC_SDHCI_PLTFM=m # CONFIG_MMC_TIFM_SD is not set CONFIG_MMC_SPI=m CONFIG_GPIOMMC=m @@ -2891,36 +3160,45 @@ CONFIG_LEDS_CLASS=y # LED drivers # # CONFIG_LEDS_LM3530 is not set +# CONFIG_LEDS_LM3642 is not set # CONFIG_LEDS_PCA9532 is not set -CONFIG_LEDS_GPIO=m +CONFIG_LEDS_GPIO=y # CONFIG_LEDS_LP3944 is not set # CONFIG_LEDS_LP5521 is not set # CONFIG_LEDS_LP5523 is not set +# CONFIG_LEDS_LP5562 is not set # CONFIG_LEDS_PCA955X is not set +# CONFIG_LEDS_PCA9633 is not set # CONFIG_LEDS_DAC124S085 is not set # CONFIG_LEDS_BD2802 is not set # CONFIG_LEDS_LT3593 is not set +# CONFIG_LEDS_RENESAS_TPU is not set # CONFIG_LEDS_TCA6507 is not set +# CONFIG_LEDS_LM355x is not set # CONFIG_LEDS_OT200 is not set -CONFIG_LEDS_TRIGGERS=y +# CONFIG_LEDS_BLINKM is not set CONFIG_LEDS_WNDR3700_USB=m -CONFIG_LEDS_RB750=m # # LED Triggers # -CONFIG_LEDS_TRIGGER_TIMER=m +CONFIG_LEDS_TRIGGERS=y +CONFIG_LEDS_TRIGGER_TIMER=y +CONFIG_LEDS_TRIGGER_ONESHOT=m # CONFIG_LEDS_TRIGGER_IDE_DISK is not set CONFIG_LEDS_TRIGGER_HEARTBEAT=m # CONFIG_LEDS_TRIGGER_BACKLIGHT is not set +# CONFIG_LEDS_TRIGGER_CPU is not set CONFIG_LEDS_TRIGGER_GPIO=m -CONFIG_LEDS_TRIGGER_DEFAULT_ON=m +CONFIG_LEDS_TRIGGER_DEFAULT_ON=y # # iptables trigger is under Netfilter config (LED target) # +# CONFIG_LEDS_TRIGGER_TRANSIENT is not set +# CONFIG_LEDS_TRIGGER_CAMERA is not set CONFIG_LEDS_TRIGGER_MORSE=m -CONFIG_LEDS_TRIGGER_NETDEV=m +CONFIG_LEDS_TRIGGER_NETDEV=y CONFIG_LEDS_TRIGGER_USBDEV=m # CONFIG_ACCESSIBILITY is not set # CONFIG_INFINIBAND is not set @@ -2929,12 +3207,12 @@ CONFIG_RTC_LIB=y # CONFIG_DMADEVICES is not set # CONFIG_AUXDISPLAY is not set # CONFIG_UIO is not set +# CONFIG_VIRT_DRIVERS is not set # # Virtio drivers # # CONFIG_VIRTIO_PCI is not set -# CONFIG_VIRTIO_BALLOON is not set # CONFIG_VIRTIO_MMIO is not set # @@ -2947,25 +3225,122 @@ CONFIG_USBIP_VHCI_HCD=m CONFIG_USBIP_HOST=m # CONFIG_USBIP_DEBUG is not set # CONFIG_ECHO is not set +# CONFIG_COMEDI is not set # CONFIG_ASUS_OLED is not set # CONFIG_R8187SE is not set # CONFIG_RTL8192U is not set # CONFIG_RTLLIB is not set # CONFIG_R8712U is not set -# CONFIG_RTS_PSTOR is not set # CONFIG_RTS5139 is not set # CONFIG_TRANZPORT is not set # CONFIG_IDE_PHISON is not set # CONFIG_LINE6_USB is not set # CONFIG_USB_SERIAL_QUATECH2 is not set -# CONFIG_USB_SERIAL_QUATECH_USB2 is not set # CONFIG_VT6655 is not set # CONFIG_VT6656 is not set -# CONFIG_VME_BUS is not set # CONFIG_DX_SEP is not set -# CONFIG_IIO is not set -# CONFIG_XVMALLOC is not set -# CONFIG_ZRAM is not set + +# +# IIO staging drivers +# + +# +# Accelerometers +# +# CONFIG_ADIS16201 is not set +# CONFIG_ADIS16203 is not set +# CONFIG_ADIS16204 is not set +# CONFIG_ADIS16209 is not set +# CONFIG_ADIS16220 is not set +# CONFIG_ADIS16240 is not set +# CONFIG_LIS3L02DQ is not set +# CONFIG_SCA3000 is not set + +# +# Analog to digital converters +# +# CONFIG_AD7291 is not set +# CONFIG_AD7606 is not set +CONFIG_AD799X=m +CONFIG_AD799X_RING_BUFFER=y +# CONFIG_AD7780 is not set +# CONFIG_AD7816 is not set +# CONFIG_AD7192 is not set +# CONFIG_AD7280 is not set + +# +# Analog digital bi-direction converters +# +# CONFIG_ADT7316 is not set + +# +# Capacitance to digital converters +# +# CONFIG_AD7150 is not set +# CONFIG_AD7152 is not set +# CONFIG_AD7746 is not set + +# +# Direct Digital Synthesis +# +# CONFIG_AD5930 is not set +# CONFIG_AD9832 is not set +# CONFIG_AD9834 is not set +# CONFIG_AD9850 is not set +# CONFIG_AD9852 is not set +# CONFIG_AD9910 is not set +# CONFIG_AD9951 is not set + +# +# Digital gyroscope sensors +# +# CONFIG_ADIS16060 is not set +# CONFIG_ADIS16130 is not set +# CONFIG_ADIS16260 is not set + +# +# Network Analyzer, Impedance Converters +# +# CONFIG_AD5933 is not set + +# +# Light sensors +# +# CONFIG_SENSORS_ISL29018 is not set +# CONFIG_SENSORS_ISL29028 is not set +# CONFIG_TSL2583 is not set +# CONFIG_TSL2x7x is not set + +# +# Magnetometer sensors +# +# CONFIG_SENSORS_HMC5843 is not set + +# +# Active energy metering IC +# +# CONFIG_ADE7753 is not set +# CONFIG_ADE7754 is not set +# CONFIG_ADE7758 is not set +# CONFIG_ADE7759 is not set +# CONFIG_ADE7854 is not set + +# +# Resolver to digital converters +# +# CONFIG_AD2S90 is not set +# CONFIG_AD2S1200 is not set +# CONFIG_AD2S1210 is not set + +# +# Triggers - standalone +# +# CONFIG_IIO_GPIO_TRIGGER is not set +# CONFIG_IIO_SYSFS_TRIGGER is not set +# CONFIG_IIO_SIMPLE_DUMMY is not set +CONFIG_ZSMALLOC=m +CONFIG_ZRAM=m +# CONFIG_ZRAM_DEBUG is not set # CONFIG_CRYSTALHD is not set # CONFIG_USB_ENESTORAGE is not set # CONFIG_BCM_WIMAX is not set @@ -2982,13 +3357,140 @@ CONFIG_USBIP_HOST=m # Android # # CONFIG_ANDROID is not set +# CONFIG_USB_WPAN_HCD is not set +# CONFIG_WIMAX_GDM72XX is not set +CONFIG_NET_VENDOR_SILICOM=y +# CONFIG_SBYPASS is not set +# CONFIG_BPCTL is not set +# CONFIG_CED1401 is not set +# CONFIG_DGRP is not set +# CONFIG_FIREWIRE_SERIAL is not set +CONFIG_USB_DWC2=m +# CONFIG_USB_DWC2_DEBUG is not set +# CONFIG_USB_DWC2_TRACK_MISSED_SOFS is not set # # Hardware Spinlock drivers # +# CONFIG_MAILBOX is not set # CONFIG_IOMMU_SUPPORT is not set -# CONFIG_VIRT_DRIVERS is not set + +# +# Remoteproc drivers +# +# CONFIG_STE_MODEM_RPROC is not set + +# +# Rpmsg drivers +# # CONFIG_PM_DEVFREQ is not set +# CONFIG_EXTCON is not set +# CONFIG_MEMORY is not set +CONFIG_IIO=m +CONFIG_IIO_BUFFER=y +# CONFIG_IIO_BUFFER_CB is not set +CONFIG_IIO_KFIFO_BUF=m +CONFIG_IIO_TRIGGERED_BUFFER=m +CONFIG_IIO_TRIGGER=y +CONFIG_IIO_CONSUMERS_PER_TRIGGER=2 + +# +# Accelerometers +# +# CONFIG_KXSD9 is not set +# CONFIG_IIO_ST_ACCEL_3AXIS is not set + +# +# Analog to digital converters +# +# CONFIG_AD7266 is not set +# CONFIG_AD7298 is not set +# CONFIG_AD7923 is not set +# CONFIG_AD7791 is not set +# CONFIG_AD7793 is not set +# CONFIG_AD7476 is not set +# CONFIG_AD7887 is not set +# CONFIG_MAX1363 is not set +# CONFIG_TI_ADC081C is not set + +# +# Amplifiers +# +# CONFIG_AD8366 is not set + +# +# Hid Sensor IIO Common +# + +# +# Digital to analog converters +# +# CONFIG_AD5064 is not set +# CONFIG_AD5360 is not set +# CONFIG_AD5380 is not set +# CONFIG_AD5421 is not set +# CONFIG_AD5624R_SPI is not set +# CONFIG_AD5446 is not set +# CONFIG_AD5449 is not set +# CONFIG_AD5504 is not set +# CONFIG_AD5755 is not set +# CONFIG_AD5764 is not set +# CONFIG_AD5791 is not set +# CONFIG_AD5686 is not set +# CONFIG_MAX517 is not set +# CONFIG_MCP4725 is not set + +# +# Frequency Synthesizers DDS/PLL +# + +# +# Clock Generator/Distribution +# +# CONFIG_AD9523 is not set + +# +# Phase-Locked Loop (PLL) frequency synthesizers +# +# CONFIG_ADF4350 is not set + +# +# Digital gyroscope sensors +# +# CONFIG_ADIS16080 is not set +# CONFIG_ADIS16136 is not set +# CONFIG_ADXRS450 is not set +# CONFIG_IIO_ST_GYRO_3AXIS is not set +# CONFIG_ITG3200 is not set + +# +# Inertial measurement units +# +# CONFIG_ADIS16400 is not set +# CONFIG_ADIS16480 is not set +# CONFIG_INV_MPU6050_IIO is not set + +# +# Light sensors +# +# CONFIG_ADJD_S311 is not set +# CONFIG_SENSORS_TSL2563 is not set +# CONFIG_VCNL4000 is not set + +# +# Magnetometer sensors +# +# CONFIG_AK8975 is not set +# CONFIG_IIO_ST_MAGN_3AXIS is not set +# CONFIG_VME_BUS is not set +# CONFIG_PWM is not set +# CONFIG_IPACK_BUS is not set +# CONFIG_RESET_CONTROLLER is not set + +# +# Firmware Drivers +# +# CONFIG_FIRMWARE_MEMMAP is not set # # File systems @@ -2997,7 +3499,6 @@ CONFIG_USBIP_HOST=m # CONFIG_EXT3_FS is not set CONFIG_EXT4_FS=m CONFIG_EXT4_USE_FOR_EXT23=y -CONFIG_EXT4_FS_XATTR=y # CONFIG_EXT4_FS_POSIX_ACL is not set # CONFIG_EXT4_FS_SECURITY is not set # CONFIG_EXT4_DEBUG is not set @@ -3008,22 +3509,30 @@ CONFIG_REISERFS_FS=m # CONFIG_REISERFS_CHECK is not set # CONFIG_REISERFS_PROC_INFO is not set # CONFIG_REISERFS_FS_XATTR is not set -# CONFIG_JFS_FS is not set +CONFIG_JFS_FS=m +# CONFIG_JFS_POSIX_ACL is not set +# CONFIG_JFS_SECURITY is not set +# CONFIG_JFS_DEBUG is not set +# CONFIG_JFS_STATISTICS is not set CONFIG_XFS_FS=m # CONFIG_XFS_QUOTA is not set # CONFIG_XFS_POSIX_ACL is not set # CONFIG_XFS_RT is not set +# CONFIG_XFS_WARN is not set # CONFIG_XFS_DEBUG is not set # CONFIG_GFS2_FS is not set # CONFIG_OCFS2_FS is not set CONFIG_BTRFS_FS=m # CONFIG_BTRFS_FS_POSIX_ACL is not set # CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set +# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set +# CONFIG_BTRFS_DEBUG is not set # CONFIG_NILFS2_FS is not set # CONFIG_YAFFS_FS is not set # CONFIG_FS_POSIX_ACL is not set CONFIG_EXPORTFS=m CONFIG_FILE_LOCKING=y +CONFIG_DIRECT_IO=y CONFIG_FSNOTIFY=y # CONFIG_DNOTIFY is not set CONFIG_INOTIFY_USER=y @@ -3032,20 +3541,27 @@ CONFIG_INOTIFY_USER=y # CONFIG_QUOTACTL is not set CONFIG_AUTOFS4_FS=m CONFIG_FUSE_FS=m -CONFIG_OVERLAYFS_FS=y # CONFIG_CUSE is not set +CONFIG_OVERLAYFS_FS=y # # Caches # -# CONFIG_FSCACHE is not set +CONFIG_FSCACHE=m +CONFIG_FSCACHE_STATS=y +# CONFIG_FSCACHE_HISTOGRAM is not set +# CONFIG_FSCACHE_DEBUG is not set +# CONFIG_FSCACHE_OBJECT_LIST is not set +CONFIG_CACHEFILES=m +# CONFIG_CACHEFILES_DEBUG is not set +# CONFIG_CACHEFILES_HISTOGRAM is not set # # CD-ROM/DVD Filesystems # CONFIG_ISO9660_FS=m CONFIG_JOLIET=y -CONFIG_ZISOFS=y +# CONFIG_ZISOFS is not set CONFIG_UDF_FS=m CONFIG_UDF_NLS=y @@ -3068,15 +3584,17 @@ CONFIG_PROC_FS=y # CONFIG_PROC_KCORE is not set CONFIG_PROC_SYSCTL=y # CONFIG_PROC_PAGE_MONITOR is not set +CONFIG_PROC_STRIPPED=y CONFIG_SYSFS=y CONFIG_TMPFS=y # CONFIG_TMPFS_POSIX_ACL is not set CONFIG_TMPFS_XATTR=y # CONFIG_HUGETLB_PAGE is not set -CONFIG_CONFIGFS_FS=y +CONFIG_CONFIGFS_FS=m CONFIG_MISC_FILESYSTEMS=y # CONFIG_ADFS_FS is not set # CONFIG_AFFS_FS is not set +# CONFIG_ECRYPT_FS is not set CONFIG_HFS_FS=m CONFIG_HFSPLUS_FS=m # CONFIG_BEFS_FS is not set @@ -3101,7 +3619,7 @@ CONFIG_JFFS2_CMODE_PRIORITY=y # CONFIG_JFFS2_CMODE_SIZE is not set # CONFIG_JFFS2_CMODE_FAVOURLZO is not set # CONFIG_LOGFS is not set -# CONFIG_CRAMFS is not set +CONFIG_CRAMFS=m CONFIG_SQUASHFS=y # CONFIG_SQUASHFS_XATTR is not set # CONFIG_SQUASHFS_ZLIB is not set @@ -3116,15 +3634,20 @@ CONFIG_MINIX_FS_NATIVE_ENDIAN=y # CONFIG_OMFS_FS is not set # CONFIG_HPFS_FS is not set # CONFIG_QNX4FS_FS is not set +# CONFIG_QNX6FS_FS is not set # CONFIG_ROMFS_FS is not set # CONFIG_PSTORE is not set # CONFIG_SYSV_FS is not set # CONFIG_UFS_FS is not set +# CONFIG_F2FS_FS is not set CONFIG_NETWORK_FILESYSTEMS=y CONFIG_NFS_FS=m -CONFIG_NFS_V3=y +# CONFIG_NFS_V2 is not set +CONFIG_NFS_V3=m # CONFIG_NFS_V3_ACL is not set # CONFIG_NFS_V4 is not set +# CONFIG_NFS_SWAP is not set +# CONFIG_NFS_FSCACHE is not set CONFIG_NFSD=m CONFIG_NFSD_V3=y # CONFIG_NFSD_V3_ACL is not set @@ -3133,16 +3656,23 @@ CONFIG_LOCKD=m CONFIG_LOCKD_V4=y CONFIG_NFS_COMMON=y CONFIG_SUNRPC=m +# CONFIG_SUNRPC_DEBUG is not set # CONFIG_CEPH_FS is not set CONFIG_CIFS=m CONFIG_CIFS_STATS=y # CONFIG_CIFS_STATS2 is not set # CONFIG_CIFS_WEAK_PW_HASH is not set +# CONFIG_CIFS_UPCALL is not set # CONFIG_CIFS_XATTR is not set -# CONFIG_CIFS_DEBUG2 is not set +# CONFIG_CIFS_DEBUG is not set +# CONFIG_CIFS_DFS_UPCALL is not set +# CONFIG_CIFS_SMB2 is not set +# CONFIG_CIFS_FSCACHE is not set # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set -# CONFIG_AFS_FS is not set +CONFIG_AFS_FS=m +# CONFIG_AFS_DEBUG is not set +CONFIG_AFS_FSCACHE=y CONFIG_NLS=m CONFIG_NLS_DEFAULT="iso8859-1" CONFIG_NLS_CODEPAGE_437=m @@ -3154,18 +3684,18 @@ CONFIG_NLS_CODEPAGE_852=m # CONFIG_NLS_CODEPAGE_857 is not set # CONFIG_NLS_CODEPAGE_860 is not set # CONFIG_NLS_CODEPAGE_861 is not set -# CONFIG_NLS_CODEPAGE_862 is not set +CONFIG_NLS_CODEPAGE_862=m # CONFIG_NLS_CODEPAGE_863 is not set -# CONFIG_NLS_CODEPAGE_864 is not set +CONFIG_NLS_CODEPAGE_864=m # CONFIG_NLS_CODEPAGE_865 is not set CONFIG_NLS_CODEPAGE_866=m # CONFIG_NLS_CODEPAGE_869 is not set # CONFIG_NLS_CODEPAGE_936 is not set # CONFIG_NLS_CODEPAGE_950 is not set -# CONFIG_NLS_CODEPAGE_932 is not set +CONFIG_NLS_CODEPAGE_932=m # CONFIG_NLS_CODEPAGE_949 is not set # CONFIG_NLS_CODEPAGE_874 is not set -# CONFIG_NLS_ISO8859_8 is not set +CONFIG_NLS_ISO8859_8=m CONFIG_NLS_CODEPAGE_1250=m CONFIG_NLS_CODEPAGE_1251=m # CONFIG_NLS_ASCII is not set @@ -3174,7 +3704,7 @@ CONFIG_NLS_ISO8859_2=m # CONFIG_NLS_ISO8859_3 is not set # CONFIG_NLS_ISO8859_4 is not set # CONFIG_NLS_ISO8859_5 is not set -# CONFIG_NLS_ISO8859_6 is not set +CONFIG_NLS_ISO8859_6=m # CONFIG_NLS_ISO8859_7 is not set # CONFIG_NLS_ISO8859_9 is not set CONFIG_NLS_ISO8859_13=m @@ -3182,6 +3712,17 @@ CONFIG_NLS_ISO8859_13=m CONFIG_NLS_ISO8859_15=m CONFIG_NLS_KOI8_R=m # CONFIG_NLS_KOI8_U is not set +# CONFIG_NLS_MAC_ROMAN is not set +# CONFIG_NLS_MAC_CELTIC is not set +# CONFIG_NLS_MAC_CENTEURO is not set +# CONFIG_NLS_MAC_CROATIAN is not set +# CONFIG_NLS_MAC_CYRILLIC is not set +# CONFIG_NLS_MAC_GAELIC is not set +# CONFIG_NLS_MAC_GREEK is not set +# CONFIG_NLS_MAC_ICELAND is not set +# CONFIG_NLS_MAC_INUIT is not set +# CONFIG_NLS_MAC_ROMANIAN is not set +# CONFIG_NLS_MAC_TURKISH is not set CONFIG_NLS_UTF8=m # CONFIG_DLM is not set @@ -3196,6 +3737,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y CONFIG_FRAME_WARN=1024 CONFIG_MAGIC_SYSRQ=y CONFIG_STRIP_ASM_SYMS=y +# CONFIG_READABLE_ASM is not set # CONFIG_UNUSED_SYMBOLS is not set CONFIG_DEBUG_FS=y # CONFIG_HEADERS_CHECK is not set @@ -3203,13 +3745,15 @@ CONFIG_DEBUG_FS=y CONFIG_DEBUG_KERNEL=y # CONFIG_DEBUG_SHIRQ is not set # CONFIG_LOCKUP_DETECTOR is not set -# CONFIG_HARDLOCKUP_DETECTOR is not set +# CONFIG_PANIC_ON_OOPS is not set +CONFIG_PANIC_ON_OOPS_VALUE=0 # CONFIG_DETECT_HUNG_TASK is not set # CONFIG_SCHED_DEBUG is not set # CONFIG_SCHEDSTATS is not set # CONFIG_TIMER_STATS is not set # CONFIG_DEBUG_OBJECTS is not set # CONFIG_SLUB_STATS is not set +CONFIG_HAVE_DEBUG_KMEMLEAK=y # CONFIG_DEBUG_KMEMLEAK is not set # CONFIG_DEBUG_RT_MUTEXES is not set # CONFIG_RT_MUTEX_TESTER is not set @@ -3217,7 +3761,6 @@ CONFIG_DEBUG_KERNEL=y # CONFIG_DEBUG_MUTEXES is not set # CONFIG_DEBUG_LOCK_ALLOC is not set # CONFIG_PROVE_LOCKING is not set -# CONFIG_SPARSE_RCU_POINTER is not set # CONFIG_LOCK_STAT is not set # CONFIG_DEBUG_ATOMIC_SLEEP is not set # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set @@ -3234,13 +3777,19 @@ CONFIG_DEBUG_INFO_REDUCED=y # CONFIG_DEBUG_NOTIFIERS is not set # CONFIG_DEBUG_CREDENTIALS is not set # CONFIG_BOOT_PRINTK_DELAY is not set + +# +# RCU Debugging +# +# CONFIG_SPARSE_RCU_POINTER is not set # CONFIG_RCU_TORTURE_TEST is not set +# CONFIG_RCU_TRACE is not set # CONFIG_BACKTRACE_SELF_TEST is not set # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set # CONFIG_LKDTM is not set +# CONFIG_NOTIFIER_ERROR_INJECTION is not set # CONFIG_FAULT_INJECTION is not set -# CONFIG_SYSCTL_SYSCALL_CHECK is not set # CONFIG_DEBUG_PAGEALLOC is not set CONFIG_HAVE_FUNCTION_TRACER=y CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y @@ -3250,6 +3799,8 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y CONFIG_HAVE_C_RECORDMCOUNT=y CONFIG_TRACING_SUPPORT=y # CONFIG_FTRACE is not set +# CONFIG_RBTREE_TEST is not set +# CONFIG_INTERVAL_TREE_TEST is not set # CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set # CONFIG_DYNAMIC_DEBUG is not set # CONFIG_DMA_API_DEBUG is not set @@ -3258,6 +3809,7 @@ CONFIG_TRACING_SUPPORT=y # CONFIG_SAMPLES is not set CONFIG_HAVE_ARCH_KGDB=y # CONFIG_KGDB is not set +# CONFIG_TEST_STRING_HELPERS is not set # CONFIG_TEST_KSTRTOX is not set CONFIG_EARLY_PRINTK=y CONFIG_CMDLINE_BOOL=y @@ -3270,7 +3822,9 @@ CONFIG_CMDLINE="rootfstype=squashfs,jffs2 noinitrd" # # Security options # -# CONFIG_KEYS is not set +CONFIG_KEYS=y +# CONFIG_ENCRYPTED_KEYS is not set +# CONFIG_KEYS_DEBUG_PROC_KEYS is not set # CONFIG_SECURITY_DMESG_RESTRICT is not set # CONFIG_SECURITY is not set # CONFIG_SECURITYFS is not set @@ -3287,8 +3841,8 @@ CONFIG_CRYPTO=y # # Crypto core or helper # -CONFIG_CRYPTO_ALGAPI=m -CONFIG_CRYPTO_ALGAPI2=m +CONFIG_CRYPTO_ALGAPI=y +CONFIG_CRYPTO_ALGAPI2=y CONFIG_CRYPTO_AEAD=m CONFIG_CRYPTO_AEAD2=m CONFIG_CRYPTO_BLKCIPHER=m @@ -3297,9 +3851,8 @@ CONFIG_CRYPTO_HASH=m CONFIG_CRYPTO_HASH2=m # CONFIG_CRYPTO_RNG is not set CONFIG_CRYPTO_RNG2=m -CONFIG_CRYPTO_PCOMP2=m CONFIG_CRYPTO_MANAGER=m -CONFIG_CRYPTO_MANAGER2=m +CONFIG_CRYPTO_MANAGER2=y # CONFIG_CRYPTO_USER is not set CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y CONFIG_CRYPTO_GF128MUL=m @@ -3324,12 +3877,13 @@ CONFIG_CRYPTO_CBC=m # CONFIG_CRYPTO_CTS is not set CONFIG_CRYPTO_ECB=m # CONFIG_CRYPTO_LRW is not set -# CONFIG_CRYPTO_PCBC is not set +CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_XTS=m # # Hash modes # +# CONFIG_CRYPTO_CMAC is not set CONFIG_CRYPTO_HMAC=m # CONFIG_CRYPTO_XCBC is not set # CONFIG_CRYPTO_VMAC is not set @@ -3338,6 +3892,7 @@ CONFIG_CRYPTO_HMAC=m # Digest # CONFIG_CRYPTO_CRC32C=m +# CONFIG_CRYPTO_CRC32 is not set # CONFIG_CRYPTO_GHASH is not set CONFIG_CRYPTO_MD4=m CONFIG_CRYPTO_MD5=m @@ -3355,12 +3910,13 @@ CONFIG_CRYPTO_WP512=m # # Ciphers # -CONFIG_CRYPTO_AES=m +CONFIG_CRYPTO_AES=y CONFIG_CRYPTO_ANUBIS=m CONFIG_CRYPTO_ARC4=m CONFIG_CRYPTO_BLOWFISH=m CONFIG_CRYPTO_BLOWFISH_COMMON=m CONFIG_CRYPTO_CAMELLIA=m +CONFIG_CRYPTO_CAST_COMMON=m CONFIG_CRYPTO_CAST5=m CONFIG_CRYPTO_CAST6=m CONFIG_CRYPTO_DES=m @@ -3391,6 +3947,7 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=m CONFIG_CRYPTO_HW=y CONFIG_CRYPTO_DEV_HIFN_795X=m CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y +# CONFIG_ASYMMETRIC_KEY_TYPE is not set # # OCF Configuration @@ -3421,18 +3978,24 @@ CONFIG_RAID6_PQ=m CONFIG_BITREVERSE=y CONFIG_NO_GENERIC_PCI_IOPORT_MAP=y CONFIG_GENERIC_PCI_IOMAP=y +CONFIG_GENERIC_IO=y CONFIG_CRC_CCITT=m CONFIG_CRC16=m # CONFIG_CRC_T10DIF is not set CONFIG_CRC_ITU_T=m CONFIG_CRC32=y +# CONFIG_CRC32_SELFTEST is not set +# CONFIG_CRC32_SLICEBY8 is not set +# CONFIG_CRC32_SLICEBY4 is not set +CONFIG_CRC32_SARWATE=y +# CONFIG_CRC32_BIT is not set CONFIG_CRC7=m CONFIG_LIBCRC32C=m CONFIG_CRC8=m CONFIG_ZLIB_INFLATE=m CONFIG_ZLIB_DEFLATE=m -CONFIG_LZO_COMPRESS=y -CONFIG_LZO_DECOMPRESS=y +CONFIG_LZO_COMPRESS=m +CONFIG_LZO_DECOMPRESS=m CONFIG_XZ_DEC=y # CONFIG_XZ_DEC_X86 is not set # CONFIG_XZ_DEC_POWERPC is not set @@ -3444,8 +4007,6 @@ CONFIG_XZ_DEC=y # CONFIG_XZ_DEC_TEST is not set CONFIG_LZMA_COMPRESS=y CONFIG_LZMA_DECOMPRESS=y -CONFIG_RLE_DECOMPRESS=y -CONFIG_DECOMPRESS_LZMA=y CONFIG_TEXTSEARCH=y CONFIG_TEXTSEARCH_KMP=m CONFIG_TEXTSEARCH_BM=m @@ -3456,5 +4017,9 @@ CONFIG_HAS_DMA=y CONFIG_DQL=y CONFIG_NLATTR=y CONFIG_GENERIC_ATOMIC64=y +CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y CONFIG_AVERAGE=y CONFIG_CORDIC=m +# CONFIG_DDR is not set +CONFIG_HAVE_KVM=y +# CONFIG_VIRTUALIZATION is not set diff --git a/targets/ar71xx-generic/kernel-vermagic b/targets/ar71xx-generic/kernel-vermagic index 8665cb08..e28ee2ac 100644 --- a/targets/ar71xx-generic/kernel-vermagic +++ b/targets/ar71xx-generic/kernel-vermagic @@ -1 +1 @@ -d6597ebf6203328d3519ea3c3371a493 +f2469bbdb9dd44754c52e799dc02ee7f diff --git a/targets/ar71xx-generic/profiles.mk b/targets/ar71xx-generic/profiles.mk index c85df19e..63c7d8f1 100644 --- a/targets/ar71xx-generic/profiles.mk +++ b/targets/ar71xx-generic/profiles.mk @@ -82,8 +82,8 @@ $(eval $(call GluonModel,UBNT,ubnt-unifi-outdoor-squashfs,ubiquiti-unifiap-outdo ## D-Link # D-Link DIR-615 rev. E1 -$(eval $(call GluonProfile,DIR615E1)) -$(eval $(call GluonModel,DIR615E1,dir-615-e1-squashfs,d-link-dir-615-rev-e1)) +#$(eval $(call GluonProfile,DIR615E1)) +#$(eval $(call GluonModel,DIR615E1,dir-615-e1-squashfs,d-link-dir-615-rev-e1)) # D-Link DIR-825 rev. B1 $(eval $(call GluonProfile,DIR825B1)) diff --git a/targets/targets.mk b/targets/targets.mk index bc21485a..bd011072 100644 --- a/targets/targets.mk +++ b/targets/targets.mk @@ -1,5 +1,5 @@ $(eval $(call GluonTarget,ar71xx,generic)) -ifeq ($(BROKEN),1) +ifneq ($(BROKEN),) $(eval $(call GluonTarget,x86,generic)) endif diff --git a/targets/x86-generic/kernel-config b/targets/x86-generic/kernel-config index 58787cbf..1b37d3a8 100644 --- a/targets/x86-generic/kernel-config +++ b/targets/x86-generic/kernel-config @@ -1,36 +1,27 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.3.8 Kernel Configuration +# Linux/x86 3.10.49 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y -# CONFIG_X86_64 is not set CONFIG_X86=y CONFIG_INSTRUCTION_DECODER=y CONFIG_OUTPUT_FORMAT="elf32-i386" CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig" -CONFIG_GENERIC_CMOS_UPDATE=y -CONFIG_CLOCKSOURCE_WATCHDOG=y -CONFIG_GENERIC_CLOCKEVENTS=y -CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y CONFIG_LOCKDEP_SUPPORT=y CONFIG_STACKTRACE_SUPPORT=y CONFIG_HAVE_LATENCYTOP_SUPPORT=y CONFIG_MMU=y -# CONFIG_NEED_DMA_MAP_STATE is not set CONFIG_NEED_SG_DMA_LENGTH=y CONFIG_GENERIC_ISA_DMA=y CONFIG_GENERIC_BUG=y CONFIG_GENERIC_HWEIGHT=y CONFIG_ARCH_MAY_HAVE_PC_FDC=y -# CONFIG_RWSEM_GENERIC_SPINLOCK is not set CONFIG_RWSEM_XCHGADD_ALGORITHM=y -CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y CONFIG_GENERIC_CALIBRATE_DELAY=y -# CONFIG_GENERIC_TIME_VSYSCALL is not set CONFIG_ARCH_HAS_CPU_RELAX=y -CONFIG_ARCH_HAS_DEFAULT_IDLE=y CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y +CONFIG_ARCH_HAS_CPU_AUTOPROBE=y CONFIG_HAVE_SETUP_PER_CPU_AREA=y CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y @@ -42,15 +33,14 @@ CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y CONFIG_X86_32_LAZY_GS=y CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-ecx -fcall-saved-edx" -CONFIG_KTIME_SCALAR=y +CONFIG_ARCH_SUPPORTS_UPROBES=y CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" -CONFIG_HAVE_IRQ_WORK=y CONFIG_IRQ_WORK=y +CONFIG_BUILDTIME_EXTABLE_SORT=y # # General setup # -CONFIG_EXPERIMENTAL=y CONFIG_BROKEN_ON_SMP=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_CROSS_COMPILE="" @@ -71,9 +61,7 @@ CONFIG_SWAP=y CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y # CONFIG_POSIX_MQUEUE is not set -# CONFIG_BSD_PROCESS_ACCT is not set # CONFIG_FHANDLE is not set -# CONFIG_TASKSTATS is not set # CONFIG_AUDIT is not set CONFIG_HAVE_GENERIC_HARDIRQS=y @@ -81,54 +69,81 @@ CONFIG_HAVE_GENERIC_HARDIRQS=y # IRQ subsystem # CONFIG_GENERIC_HARDIRQS=y -CONFIG_HAVE_SPARSE_IRQ=y CONFIG_GENERIC_IRQ_PROBE=y CONFIG_GENERIC_IRQ_SHOW=y +CONFIG_IRQ_DOMAIN=y +# CONFIG_IRQ_DOMAIN_DEBUG is not set CONFIG_IRQ_FORCED_THREADING=y CONFIG_SPARSE_IRQ=y +CONFIG_CLOCKSOURCE_WATCHDOG=y +CONFIG_KTIME_SCALAR=y +CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_GENERIC_CLOCKEVENTS_BUILD=y +CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y +CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y +CONFIG_GENERIC_CMOS_UPDATE=y + +# +# Timers subsystem +# +CONFIG_TICK_ONESHOT=y +CONFIG_HZ_PERIODIC=y +# CONFIG_NO_HZ_IDLE is not set +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y + +# +# CPU/Task time and stats accounting +# +CONFIG_TICK_CPU_ACCOUNTING=y +# CONFIG_IRQ_TIME_ACCOUNTING is not set +# CONFIG_BSD_PROCESS_ACCT is not set +# CONFIG_TASKSTATS is not set # # RCU Subsystem # CONFIG_TINY_RCU=y # CONFIG_PREEMPT_RCU is not set -# CONFIG_RCU_TRACE is not set +# CONFIG_RCU_STALL_COMMON is not set # CONFIG_TREE_RCU_TRACE is not set -# CONFIG_IKCONFIG is not set +CONFIG_IKCONFIG=m +CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=17 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y +CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y +CONFIG_ARCH_WANTS_PROT_NUMA_PROT_NONE=y # CONFIG_CGROUPS is not set # CONFIG_CHECKPOINT_RESTORE is not set -CONFIG_NAMESPACES=y -# CONFIG_UTS_NS is not set -# CONFIG_IPC_NS is not set -# CONFIG_USER_NS is not set -# CONFIG_PID_NS is not set -# CONFIG_NET_NS is not set +# CONFIG_NAMESPACES is not set # CONFIG_SCHED_AUTOGROUP is not set # CONFIG_SYSFS_DEPRECATED is not set -# CONFIG_RELAY is not set +CONFIG_RELAY=y CONFIG_CRASHLOG=y CONFIG_BLK_DEV_INITRD=y CONFIG_INITRAMFS_SOURCE="" CONFIG_RD_GZIP=y CONFIG_RD_BZIP2=y -CONFIG_RD_LZMA=y +# CONFIG_RD_LZMA is not set # CONFIG_RD_XZ is not set # CONFIG_RD_LZO is not set # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set CONFIG_SYSCTL=y CONFIG_ANON_INODES=y +CONFIG_HAVE_UID16=y +CONFIG_SYSCTL_EXCEPTION_TRACE=y +# CONFIG_KALLSYMS_UNCOMPRESSED is not set +CONFIG_HOTPLUG=y +CONFIG_HAVE_PCSPKR_PLATFORM=y CONFIG_EXPERT=y CONFIG_UID16=y # CONFIG_SYSCTL_SYSCALL is not set -# CONFIG_KALLSYMS is not set -CONFIG_HOTPLUG=y +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_ALL is not set CONFIG_PRINTK=y CONFIG_BUG=y CONFIG_ELF_CORE=y CONFIG_PCSPKR_PLATFORM=y -CONFIG_HAVE_PCSPKR_PLATFORM=y CONFIG_BASE_FULL=y CONFIG_FUTEX=y CONFIG_EPOLL=y @@ -137,6 +152,7 @@ CONFIG_TIMERFD=y CONFIG_EVENTFD=y CONFIG_SHMEM=y # CONFIG_AIO is not set +CONFIG_PCI_QUIRKS=y CONFIG_EMBEDDED=y CONFIG_HAVE_PERF_EVENTS=y @@ -144,10 +160,8 @@ CONFIG_HAVE_PERF_EVENTS=y # Kernel Performance Events And Counters # CONFIG_PERF_EVENTS=y -# CONFIG_PERF_COUNTERS is not set # CONFIG_DEBUG_PERF_USE_VMALLOC is not set CONFIG_VM_EVENT_COUNTERS=y -CONFIG_PCI_QUIRKS=y CONFIG_SLUB_DEBUG=y # CONFIG_COMPAT_BRK is not set # CONFIG_SLAB is not set @@ -158,24 +172,39 @@ CONFIG_HAVE_OPROFILE=y CONFIG_OPROFILE_NMI_TIMER=y # CONFIG_KPROBES is not set # CONFIG_JUMP_LABEL is not set +# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y +CONFIG_ARCH_USE_BUILTIN_BSWAP=y CONFIG_HAVE_IOREMAP_PROT=y CONFIG_HAVE_KPROBES=y CONFIG_HAVE_KRETPROBES=y CONFIG_HAVE_OPTPROBES=y +CONFIG_HAVE_KPROBES_ON_FTRACE=y CONFIG_HAVE_ARCH_TRACEHOOK=y CONFIG_HAVE_DMA_ATTRS=y +CONFIG_HAVE_DMA_CONTIGUOUS=y +CONFIG_GENERIC_SMP_IDLE_THREAD=y CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y CONFIG_HAVE_DMA_API_DEBUG=y CONFIG_HAVE_HW_BREAKPOINT=y CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y CONFIG_HAVE_USER_RETURN_NOTIFIER=y CONFIG_HAVE_PERF_EVENTS_NMI=y +CONFIG_HAVE_PERF_REGS=y +CONFIG_HAVE_PERF_USER_STACK_DUMP=y CONFIG_HAVE_ARCH_JUMP_LABEL=y CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y CONFIG_HAVE_CMPXCHG_LOCAL=y CONFIG_HAVE_CMPXCHG_DOUBLE=y +CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y +CONFIG_HAVE_ARCH_SECCOMP_FILTER=y +CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y +CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y +CONFIG_MODULES_USE_ELF_REL=y +CONFIG_CLONE_BACKWARDS=y +CONFIG_OLD_SIGSUSPEND3=y +CONFIG_OLD_SIGACTION=y # # GCOV-based kernel profiling @@ -191,6 +220,8 @@ CONFIG_MODULE_UNLOAD=y # CONFIG_MODULE_FORCE_UNLOAD is not set # CONFIG_MODVERSIONS is not set # CONFIG_MODULE_SRCVERSION_ALL is not set +# CONFIG_MODULE_SIG is not set +CONFIG_MODULE_STRIPPED=y CONFIG_BLOCK=y CONFIG_LBDAF=y CONFIG_BLK_DEV_BSG=y @@ -228,56 +259,28 @@ CONFIG_IOSCHED_DEADLINE=y CONFIG_DEFAULT_DEADLINE=y # CONFIG_DEFAULT_NOOP is not set CONFIG_DEFAULT_IOSCHED="deadline" -# CONFIG_INLINE_SPIN_TRYLOCK is not set -# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set -# CONFIG_INLINE_SPIN_LOCK is not set -# CONFIG_INLINE_SPIN_LOCK_BH is not set -# CONFIG_INLINE_SPIN_LOCK_IRQ is not set -# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set -CONFIG_INLINE_SPIN_UNLOCK=y -# CONFIG_INLINE_SPIN_UNLOCK_BH is not set CONFIG_INLINE_SPIN_UNLOCK_IRQ=y -# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set -# CONFIG_INLINE_READ_TRYLOCK is not set -# CONFIG_INLINE_READ_LOCK is not set -# CONFIG_INLINE_READ_LOCK_BH is not set -# CONFIG_INLINE_READ_LOCK_IRQ is not set -# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set CONFIG_INLINE_READ_UNLOCK=y -# CONFIG_INLINE_READ_UNLOCK_BH is not set CONFIG_INLINE_READ_UNLOCK_IRQ=y -# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set -# CONFIG_INLINE_WRITE_TRYLOCK is not set -# CONFIG_INLINE_WRITE_LOCK is not set -# CONFIG_INLINE_WRITE_LOCK_BH is not set -# CONFIG_INLINE_WRITE_LOCK_IRQ is not set -# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set CONFIG_INLINE_WRITE_UNLOCK=y -# CONFIG_INLINE_WRITE_UNLOCK_BH is not set CONFIG_INLINE_WRITE_UNLOCK_IRQ=y -# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set -# CONFIG_MUTEX_SPIN_ON_OWNER is not set # CONFIG_FREEZER is not set # # Processor type and features # CONFIG_ZONE_DMA=y -CONFIG_TICK_ONESHOT=y -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y -CONFIG_GENERIC_CLOCKEVENTS_BUILD=y -CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y # CONFIG_SMP is not set CONFIG_X86_MPPARSE=y # CONFIG_X86_EXTENDED_PLATFORM is not set +# CONFIG_X86_GOLDFISH is not set +# CONFIG_X86_INTEL_LPSS is not set CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y # CONFIG_X86_32_IRIS is not set CONFIG_SCHED_OMIT_FRAME_POINTER=y -# CONFIG_PARAVIRT_GUEST is not set +# CONFIG_HYPERVISOR_GUEST is not set CONFIG_NO_BOOTMEM=y # CONFIG_MEMTEST is not set -# CONFIG_M386 is not set CONFIG_M486=y # CONFIG_M586 is not set # CONFIG_M586TSC is not set @@ -304,16 +307,10 @@ CONFIG_M486=y # CONFIG_MATOM is not set CONFIG_X86_GENERIC=y CONFIG_X86_INTERNODE_CACHE_SHIFT=6 -CONFIG_X86_CMPXCHG=y CONFIG_X86_L1_CACHE_SHIFT=6 -CONFIG_X86_XADD=y CONFIG_X86_PPRO_FENCE=y CONFIG_X86_F00F_BUG=y CONFIG_X86_INVD_BUG=y -CONFIG_X86_WP_WORKS_OK=y -CONFIG_X86_INVLPG=y -CONFIG_X86_BSWAP=y -CONFIG_X86_POPAD_OK=y CONFIG_X86_ALIGNMENT_16=y CONFIG_X86_INTEL_USERCOPY=y CONFIG_X86_MINIMUM_CPU_FAMILY=4 @@ -327,9 +324,7 @@ CONFIG_CPU_SUP_UMC_32=y CONFIG_HPET_TIMER=y CONFIG_HPET_EMULATE_RTC=y CONFIG_DMI=y -# CONFIG_IOMMU_HELPER is not set CONFIG_NR_CPUS=1 -# CONFIG_IRQ_TIME_ACCOUNTING is not set CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set @@ -361,8 +356,6 @@ CONFIG_VMSPLIT_3G=y # CONFIG_VMSPLIT_1G is not set CONFIG_PAGE_OFFSET=0xC0000000 # CONFIG_X86_PAE is not set -# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set -# CONFIG_ARCH_DMA_ADDR_T_64BIT is not set CONFIG_ARCH_FLATMEM_ENABLE=y CONFIG_ARCH_SPARSEMEM_ENABLE=y CONFIG_ARCH_SELECT_MEMORY_MODEL=y @@ -376,6 +369,7 @@ CONFIG_SPARSEMEM_STATIC=y CONFIG_HAVE_MEMBLOCK=y CONFIG_HAVE_MEMBLOCK_NODE_MAP=y CONFIG_ARCH_DISCARD_MEMBLOCK=y +# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set CONFIG_PAGEFLAGS_EXTENDED=y CONFIG_SPLIT_PTLOCK_CPUS=4 # CONFIG_COMPACTION is not set @@ -388,8 +382,10 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y # CONFIG_MEMORY_FAILURE is not set # CONFIG_TRANSPARENT_HUGEPAGE is not set +# CONFIG_CROSS_MEMORY_ATTACH is not set CONFIG_NEED_PER_CPU_KM=y # CONFIG_CLEANCACHE is not set +# CONFIG_FRONTSWAP is not set # CONFIG_X86_CHECK_BIOS_CORRUPTION is not set CONFIG_X86_RESERVE_LOW=64 CONFIG_MATH_EMULATION=y @@ -398,6 +394,7 @@ CONFIG_MTRR=y CONFIG_X86_PAT=y CONFIG_ARCH_USES_PG_UNCACHED=y # CONFIG_ARCH_RANDOM is not set +# CONFIG_X86_SMAP is not set # CONFIG_EFI is not set # CONFIG_SECCOMP is not set # CONFIG_CC_STACKPROTECTOR is not set @@ -407,7 +404,7 @@ CONFIG_HZ_100=y # CONFIG_HZ_1000 is not set CONFIG_HZ=100 CONFIG_SCHED_HRTICK=y -CONFIG_KEXEC=y +# CONFIG_KEXEC is not set CONFIG_PHYSICAL_START=0x1000000 # CONFIG_RELOCATABLE is not set CONFIG_PHYSICAL_ALIGN=0x100000 @@ -431,10 +428,12 @@ CONFIG_ACPI_BUTTON=y CONFIG_ACPI_VIDEO=y # CONFIG_ACPI_FAN is not set # CONFIG_ACPI_DOCK is not set +CONFIG_ACPI_I2C=y CONFIG_ACPI_PROCESSOR=y # CONFIG_ACPI_PROCESSOR_AGGREGATOR is not set CONFIG_ACPI_THERMAL=y # CONFIG_ACPI_CUSTOM_DSDT is not set +# CONFIG_ACPI_INITRD_TABLE_OVERRIDE is not set CONFIG_ACPI_BLACKLIST_YEAR=0 # CONFIG_ACPI_DEBUG is not set # CONFIG_ACPI_PCI_SLOT is not set @@ -467,11 +466,11 @@ CONFIG_CPU_FREQ_GOV_PERFORMANCE=y # # x86 CPU frequency scaling drivers # +# CONFIG_X86_INTEL_PSTATE is not set # CONFIG_X86_PCC_CPUFREQ is not set # CONFIG_X86_ACPI_CPUFREQ is not set # CONFIG_X86_POWERNOW_K6 is not set # CONFIG_X86_POWERNOW_K7 is not set -# CONFIG_X86_POWERNOW_K8 is not set # CONFIG_X86_GX_SUSPMOD is not set # CONFIG_X86_SPEEDSTEP_CENTRINO is not set # CONFIG_X86_SPEEDSTEP_ICH is not set @@ -487,8 +486,10 @@ CONFIG_CPU_FREQ_GOV_PERFORMANCE=y # # CONFIG_X86_SPEEDSTEP_LIB is not set CONFIG_CPU_IDLE=y +# CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set CONFIG_CPU_IDLE_GOV_LADDER=y CONFIG_CPU_IDLE_GOV_MENU=y +# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set CONFIG_INTEL_IDLE=y # @@ -512,6 +513,7 @@ CONFIG_PCIEAER=y CONFIG_ARCH_SUPPORTS_MSI=y CONFIG_PCI_MSI=y # CONFIG_PCI_DEBUG is not set +# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set # CONFIG_PCI_STUB is not set # CONFIG_PCI_DISABLE_COMMON_QUIRKS is not set CONFIG_HT_IRQ=y @@ -523,11 +525,11 @@ CONFIG_PCI_LABEL=y CONFIG_ISA_DMA_API=y CONFIG_ISA=y # CONFIG_EISA is not set -# CONFIG_MCA is not set CONFIG_SCx200=y CONFIG_SCx200HR_TIMER=y # CONFIG_OLPC is not set # CONFIG_ALIX is not set +# CONFIG_NET5501 is not set # CONFIG_GEOS is not set CONFIG_AMD_NB=y CONFIG_PCCARD=m @@ -558,9 +560,11 @@ CONFIG_PCCARD_NONSTATIC=y CONFIG_BINFMT_ELF=y CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set +CONFIG_BINFMT_SCRIPT=y CONFIG_HAVE_AOUT=y # CONFIG_BINFMT_AOUT is not set CONFIG_BINFMT_MISC=y +CONFIG_COREDUMP=y CONFIG_HAVE_ATOMIC_IOMAP=y CONFIG_HAVE_TEXT_POKE_SMP=y CONFIG_NET=y @@ -569,9 +573,11 @@ CONFIG_NET=y # Networking options # CONFIG_PACKET=y +# CONFIG_PACKET_DIAG is not set CONFIG_UNIX=y # CONFIG_UNIX_DIAG is not set CONFIG_XFRM=y +CONFIG_XFRM_ALGO=m CONFIG_XFRM_USER=m # CONFIG_XFRM_SUB_POLICY is not set # CONFIG_XFRM_MIGRATE is not set @@ -590,6 +596,7 @@ CONFIG_IP_ROUTE_CLASSID=y # CONFIG_IP_PNP is not set CONFIG_NET_IPIP=m CONFIG_NET_IPGRE_DEMUX=m +CONFIG_NET_IP_TUNNEL=m CONFIG_NET_IPGRE=m CONFIG_NET_IPGRE_BROADCAST=y CONFIG_IP_MROUTE=y @@ -598,6 +605,7 @@ CONFIG_IP_MROUTE_MULTIPLE_TABLES=y # CONFIG_IP_PIMSM_V2 is not set CONFIG_ARPD=y CONFIG_SYN_COOKIES=y +# CONFIG_NET_IPVTI is not set CONFIG_INET_AH=m CONFIG_INET_ESP=m CONFIG_INET_IPCOMP=m @@ -643,6 +651,7 @@ CONFIG_IPV6_SIT=m CONFIG_IPV6_SIT_6RD=y CONFIG_IPV6_NDISC_NODETYPE=y CONFIG_IPV6_TUNNEL=m +CONFIG_IPV6_GRE=m CONFIG_IPV6_MULTIPLE_TABLES=y CONFIG_IPV6_SUBTREES=y CONFIG_IPV6_MROUTE=y @@ -667,6 +676,7 @@ CONFIG_NF_CONNTRACK_MARK=y # CONFIG_NF_CONNTRACK_ZONES is not set CONFIG_NF_CONNTRACK_PROCFS=y # CONFIG_NF_CONNTRACK_EVENTS is not set +# CONFIG_NF_CONNTRACK_TIMEOUT is not set # CONFIG_NF_CONNTRACK_TIMESTAMP is not set # CONFIG_NF_CT_PROTO_DCCP is not set CONFIG_NF_CT_PROTO_GRE=m @@ -684,6 +694,15 @@ CONFIG_NF_CONNTRACK_PPTP=m CONFIG_NF_CONNTRACK_SIP=m CONFIG_NF_CONNTRACK_TFTP=m CONFIG_NF_CT_NETLINK=m +# CONFIG_NF_CT_NETLINK_TIMEOUT is not set +# CONFIG_NETFILTER_NETLINK_QUEUE_CT is not set +CONFIG_NF_NAT=m +CONFIG_NF_NAT_NEEDED=y +CONFIG_NF_NAT_AMANDA=m +CONFIG_NF_NAT_FTP=m +CONFIG_NF_NAT_IRC=m +CONFIG_NF_NAT_SIP=m +CONFIG_NF_NAT_TFTP=m CONFIG_NETFILTER_TPROXY=m CONFIG_NETFILTER_XTABLES=m @@ -698,17 +717,21 @@ CONFIG_NETFILTER_XT_CONNMARK=m # # CONFIG_NETFILTER_XT_TARGET_CHECKSUM is not set CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m -CONFIG_NETFILTER_XT_TARGET_CONNMARK=m +# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set CONFIG_NETFILTER_XT_TARGET_CT=m CONFIG_NETFILTER_XT_TARGET_DSCP=m CONFIG_NETFILTER_XT_TARGET_HL=m +# CONFIG_NETFILTER_XT_TARGET_HMARK is not set # CONFIG_NETFILTER_XT_TARGET_IDLETIMER is not set CONFIG_NETFILTER_XT_TARGET_LED=m -CONFIG_NETFILTER_XT_TARGET_MARK=m +CONFIG_NETFILTER_XT_TARGET_LOG=m +# CONFIG_NETFILTER_XT_TARGET_MARK is not set +CONFIG_NETFILTER_XT_TARGET_NETMAP=m # CONFIG_NETFILTER_XT_TARGET_NFLOG is not set # CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set CONFIG_NETFILTER_XT_TARGET_NOTRACK=m # CONFIG_NETFILTER_XT_TARGET_RATEEST is not set +CONFIG_NETFILTER_XT_TARGET_REDIRECT=m CONFIG_NETFILTER_XT_TARGET_TEE=m CONFIG_NETFILTER_XT_TARGET_TPROXY=m # CONFIG_NETFILTER_XT_TARGET_TRACE is not set @@ -718,12 +741,14 @@ CONFIG_NETFILTER_XT_TARGET_TCPMSS=m # # Xtables matches # -# CONFIG_NETFILTER_XT_MATCH_ADDRTYPE is not set +CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m +# CONFIG_NETFILTER_XT_MATCH_BPF is not set # CONFIG_NETFILTER_XT_MATCH_CLUSTER is not set CONFIG_NETFILTER_XT_MATCH_COMMENT=m CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m -# CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set -CONFIG_NETFILTER_XT_MATCH_CONNMARK=m +# CONFIG_NETFILTER_XT_MATCH_CONNLABEL is not set +CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m +# CONFIG_NETFILTER_XT_MATCH_CONNMARK is not set CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m # CONFIG_NETFILTER_XT_MATCH_CPU is not set # CONFIG_NETFILTER_XT_MATCH_DCCP is not set @@ -735,12 +760,10 @@ CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m CONFIG_NETFILTER_XT_MATCH_HELPER=m CONFIG_NETFILTER_XT_MATCH_HL=m CONFIG_NETFILTER_XT_MATCH_IPRANGE=m -CONFIG_NETFILTER_XT_MATCH_LAYER7=m -# CONFIG_NETFILTER_XT_MATCH_LAYER7_DEBUG is not set CONFIG_NETFILTER_XT_MATCH_LENGTH=m CONFIG_NETFILTER_XT_MATCH_LIMIT=m CONFIG_NETFILTER_XT_MATCH_MAC=m -CONFIG_NETFILTER_XT_MATCH_MARK=m +# CONFIG_NETFILTER_XT_MATCH_MARK is not set CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m # CONFIG_NETFILTER_XT_MATCH_NFACCT is not set # CONFIG_NETFILTER_XT_MATCH_OSF is not set @@ -769,7 +792,6 @@ CONFIG_NETFILTER_XT_MATCH_U32=m CONFIG_NF_DEFRAG_IPV4=m CONFIG_NF_CONNTRACK_IPV4=m # CONFIG_NF_CONNTRACK_PROC_COMPAT is not set -CONFIG_IP_NF_QUEUE=m CONFIG_IP_NF_IPTABLES=m CONFIG_IP_NF_MATCH_AH=m # CONFIG_IP_NF_MATCH_ECN is not set @@ -777,22 +799,15 @@ CONFIG_IP_NF_MATCH_AH=m # CONFIG_IP_NF_MATCH_TTL is not set CONFIG_IP_NF_FILTER=m CONFIG_IP_NF_TARGET_REJECT=m -CONFIG_IP_NF_TARGET_LOG=m CONFIG_IP_NF_TARGET_ULOG=m -CONFIG_NF_NAT=m -CONFIG_NF_NAT_NEEDED=y +CONFIG_NF_NAT_IPV4=m CONFIG_IP_NF_TARGET_MASQUERADE=m CONFIG_IP_NF_TARGET_NETMAP=m CONFIG_IP_NF_TARGET_REDIRECT=m CONFIG_NF_NAT_SNMP_BASIC=m CONFIG_NF_NAT_PROTO_GRE=m -CONFIG_NF_NAT_FTP=m -CONFIG_NF_NAT_IRC=m -CONFIG_NF_NAT_TFTP=m -CONFIG_NF_NAT_AMANDA=m CONFIG_NF_NAT_PPTP=m CONFIG_NF_NAT_H323=m -CONFIG_NF_NAT_SIP=m CONFIG_IP_NF_MANGLE=m # CONFIG_IP_NF_TARGET_CLUSTERIP is not set CONFIG_IP_NF_TARGET_ECN=m @@ -807,7 +822,6 @@ CONFIG_IP_NF_ARP_MANGLE=m # CONFIG_NF_DEFRAG_IPV6=m CONFIG_NF_CONNTRACK_IPV6=m -CONFIG_IP6_NF_QUEUE=m CONFIG_IP6_NF_IPTABLES=m CONFIG_IP6_NF_MATCH_AH=m CONFIG_IP6_NF_MATCH_EUI64=m @@ -819,11 +833,13 @@ CONFIG_IP6_NF_MATCH_MH=m # CONFIG_IP6_NF_MATCH_RPFILTER is not set CONFIG_IP6_NF_MATCH_RT=m # CONFIG_IP6_NF_TARGET_HL is not set -CONFIG_IP6_NF_TARGET_LOG=m CONFIG_IP6_NF_FILTER=m CONFIG_IP6_NF_TARGET_REJECT=m CONFIG_IP6_NF_MANGLE=m CONFIG_IP6_NF_RAW=m +CONFIG_NF_NAT_IPV6=m +CONFIG_IP6_NF_TARGET_MASQUERADE=m +CONFIG_IP6_NF_TARGET_NPT=m CONFIG_BRIDGE_NF_EBTABLES=m CONFIG_BRIDGE_EBT_BROUTE=m CONFIG_BRIDGE_EBT_T_FILTER=m @@ -850,9 +866,11 @@ CONFIG_BRIDGE_EBT_NFLOG=m CONFIG_IP_SCTP=m # CONFIG_SCTP_DBG_MSG is not set # CONFIG_SCTP_DBG_OBJCNT is not set -# CONFIG_SCTP_HMAC_NONE is not set -# CONFIG_SCTP_HMAC_SHA1 is not set -CONFIG_SCTP_HMAC_MD5=y +CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5=y +# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1 is not set +# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set +CONFIG_SCTP_COOKIE_HMAC_MD5=y +# CONFIG_SCTP_COOKIE_HMAC_SHA1 is not set # CONFIG_RDS is not set # CONFIG_TIPC is not set CONFIG_ATM=m @@ -869,9 +887,11 @@ CONFIG_L2TP_ETH=m CONFIG_STP=y CONFIG_BRIDGE=y CONFIG_BRIDGE_IGMP_SNOOPING=y -# CONFIG_NET_DSA is not set +# CONFIG_BRIDGE_VLAN_FILTERING is not set +CONFIG_HAVE_NET_DSA=y CONFIG_VLAN_8021Q=y # CONFIG_VLAN_8021Q_GVRP is not set +# CONFIG_VLAN_8021Q_MVRP is not set # CONFIG_DECNET is not set CONFIG_LLC=y # CONFIG_LLC2 is not set @@ -882,11 +902,8 @@ CONFIG_DEV_APPLETALK=m # CONFIG_COPS is not set CONFIG_IPDDP=m CONFIG_IPDDP_ENCAP=y -CONFIG_IPDDP_DECAP=y # CONFIG_X25 is not set # CONFIG_LAPB is not set -# CONFIG_ECONET is not set -# CONFIG_WAN_ROUTER is not set # CONFIG_PHONET is not set # CONFIG_IEEE802154 is not set CONFIG_NET_SCHED=y @@ -915,8 +932,9 @@ CONFIG_NET_SCH_NETEM=m # CONFIG_NET_SCH_CHOKE is not set # CONFIG_NET_SCH_QFQ is not set CONFIG_NET_SCH_CODEL=m -CONFIG_NET_SCH_FQ_CODEL=m +CONFIG_NET_SCH_FQ_CODEL=y CONFIG_NET_SCH_INGRESS=m +# CONFIG_NET_SCH_PLUG is not set # # Classification @@ -927,7 +945,7 @@ CONFIG_NET_CLS_TCINDEX=m CONFIG_NET_CLS_ROUTE4=m CONFIG_NET_CLS_FW=m CONFIG_NET_CLS_U32=m -CONFIG_CLS_U32_PERF=y +# CONFIG_CLS_U32_PERF is not set CONFIG_CLS_U32_MARK=y # CONFIG_NET_CLS_RSVP is not set # CONFIG_NET_CLS_RSVP6 is not set @@ -939,6 +957,7 @@ CONFIG_NET_EMATCH_NBYTE=m CONFIG_NET_EMATCH_U32=m CONFIG_NET_EMATCH_META=m CONFIG_NET_EMATCH_TEXT=m +# CONFIG_NET_EMATCH_CANID is not set CONFIG_NET_CLS_ACT=y CONFIG_NET_ACT_POLICE=m # CONFIG_NET_ACT_GACT is not set @@ -953,8 +972,12 @@ CONFIG_NET_ACT_CONNMARK=m CONFIG_NET_CLS_IND=y CONFIG_NET_SCH_FIFO=y # CONFIG_DCB is not set +CONFIG_DNS_RESOLVER=m # CONFIG_BATMAN_ADV is not set # CONFIG_OPENVSWITCH is not set +# CONFIG_VSOCKETS is not set +# CONFIG_NETLINK_MMAP is not set +# CONFIG_NETLINK_DIAG is not set CONFIG_BQL=y # @@ -982,7 +1005,37 @@ CONFIG_MKISS=m # CONFIG_BAYCOM_SER_FDX is not set # CONFIG_BAYCOM_SER_HDX is not set # CONFIG_YAM is not set -# CONFIG_CAN is not set +CONFIG_CAN=m +CONFIG_CAN_RAW=m +CONFIG_CAN_BCM=m +CONFIG_CAN_GW=m + +# +# CAN Device Drivers +# +CONFIG_CAN_VCAN=m +CONFIG_CAN_SLCAN=m +CONFIG_CAN_DEV=m +CONFIG_CAN_CALC_BITTIMING=y +CONFIG_CAN_LEDS=y +# CONFIG_CAN_MCP251X is not set +# CONFIG_PCH_CAN is not set +# CONFIG_CAN_SJA1000 is not set +CONFIG_CAN_C_CAN=m +CONFIG_CAN_C_CAN_PLATFORM=m +CONFIG_CAN_C_CAN_PCI=m +# CONFIG_CAN_CC770 is not set + +# +# CAN USB interfaces +# +CONFIG_CAN_EMS_USB=m +CONFIG_CAN_ESD_USB2=m +CONFIG_CAN_KVASER_USB=m +CONFIG_CAN_PEAK_USB=m +CONFIG_CAN_8DEV_USB=m +# CONFIG_CAN_SOFTING is not set +# CONFIG_CAN_DEBUG_DEVICES is not set # CONFIG_IRDA is not set CONFIG_BT=m CONFIG_BT_RFCOMM=m @@ -1003,6 +1056,7 @@ CONFIG_BT_HCIUART_H4=y CONFIG_BT_HCIUART_BCSP=y # CONFIG_BT_HCIUART_ATH3K is not set # CONFIG_BT_HCIUART_LL is not set +# CONFIG_BT_HCIUART_3WIRE is not set # CONFIG_BT_HCIBCM203X is not set # CONFIG_BT_HCIBPA10X is not set # CONFIG_BT_HCIBFUSB is not set @@ -1013,7 +1067,9 @@ CONFIG_BT_HCIUART_BCSP=y # CONFIG_BT_HCIVHCI is not set # CONFIG_BT_MRVL is not set # CONFIG_BT_ATH3K is not set -# CONFIG_AF_RXRPC is not set +CONFIG_AF_RXRPC=m +# CONFIG_AF_RXRPC_DEBUG is not set +CONFIG_RXKAD=m CONFIG_FIB_RULES=y CONFIG_WIRELESS=y CONFIG_WIRELESS_EXT=y @@ -1022,7 +1078,6 @@ CONFIG_WEXT_PROC=y CONFIG_WEXT_SPY=y CONFIG_WEXT_PRIV=y # CONFIG_CFG80211 is not set -# CONFIG_WIRELESS_EXT_SYSFS is not set CONFIG_LIB80211=m CONFIG_LIB80211_CRYPT_WEP=m CONFIG_LIB80211_CRYPT_CCMP=m @@ -1033,9 +1088,7 @@ CONFIG_LIB80211_CRYPT_TKIP=m # CFG80211 needs to be enabled for MAC80211 # # CONFIG_WIMAX is not set -CONFIG_RFKILL=m -CONFIG_RFKILL_LEDS=y -CONFIG_RFKILL_INPUT=y +# CONFIG_RFKILL is not set # CONFIG_NET_9P is not set # CONFIG_CAIF is not set # CONFIG_CEPH_LIB is not set @@ -1055,19 +1108,43 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y CONFIG_FW_LOADER=y CONFIG_FIRMWARE_IN_KERNEL=y CONFIG_EXTRA_FIRMWARE="" +CONFIG_FW_LOADER_USER_HELPER=y # CONFIG_DEBUG_DRIVER is not set # CONFIG_DEBUG_DEVRES is not set # CONFIG_SYS_HYPERVISOR is not set # CONFIG_GENERIC_CPU_DEVICES is not set -CONFIG_REGMAP=y +CONFIG_REGMAP=m CONFIG_REGMAP_I2C=m CONFIG_REGMAP_SPI=m -# CONFIG_DMA_SHARED_BUFFER is not set +CONFIG_DMA_SHARED_BUFFER=y +# CONFIG_CMA is not set + +# +# Bus devices +# # CONFIG_CONNECTOR is not set CONFIG_MTD=y -CONFIG_MTD_TESTS=m + +# +# OpenWrt specific MTD options +# CONFIG_MTD_ROOTFS_ROOT_DEV=y CONFIG_MTD_ROOTFS_SPLIT=y +# CONFIG_MTD_SPLIT_FIRMWARE is not set + +# +# Rootfs partition parsers +# +# CONFIG_MTD_SPLIT_SQUASHFS_ROOT is not set + +# +# Firmware partition parsers +# +# CONFIG_MTD_SPLIT_SEAMA_FW is not set +# CONFIG_MTD_SPLIT_UIMAGE_FW is not set +# CONFIG_MTD_SPLIT_LZMA_FW is not set +CONFIG_MTD_SPLIT=y +CONFIG_MTD_TESTS=m # CONFIG_MTD_REDBOOT_PARTS is not set # CONFIG_MTD_CMDLINE_PARTS is not set # CONFIG_MTD_AR7_PARTS is not set @@ -1075,7 +1152,6 @@ CONFIG_MTD_ROOTFS_SPLIT=y # # User Modules And Translation Layers # -CONFIG_MTD_CHAR=y CONFIG_MTD_BLKDEVS=y CONFIG_MTD_BLOCK=y # CONFIG_FTL is not set @@ -1129,21 +1205,17 @@ CONFIG_MTD_BLOCK2MTD=y # # Disk-On-Chip Device Drivers # -# CONFIG_MTD_DOC2000 is not set -# CONFIG_MTD_DOC2001 is not set -# CONFIG_MTD_DOC2001PLUS is not set # CONFIG_MTD_DOCG3 is not set CONFIG_MTD_NAND_ECC=m # CONFIG_MTD_NAND_ECC_SMC is not set CONFIG_MTD_NAND=m -# CONFIG_MTD_NAND_VERIFY_WRITE is not set # CONFIG_MTD_NAND_ECC_BCH is not set # CONFIG_MTD_SM_COMMON is not set -# CONFIG_MTD_NAND_MUSEUM_IDS is not set # CONFIG_MTD_NAND_DENALI is not set CONFIG_MTD_NAND_IDS=m # CONFIG_MTD_NAND_RICOH is not set # CONFIG_MTD_NAND_DISKONCHIP is not set +# CONFIG_MTD_NAND_DOCG4 is not set # CONFIG_MTD_NAND_CAFE is not set # CONFIG_MTD_NAND_CS553X is not set CONFIG_MTD_NAND_NANDSIM=m @@ -1168,7 +1240,6 @@ CONFIG_ISAPNP=y CONFIG_PNPACPI=y CONFIG_BLK_DEV=y # CONFIG_BLK_DEV_FD is not set -# CONFIG_BLK_DEV_XD is not set # CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set # CONFIG_BLK_CPQ_DA is not set # CONFIG_BLK_CPQ_CISS_DA is not set @@ -1178,31 +1249,30 @@ CONFIG_BLK_DEV=y CONFIG_BLK_DEV_LOOP=m CONFIG_BLK_DEV_LOOP_MIN_COUNT=8 # CONFIG_BLK_DEV_CRYPTOLOOP is not set - -# -# DRBD disabled because PROC_FS, INET or CONNECTOR not selected -# +# CONFIG_BLK_DEV_DRBD is not set CONFIG_BLK_DEV_NBD=m # CONFIG_BLK_DEV_NVME is not set # CONFIG_BLK_DEV_SX8 is not set -# CONFIG_BLK_DEV_UB is not set # CONFIG_BLK_DEV_RAM is not set # CONFIG_CDROM_PKTCDVD is not set CONFIG_ATA_OVER_ETH=m # CONFIG_BLK_DEV_HD is not set # CONFIG_BLK_DEV_RBD is not set +# CONFIG_BLK_DEV_RSXX is not set # # Misc devices # # CONFIG_SENSORS_LIS3LV02D is not set # CONFIG_AD525X_DPOT is not set +# CONFIG_DUMMY_IRQ is not set # CONFIG_IBM_ASM is not set # CONFIG_PHANTOM is not set # CONFIG_INTEL_MID_PTI is not set # CONFIG_SGI_IOC4 is not set # CONFIG_TIFM_CORE is not set # CONFIG_ICS932S401 is not set +# CONFIG_ATMEL_SSC is not set # CONFIG_ENCLOSURE_SERVICES is not set CONFIG_CS5535_MFGPT=m CONFIG_CS5535_MFGPT_DEFAULT_IRQ=7 @@ -1218,10 +1288,12 @@ CONFIG_CS5535_CLOCK_EVENT_SRC=m # CONFIG_HMC6352 is not set # CONFIG_DS1682 is not set # CONFIG_TI_DAC7512 is not set -# CONFIG_VMWARE_BALLOON is not set -# CONFIG_BMP085 is not set +# CONFIG_BMP085_I2C is not set +# CONFIG_BMP085_SPI is not set # CONFIG_PCH_PHUB is not set # CONFIG_USB_SWITCH_FSA9480 is not set +# CONFIG_LATTICE_ECP3_CONFIG is not set +# CONFIG_SRAM is not set # CONFIG_C2PORT is not set # @@ -1234,7 +1306,6 @@ CONFIG_EEPROM_AT25=m CONFIG_EEPROM_93CX6=m # CONFIG_EEPROM_93XX46 is not set # CONFIG_CB710_CORE is not set -# CONFIG_IWMC3200TOP is not set # # Texas Instruments shared transport line discipline @@ -1245,6 +1316,9 @@ CONFIG_EEPROM_93CX6=m # Altera FPGA firmware download module # # CONFIG_ALTERA_STAPL is not set +# CONFIG_INTEL_MEI is not set +# CONFIG_INTEL_MEI_ME is not set +# CONFIG_VMWARE_VMCI is not set CONFIG_HAVE_IDE=y CONFIG_IDE=m @@ -1342,7 +1416,7 @@ CONFIG_SCSI_PROC_FS=y CONFIG_BLK_DEV_SD=y # CONFIG_CHR_DEV_ST is not set # CONFIG_CHR_DEV_OSST is not set -CONFIG_BLK_DEV_SR=m +CONFIG_BLK_DEV_SR=y # CONFIG_BLK_DEV_SR_VENDOR is not set CONFIG_CHR_DEV_SG=m # CONFIG_CHR_DEV_SCH is not set @@ -1350,7 +1424,6 @@ CONFIG_SCSI_MULTI_LUN=y # CONFIG_SCSI_CONSTANTS is not set # CONFIG_SCSI_LOGGING is not set # CONFIG_SCSI_SCAN_ASYNC is not set -CONFIG_SCSI_WAIT_SCAN=m # # SCSI Transports @@ -1396,6 +1469,8 @@ CONFIG_SCSI_MVSAS=m # CONFIG_MEGARAID_LEGACY is not set # CONFIG_MEGARAID_SAS is not set # CONFIG_SCSI_MPT2SAS is not set +# CONFIG_SCSI_MPT3SAS is not set +# CONFIG_SCSI_UFSHCD is not set # CONFIG_SCSI_HPTIOP is not set # CONFIG_SCSI_BUSLOGIC is not set # CONFIG_VMWARE_PVSCSI is not set @@ -1436,6 +1511,7 @@ CONFIG_SCSI_MVSAS=m # CONFIG_SCSI_PM8001 is not set # CONFIG_SCSI_SRP is not set # CONFIG_SCSI_BFA_FC is not set +# CONFIG_SCSI_CHELSIO_FCOE is not set # CONFIG_SCSI_LOWLEVEL_PCMCIA is not set # CONFIG_SCSI_DH is not set # CONFIG_SCSI_OSD_INITIATOR is not set @@ -1467,11 +1543,12 @@ CONFIG_ATA_BMDMA=y # SATA SFF controllers with BMDMA # CONFIG_ATA_PIIX=y +# CONFIG_SATA_HIGHBANK is not set CONFIG_SATA_MV=m CONFIG_SATA_NV=m # CONFIG_SATA_PROMISE is not set CONFIG_SATA_SIL=m -CONFIG_SATA_SIS=m +# CONFIG_SATA_SIS is not set # CONFIG_SATA_SVW is not set # CONFIG_SATA_ULI is not set CONFIG_SATA_VIA=m @@ -1513,7 +1590,7 @@ CONFIG_PATA_SC1200=y # CONFIG_PATA_SCH is not set # CONFIG_PATA_SERVERWORKS is not set # CONFIG_PATA_SIL680 is not set -CONFIG_PATA_SIS=m +# CONFIG_PATA_SIS is not set # CONFIG_PATA_TOSHIBA is not set # CONFIG_PATA_TRIFLEX is not set CONFIG_PATA_VIA=y @@ -1547,11 +1624,14 @@ CONFIG_MD_RAID10=m CONFIG_MD_RAID456=m CONFIG_MD_MULTIPATH=m # CONFIG_MD_FAULTY is not set +# CONFIG_BCACHE is not set +CONFIG_BLK_DEV_DM_BUILTIN=y CONFIG_BLK_DEV_DM=m # CONFIG_DM_DEBUG is not set CONFIG_DM_CRYPT=m # CONFIG_DM_SNAPSHOT is not set # CONFIG_DM_THIN_PROVISIONING is not set +# CONFIG_DM_CACHE is not set CONFIG_DM_MIRROR=m # CONFIG_DM_RAID is not set # CONFIG_DM_LOG_USERSPACE is not set @@ -1560,6 +1640,7 @@ CONFIG_DM_MIRROR=m # CONFIG_DM_DELAY is not set # CONFIG_DM_UEVENT is not set # CONFIG_DM_FLAKEY is not set +# CONFIG_DM_VERITY is not set # CONFIG_TARGET_CORE is not set # CONFIG_FUSION is not set @@ -1568,7 +1649,6 @@ CONFIG_DM_MIRROR=m # CONFIG_FIREWIRE=m CONFIG_FIREWIRE_OHCI=m -CONFIG_FIREWIRE_OHCI_DEBUG=y CONFIG_FIREWIRE_SBP2=m CONFIG_FIREWIRE_NET=m # CONFIG_FIREWIRE_NOSY is not set @@ -1585,11 +1665,12 @@ CONFIG_IFB=m # CONFIG_NET_TEAM is not set CONFIG_MACVLAN=m # CONFIG_MACVTAP is not set +# CONFIG_VXLAN is not set # CONFIG_NETCONSOLE is not set # CONFIG_NETPOLL is not set # CONFIG_NET_POLL_CONTROLLER is not set CONFIG_TUN=m -# CONFIG_VETH is not set +CONFIG_VETH=m # CONFIG_ARCNET is not set CONFIG_ATM_DRIVERS=y # CONFIG_ATM_DUMMY is not set @@ -1610,9 +1691,17 @@ CONFIG_ATM_SOLOS=m # # CAIF transport drivers # + +# +# Distributed Switch Architecture drivers +# +# CONFIG_NET_DSA_MV88E6XXX is not set +# CONFIG_NET_DSA_MV88E6060 is not set +# CONFIG_NET_DSA_MV88E6XXX_NEED_PPU is not set +# CONFIG_NET_DSA_MV88E6131 is not set +# CONFIG_NET_DSA_MV88E6123_61_65 is not set CONFIG_ETHERNET=y CONFIG_NET_VENDOR_3COM=y -# CONFIG_EL1 is not set # CONFIG_EL3 is not set # CONFIG_3C515 is not set # CONFIG_PCMCIA_3C574 is not set @@ -1627,7 +1716,6 @@ CONFIG_NET_VENDOR_AMD=y # CONFIG_AMD8111_ETH is not set # CONFIG_LANCE is not set CONFIG_PCNET32=m -# CONFIG_DEPCA is not set # CONFIG_PCMCIA_NMCLAN is not set # CONFIG_NI65 is not set CONFIG_NET_VENDOR_ATHEROS=y @@ -1635,6 +1723,10 @@ CONFIG_ATL2=m CONFIG_ATL1=m CONFIG_ATL1E=m CONFIG_ATL1C=m +# CONFIG_ALX is not set +CONFIG_NET_CADENCE=y +# CONFIG_ARM_AT91_ETHER is not set +# CONFIG_MACB is not set CONFIG_NET_VENDOR_BROADCOM=y CONFIG_B44=m CONFIG_B44_PCI_AUTOSELECT=y @@ -1658,7 +1750,6 @@ CONFIG_NET_VENDOR_CISCO=y # CONFIG_ENIC is not set # CONFIG_DNET is not set CONFIG_NET_VENDOR_DEC=y -# CONFIG_EWRK3 is not set CONFIG_NET_TULIP=y CONFIG_DE2104X=m CONFIG_DE2104X_DSL=0 @@ -1667,7 +1758,7 @@ CONFIG_TULIP_MWI=y CONFIG_TULIP_MMIO=y CONFIG_TULIP_NAPI=y CONFIG_TULIP_NAPI_HW_MITIGATION=y -CONFIG_DE4X5=m +# CONFIG_DE4X5 is not set CONFIG_WINBOND_840=m CONFIG_DM9102=m CONFIG_ULI526X=m @@ -1681,32 +1772,24 @@ CONFIG_NET_VENDOR_EXAR=y # CONFIG_S2IO is not set # CONFIG_VXGE is not set CONFIG_NET_VENDOR_FUJITSU=y -# CONFIG_AT1700 is not set # CONFIG_PCMCIA_FMVJ18X is not set -# CONFIG_ETH16I is not set CONFIG_NET_VENDOR_HP=y # CONFIG_HP100 is not set CONFIG_NET_VENDOR_INTEL=y CONFIG_E100=m CONFIG_E1000=m CONFIG_E1000E=m -# CONFIG_IGB is not set +CONFIG_IGB=m +# CONFIG_IGB_HWMON is not set # CONFIG_IGBVF is not set # CONFIG_IXGB is not set # CONFIG_IXGBE is not set # CONFIG_IXGBEVF is not set CONFIG_NET_VENDOR_I825XX=y -# CONFIG_ELPLUS is not set -# CONFIG_EL16 is not set -# CONFIG_APRICOT is not set -# CONFIG_EEXPRESS is not set -# CONFIG_EEXPRESS_PRO is not set -# CONFIG_LP486E is not set -# CONFIG_NI52 is not set -# CONFIG_ZNET is not set # CONFIG_IP1000 is not set # CONFIG_JME is not set CONFIG_NET_VENDOR_MARVELL=y +# CONFIG_MVMDIO is not set CONFIG_SKGE=m # CONFIG_SKGE_DEBUG is not set # CONFIG_SKGE_GENESIS is not set @@ -1728,19 +1811,14 @@ CONFIG_NET_VENDOR_NATSEMI=y CONFIG_NATSEMI=m # CONFIG_NS83820 is not set CONFIG_NET_VENDOR_8390=y -# CONFIG_EL2 is not set -# CONFIG_AC3200 is not set # CONFIG_PCMCIA_AXNET is not set -# CONFIG_E2100 is not set -# CONFIG_HPLAN_PLUS is not set -# CONFIG_HPLAN is not set # CONFIG_NE2000 is not set CONFIG_NE2K_PCI=m # CONFIG_PCMCIA_PCNET is not set # CONFIG_ULTRA is not set # CONFIG_WD80x3 is not set CONFIG_NET_VENDOR_NVIDIA=y -# CONFIG_FORCEDETH is not set +CONFIG_FORCEDETH=m CONFIG_NET_VENDOR_OKI=y # CONFIG_PCH_GBE is not set # CONFIG_ETHOC is not set @@ -1750,7 +1828,6 @@ CONFIG_NET_VENDOR_QLOGIC=y # CONFIG_QLCNIC is not set # CONFIG_QLGE is not set # CONFIG_NETXEN_NIC is not set -# CONFIG_NET_VENDOR_RACAL is not set CONFIG_NET_VENDOR_REALTEK=y CONFIG_8139CP=m CONFIG_8139TOO=m @@ -1762,7 +1839,6 @@ CONFIG_R8169=m CONFIG_NET_VENDOR_RDC=y CONFIG_R6040=m CONFIG_NET_VENDOR_SEEQ=y -# CONFIG_SEEQ8005 is not set CONFIG_NET_VENDOR_SILAN=y # CONFIG_SC92031 is not set CONFIG_NET_VENDOR_SIS=y @@ -1789,6 +1865,7 @@ CONFIG_NET_VENDOR_VIA=y CONFIG_VIA_RHINE=m CONFIG_VIA_RHINE_MMIO=y CONFIG_VIA_VELOCITY=m +# CONFIG_NET_VENDOR_WIZNET is not set CONFIG_NET_VENDOR_XIRCOM=y # CONFIG_PCMCIA_XIRC2PS is not set # CONFIG_FDDI is not set @@ -1802,6 +1879,8 @@ CONFIG_SWCONFIG=m # # MII PHY device drivers # +# CONFIG_AT803X_PHY is not set +# CONFIG_AMD_PHY is not set # CONFIG_MARVELL_PHY is not set # CONFIG_DAVICOM_PHY is not set # CONFIG_QSEMI_PHY is not set @@ -1810,6 +1889,7 @@ CONFIG_SWCONFIG=m # CONFIG_VITESSE_PHY is not set # CONFIG_SMSC_PHY is not set # CONFIG_BROADCOM_PHY is not set +# CONFIG_BCM87XX_PHY is not set # CONFIG_ICPLUS_PHY is not set # CONFIG_REALTEK_PHY is not set # CONFIG_NATIONAL_PHY is not set @@ -1822,6 +1902,7 @@ CONFIG_IP17XX_PHY=m # CONFIG_AR8216_PHY is not set # CONFIG_RTL8306_PHY is not set # CONFIG_MDIO_BITBANG is not set +# CONFIG_B53 is not set # CONFIG_MICREL_KS8995MA is not set # CONFIG_PSB6970_PHY is not set CONFIG_PPP=m @@ -1841,7 +1922,6 @@ CONFIG_SLHC=m CONFIG_SLIP_COMPRESSED=y CONFIG_SLIP_SMART=y CONFIG_SLIP_MODE_SLIP6=y -# CONFIG_TR is not set # # USB Network Adapters @@ -1850,24 +1930,33 @@ CONFIG_SLIP_MODE_SLIP6=y CONFIG_USB_KAWETH=m CONFIG_USB_PEGASUS=m # CONFIG_USB_RTL8150 is not set +# CONFIG_USB_RTL8152 is not set CONFIG_USB_USBNET=m CONFIG_USB_NET_AX8817X=m +# CONFIG_USB_NET_AX88179_178A is not set CONFIG_USB_NET_CDCETHER=m -# CONFIG_USB_NET_CDC_EEM is not set -# CONFIG_USB_NET_CDC_NCM is not set +CONFIG_USB_NET_CDC_EEM=m +CONFIG_USB_NET_CDC_NCM=m +CONFIG_USB_NET_CDC_MBIM=m CONFIG_USB_NET_DM9601=m # CONFIG_USB_NET_SMSC75XX is not set -# CONFIG_USB_NET_SMSC95XX is not set +CONFIG_USB_NET_SMSC95XX=m # CONFIG_USB_NET_GL620A is not set # CONFIG_USB_NET_NET1080 is not set # CONFIG_USB_NET_PLUSB is not set CONFIG_USB_NET_MCS7830=m CONFIG_USB_NET_RNDIS_HOST=m -# CONFIG_USB_NET_CDC_SUBSET is not set +CONFIG_USB_NET_CDC_SUBSET=m +CONFIG_USB_ALI_M5632=y +CONFIG_USB_AN2720=y +CONFIG_USB_BELKIN=y +CONFIG_USB_ARMLINUX=y +# CONFIG_USB_EPSON2888 is not set +# CONFIG_USB_KC2190 is not set # CONFIG_USB_NET_ZAURUS is not set # CONFIG_USB_NET_CX82310_ETH is not set -# CONFIG_USB_NET_KALMIA is not set -CONFIG_USB_HSO=m +CONFIG_USB_NET_KALMIA=m +CONFIG_USB_NET_QMI_WWAN=m # CONFIG_USB_NET_INT51X1 is not set CONFIG_USB_IPHETH=m CONFIG_USB_SIERRA_NET=m @@ -1886,12 +1975,13 @@ CONFIG_HOSTAP_FIRMWARE_NVRAM=y CONFIG_HOSTAP_PLX=m CONFIG_HOSTAP_PCI=m CONFIG_HOSTAP_CS=m +# CONFIG_WL_TI is not set # # Enable WiMAX (Networking options) to see the WiMAX drivers # # CONFIG_WAN is not set -# CONFIG_VMXNET3 is not set +CONFIG_VMXNET3=m CONFIG_ISDN=y CONFIG_ISDN_I4L=m CONFIG_ISDN_PPP=y @@ -1960,7 +2050,6 @@ CONFIG_MISDN_HFCMULTI=m # CONFIG_MISDN_INFINEON is not set # CONFIG_MISDN_W6692 is not set # CONFIG_MISDN_NETJET is not set -# CONFIG_PHONE is not set # # Input device support @@ -1969,6 +2058,7 @@ CONFIG_INPUT=y # CONFIG_INPUT_FF_MEMLESS is not set CONFIG_INPUT_POLLDEV=m # CONFIG_INPUT_SPARSEKMAP is not set +CONFIG_INPUT_MATRIXKMAP=m # # Userland interfaces @@ -1994,6 +2084,7 @@ CONFIG_KEYBOARD_ATKBD=y # CONFIG_KEYBOARD_TCA6416 is not set # CONFIG_KEYBOARD_TCA8418 is not set # CONFIG_KEYBOARD_LM8323 is not set +# CONFIG_KEYBOARD_LM8333 is not set # CONFIG_KEYBOARD_MAX7359 is not set # CONFIG_KEYBOARD_MCS is not set # CONFIG_KEYBOARD_MPR121 is not set @@ -2007,6 +2098,7 @@ CONFIG_MOUSE_PS2=y CONFIG_MOUSE_PS2_ALPS=y CONFIG_MOUSE_PS2_LOGIPS2PP=y CONFIG_MOUSE_PS2_SYNAPTICS=y +# CONFIG_MOUSE_PS2_CYPRESS is not set CONFIG_MOUSE_PS2_LIFEBOOK=y CONFIG_MOUSE_PS2_TRACKPOINT=y # CONFIG_MOUSE_PS2_ELANTECH is not set @@ -2015,18 +2107,20 @@ CONFIG_MOUSE_PS2_TRACKPOINT=y # CONFIG_MOUSE_SERIAL is not set # CONFIG_MOUSE_APPLETOUCH is not set # CONFIG_MOUSE_BCM5974 is not set +# CONFIG_MOUSE_CYAPA is not set # CONFIG_MOUSE_INPORT is not set # CONFIG_MOUSE_LOGIBM is not set # CONFIG_MOUSE_PC110PAD is not set # CONFIG_MOUSE_VSXXXAA is not set # CONFIG_MOUSE_SYNAPTICS_I2C is not set +# CONFIG_MOUSE_SYNAPTICS_USB is not set # CONFIG_INPUT_JOYSTICK is not set # CONFIG_INPUT_TABLET is not set # CONFIG_INPUT_TOUCHSCREEN is not set CONFIG_INPUT_MISC=y # CONFIG_INPUT_AD714X is not set # CONFIG_INPUT_BMA150 is not set -# CONFIG_INPUT_PCSPKR is not set +CONFIG_INPUT_PCSPKR=m # CONFIG_INPUT_MMA8450 is not set # CONFIG_INPUT_MPU3050 is not set # CONFIG_INPUT_APANEL is not set @@ -2041,6 +2135,7 @@ CONFIG_INPUT_CM109=m # CONFIG_INPUT_UINPUT is not set # CONFIG_INPUT_PCF8574 is not set # CONFIG_INPUT_ADXL34X is not set +# CONFIG_INPUT_IMS_PCU is not set # CONFIG_INPUT_CMA3000 is not set # @@ -2055,11 +2150,13 @@ CONFIG_SERIO_LIBPS2=y # CONFIG_SERIO_RAW is not set # CONFIG_SERIO_ALTERA_PS2 is not set # CONFIG_SERIO_PS2MULT is not set +# CONFIG_SERIO_ARC_PS2 is not set # CONFIG_GAMEPORT is not set # # Character devices # +CONFIG_TTY=y CONFIG_VT=y CONFIG_CONSOLE_TRANSLATIONS=y CONFIG_VT_CONSOLE=y @@ -2078,10 +2175,12 @@ CONFIG_UNIX98_PTYS=y # Serial drivers # CONFIG_SERIAL_8250=y +# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set +CONFIG_SERIAL_8250_PNP=y CONFIG_SERIAL_8250_CONSOLE=y +# CONFIG_SERIAL_8250_SYSRQ is not set CONFIG_FIX_EARLYCON_MEM=y CONFIG_SERIAL_8250_PCI=y -CONFIG_SERIAL_8250_PNP=y CONFIG_SERIAL_8250_CS=m CONFIG_SERIAL_8250_NR_UARTS=16 CONFIG_SERIAL_8250_RUNTIME_UARTS=16 @@ -2095,21 +2194,24 @@ CONFIG_SERIAL_8250_MANY_PORTS=y CONFIG_SERIAL_8250_SHARE_IRQ=y # CONFIG_SERIAL_8250_DETECT_IRQ is not set # CONFIG_SERIAL_8250_RSA is not set +# CONFIG_SERIAL_8250_DW is not set # # Non-8250 serial port support # # CONFIG_SERIAL_MAX3100 is not set -# CONFIG_SERIAL_MAX3107 is not set +# CONFIG_SERIAL_MAX310X is not set # CONFIG_SERIAL_MFD_HSU is not set CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y # CONFIG_SERIAL_JSM is not set +# CONFIG_SERIAL_SCCNXP is not set # CONFIG_SERIAL_TIMBERDALE is not set # CONFIG_SERIAL_ALTERA_JTAGUART is not set # CONFIG_SERIAL_ALTERA_UART is not set # CONFIG_SERIAL_PCH_UART is not set -# CONFIG_SERIAL_XILINX_PS_UART is not set +# CONFIG_SERIAL_ARC is not set +# CONFIG_SERIAL_RP2 is not set # CONFIG_TTY_PRINTK is not set # CONFIG_IPMI_HANDLER is not set CONFIG_HW_RANDOM=y @@ -2142,7 +2244,6 @@ CONFIG_HPET_MMAP=y # CONFIG_TCG_TPM is not set # CONFIG_TELCLOCK is not set CONFIG_DEVPORT=y -# CONFIG_RAMOOPS is not set CONFIG_I2C=y CONFIG_I2C_BOARDINFO=y # CONFIG_I2C_COMPAT is not set @@ -2178,6 +2279,7 @@ CONFIG_I2C_ALGOPCA=m # CONFIG_I2C_AMD8111 is not set # CONFIG_I2C_I801 is not set # CONFIG_I2C_ISCH is not set +# CONFIG_I2C_ISMT is not set # CONFIG_I2C_PIIX4 is not set # CONFIG_I2C_NFORCE2 is not set # CONFIG_I2C_SIS5595 is not set @@ -2195,13 +2297,13 @@ CONFIG_I2C_ALGOPCA=m # I2C system bus drivers (mostly embedded / system-on-chip) # # CONFIG_I2C_DESIGNWARE_PCI is not set +# CONFIG_I2C_EG20T is not set # CONFIG_I2C_INTEL_MID is not set # CONFIG_I2C_OCORES is not set # CONFIG_I2C_PCA_PLATFORM is not set # CONFIG_I2C_PXA_PCI is not set # CONFIG_I2C_SIMTEC is not set # CONFIG_I2C_XILINX is not set -# CONFIG_I2C_EG20T is not set # # External I2C/SMBus adapter drivers @@ -2216,11 +2318,11 @@ CONFIG_I2C_TINY_USB=m # # CONFIG_I2C_ELEKTOR is not set # CONFIG_I2C_PCA_ISA is not set -# CONFIG_I2C_STUB is not set CONFIG_SCx200_I2C=m CONFIG_SCx200_I2C_SCL=12 CONFIG_SCx200_I2C_SDA=13 CONFIG_SCx200_ACB=m +# CONFIG_I2C_STUB is not set # CONFIG_I2C_DEBUG_CORE is not set # CONFIG_I2C_DEBUG_ALGO is not set # CONFIG_I2C_DEBUG_BUS is not set @@ -2235,20 +2337,36 @@ CONFIG_SPI_MASTER=y CONFIG_SPI_BITBANG=m # CONFIG_SPI_PXA2XX is not set # CONFIG_SPI_PXA2XX_PCI is not set +# CONFIG_SPI_SC18IS602 is not set # CONFIG_SPI_TOPCLIFF_PCH is not set +# CONFIG_SPI_XCOMM is not set # CONFIG_SPI_XILINX is not set # CONFIG_SPI_DESIGNWARE is not set # # SPI Protocol Masters # -CONFIG_SPI_SPIDEV=m +CONFIG_SPI_SPIDEV=y # CONFIG_SPI_TLE62X0 is not set +# +# Qualcomm MSM SSBI bus support +# +# CONFIG_SSBI is not set +# CONFIG_HSI is not set + # # PPS support # -# CONFIG_PPS is not set +CONFIG_PPS=m +# CONFIG_PPS_DEBUG is not set + +# +# PPS clients support +# +# CONFIG_PPS_CLIENT_KTIMER is not set +# CONFIG_PPS_CLIENT_LDISC is not set +CONFIG_PPS_CLIENT_GPIO=m # # PPS generators support @@ -2257,14 +2375,15 @@ CONFIG_SPI_SPIDEV=m # # PTP clock support # +CONFIG_PTP_1588_CLOCK=m # -# Enable Device Drivers -> PPS to see the PTP clock options. +# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks. # +# CONFIG_PTP_1588_CLOCK_PCH is not set CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y +CONFIG_GPIO_DEVRES=y # CONFIG_GPIOLIB is not set -CONFIG_GENERIC_PWM=m -CONFIG_GPIO_PWM=m CONFIG_W1=m # @@ -2281,19 +2400,24 @@ CONFIG_W1_MASTER_DS2482=m CONFIG_W1_SLAVE_THERM=m CONFIG_W1_SLAVE_SMEM=m # CONFIG_W1_SLAVE_DS2408 is not set +# CONFIG_W1_SLAVE_DS2413 is not set # CONFIG_W1_SLAVE_DS2423 is not set CONFIG_W1_SLAVE_DS2431=m CONFIG_W1_SLAVE_DS2433=m # CONFIG_W1_SLAVE_DS2433_CRC is not set CONFIG_W1_SLAVE_DS2760=m # CONFIG_W1_SLAVE_DS2780 is not set +# CONFIG_W1_SLAVE_DS2781 is not set +# CONFIG_W1_SLAVE_DS28E04 is not set # CONFIG_W1_SLAVE_BQ27000 is not set CONFIG_POWER_SUPPLY=y # CONFIG_POWER_SUPPLY_DEBUG is not set # CONFIG_PDA_POWER is not set +# CONFIG_GENERIC_ADC_BATTERY is not set # CONFIG_TEST_POWER is not set # CONFIG_BATTERY_DS2760 is not set # CONFIG_BATTERY_DS2780 is not set +# CONFIG_BATTERY_DS2781 is not set # CONFIG_BATTERY_DS2782 is not set # CONFIG_BATTERY_SBS is not set # CONFIG_BATTERY_BQ27x00 is not set @@ -2301,6 +2425,11 @@ CONFIG_POWER_SUPPLY=y # CONFIG_BATTERY_MAX17042 is not set # CONFIG_CHARGER_MAX8903 is not set # CONFIG_CHARGER_LP8727 is not set +# CONFIG_CHARGER_BQ2415X is not set +# CONFIG_CHARGER_SMB347 is not set +# CONFIG_BATTERY_GOLDFISH is not set +# CONFIG_POWER_RESET is not set +# CONFIG_POWER_AVS is not set CONFIG_HWMON=m CONFIG_HWMON_VID=m # CONFIG_HWMON_DEBUG_CHIP is not set @@ -2320,6 +2449,9 @@ CONFIG_HWMON_VID=m # CONFIG_SENSORS_ADM1029 is not set # CONFIG_SENSORS_ADM1031 is not set # CONFIG_SENSORS_ADM9240 is not set +CONFIG_SENSORS_ADT7X10=m +# CONFIG_SENSORS_ADT7310 is not set +CONFIG_SENSORS_ADT7410=m # CONFIG_SENSORS_ADT7411 is not set # CONFIG_SENSORS_ADT7462 is not set # CONFIG_SENSORS_ADT7470 is not set @@ -2340,7 +2472,10 @@ CONFIG_SENSORS_ADT7475=m # CONFIG_SENSORS_G760A is not set # CONFIG_SENSORS_GL518SM is not set # CONFIG_SENSORS_GL520SM is not set +CONFIG_SENSORS_GSC=m +# CONFIG_SENSORS_HIH6130 is not set # CONFIG_SENSORS_CORETEMP is not set +# CONFIG_SENSORS_IIO_HWMON is not set # CONFIG_SENSORS_IT87 is not set # CONFIG_SENSORS_JC42 is not set # CONFIG_SENSORS_LINEAGE is not set @@ -2355,21 +2490,26 @@ CONFIG_SENSORS_LM77=m CONFIG_SENSORS_LM85=m # CONFIG_SENSORS_LM87 is not set CONFIG_SENSORS_LM90=m -# CONFIG_SENSORS_LM92 is not set +CONFIG_SENSORS_LM92=m # CONFIG_SENSORS_LM93 is not set # CONFIG_SENSORS_LTC4151 is not set # CONFIG_SENSORS_LTC4215 is not set # CONFIG_SENSORS_LTC4245 is not set # CONFIG_SENSORS_LTC4261 is not set +# CONFIG_SENSORS_LM95234 is not set CONFIG_SENSORS_LM95241=m # CONFIG_SENSORS_LM95245 is not set # CONFIG_SENSORS_MAX1111 is not set # CONFIG_SENSORS_MAX16065 is not set # CONFIG_SENSORS_MAX1619 is not set # CONFIG_SENSORS_MAX1668 is not set +# CONFIG_SENSORS_MAX197 is not set # CONFIG_SENSORS_MAX6639 is not set # CONFIG_SENSORS_MAX6642 is not set # CONFIG_SENSORS_MAX6650 is not set +# CONFIG_SENSORS_MAX6697 is not set +# CONFIG_SENSORS_MCP3021 is not set +# CONFIG_SENSORS_NCT6775 is not set # CONFIG_SENSORS_NTC_THERMISTOR is not set CONFIG_SENSORS_PC87360=m # CONFIG_SENSORS_PC87427 is not set @@ -2392,10 +2532,12 @@ CONFIG_SENSORS_SHT21=m # CONFIG_SENSORS_ADS7828 is not set # CONFIG_SENSORS_ADS7871 is not set # CONFIG_SENSORS_AMC6821 is not set +# CONFIG_SENSORS_INA209 is not set +CONFIG_SENSORS_INA2XX=m # CONFIG_SENSORS_THMC50 is not set # CONFIG_SENSORS_TMP102 is not set # CONFIG_SENSORS_TMP401 is not set -# CONFIG_SENSORS_TMP421 is not set +CONFIG_SENSORS_TMP421=m # CONFIG_SENSORS_VIA_CPUTEMP is not set # CONFIG_SENSORS_VIA686A is not set # CONFIG_SENSORS_VT1211 is not set @@ -2417,8 +2559,17 @@ CONFIG_SENSORS_W83627HF=m # CONFIG_SENSORS_ACPI_POWER is not set # CONFIG_SENSORS_ATK0110 is not set CONFIG_THERMAL=y +CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y +# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set +# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set +# CONFIG_THERMAL_GOV_FAIR_SHARE is not set +CONFIG_THERMAL_GOV_STEP_WISE=y +# CONFIG_THERMAL_GOV_USER_SPACE is not set +CONFIG_CPU_THERMAL=y +# CONFIG_THERMAL_EMULATION is not set +# CONFIG_INTEL_POWERCLAMP is not set CONFIG_WATCHDOG=y -# CONFIG_WATCHDOG_CORE is not set +CONFIG_WATCHDOG_CORE=y # CONFIG_WATCHDOG_NOWAYOUT is not set # @@ -2439,6 +2590,7 @@ CONFIG_SC520_WDT=m # CONFIG_IBMASR is not set # CONFIG_WAFER_WDT is not set # CONFIG_I6300ESB_WDT is not set +# CONFIG_IE6XX_WDT is not set # CONFIG_ITCO_WDT is not set # CONFIG_IT8712F_WDT is not set # CONFIG_IT87_WDT is not set @@ -2461,6 +2613,7 @@ CONFIG_SCx200_WDT=m # CONFIG_W83977F_WDT is not set # CONFIG_MACHZ_WDT is not set # CONFIG_SBC_EPX_C3_WATCHDOG is not set +# CONFIG_GPIO_WDT is not set # # ISA-based Watchdog Cards @@ -2506,6 +2659,7 @@ CONFIG_BCMA=m CONFIG_BCMA_BLOCKIO=y CONFIG_BCMA_HOST_PCI_POSSIBLE=y CONFIG_BCMA_HOST_PCI=y +# CONFIG_BCMA_HOST_SOC is not set # CONFIG_BCMA_DRIVER_GMAC_CMN is not set # CONFIG_BCMA_DEBUG is not set @@ -2513,165 +2667,96 @@ CONFIG_BCMA_HOST_PCI=y # Multifunction device drivers # CONFIG_MFD_CORE=m -# CONFIG_MFD_88PM860X is not set -# CONFIG_MFD_SM501 is not set -# CONFIG_HTC_PASIC3 is not set -# CONFIG_TPS6105X is not set -# CONFIG_TPS6507X is not set -# CONFIG_TWL4030_CORE is not set -# CONFIG_MFD_STMPE is not set -# CONFIG_MFD_TC3589X is not set -# CONFIG_MFD_TMIO is not set +CONFIG_MFD_CS5535=m +# CONFIG_MFD_AS3711 is not set +# CONFIG_PMIC_ADP5520 is not set +# CONFIG_MFD_CROS_EC is not set # CONFIG_PMIC_DA903X is not set # CONFIG_MFD_DA9052_SPI is not set # CONFIG_MFD_DA9052_I2C is not set -# CONFIG_PMIC_ADP5520 is not set +# CONFIG_MFD_DA9055 is not set +# CONFIG_MFD_MC13XXX_SPI is not set +# CONFIG_MFD_MC13XXX_I2C is not set +# CONFIG_HTC_PASIC3 is not set +# CONFIG_LPC_ICH is not set +# CONFIG_LPC_SCH is not set +# CONFIG_MFD_JANZ_CMODIO is not set +# CONFIG_MFD_88PM800 is not set +# CONFIG_MFD_88PM805 is not set +# CONFIG_MFD_88PM860X is not set +# CONFIG_MFD_MAX77686 is not set +# CONFIG_MFD_MAX77693 is not set +# CONFIG_MFD_MAX8907 is not set # CONFIG_MFD_MAX8925 is not set # CONFIG_MFD_MAX8997 is not set # CONFIG_MFD_MAX8998 is not set -# CONFIG_MFD_S5M_CORE is not set +# CONFIG_EZX_PCAP is not set +# CONFIG_MFD_VIPERBOARD is not set +# CONFIG_MFD_RETU is not set +# CONFIG_MFD_PCF50633 is not set +# CONFIG_MFD_RDC321X is not set +# CONFIG_MFD_RTSX_PCI is not set +# CONFIG_MFD_RC5T583 is not set +# CONFIG_MFD_SEC_CORE is not set +# CONFIG_MFD_SI476X_CORE is not set +# CONFIG_MFD_SM501 is not set +# CONFIG_MFD_SMSC is not set +# CONFIG_ABX500_CORE is not set +# CONFIG_MFD_STMPE is not set +# CONFIG_MFD_SYSCON is not set +# CONFIG_MFD_TI_AM335X_TSCADC is not set +# CONFIG_MFD_LP8788 is not set +# CONFIG_MFD_PALMAS is not set +# CONFIG_TPS6105X is not set +# CONFIG_TPS6507X is not set +# CONFIG_MFD_TPS65090 is not set +# CONFIG_MFD_TPS65217 is not set +# CONFIG_MFD_TPS6586X is not set +# CONFIG_MFD_TPS80031 is not set +# CONFIG_TWL4030_CORE is not set +# CONFIG_TWL6040_CORE is not set +# CONFIG_MFD_WL1273_CORE is not set +# CONFIG_MFD_LM3533 is not set +# CONFIG_MFD_TC3589X is not set +# CONFIG_MFD_TMIO is not set +# CONFIG_MFD_VX855 is not set +# CONFIG_MFD_ARIZONA_I2C is not set +# CONFIG_MFD_ARIZONA_SPI is not set # CONFIG_MFD_WM8400 is not set # CONFIG_MFD_WM831X_I2C is not set # CONFIG_MFD_WM831X_SPI is not set # CONFIG_MFD_WM8350_I2C is not set # CONFIG_MFD_WM8994 is not set -# CONFIG_MFD_PCF50633 is not set -# CONFIG_MFD_MC13XXX is not set -# CONFIG_ABX500_CORE is not set -# CONFIG_EZX_PCAP is not set -CONFIG_MFD_CS5535=m -# CONFIG_LPC_SCH is not set -# CONFIG_MFD_RDC321X is not set -# CONFIG_MFD_JANZ_CMODIO is not set -# CONFIG_MFD_VX855 is not set -# CONFIG_MFD_WL1273_CORE is not set # CONFIG_REGULATOR is not set CONFIG_MEDIA_SUPPORT=m # # Multimedia core support # +CONFIG_MEDIA_CAMERA_SUPPORT=y +# CONFIG_MEDIA_ANALOG_TV_SUPPORT is not set +# CONFIG_MEDIA_DIGITAL_TV_SUPPORT is not set +# CONFIG_MEDIA_RADIO_SUPPORT is not set +# CONFIG_MEDIA_RC_SUPPORT is not set # CONFIG_MEDIA_CONTROLLER is not set CONFIG_VIDEO_DEV=m -CONFIG_VIDEO_V4L2_COMMON=m -# CONFIG_DVB_CORE is not set -CONFIG_VIDEO_MEDIA=m - -# -# Multimedia drivers -# -# CONFIG_RC_CORE is not set -# CONFIG_MEDIA_ATTACH is not set -CONFIG_MEDIA_TUNER=m -# CONFIG_MEDIA_TUNER_CUSTOMISE is not set -CONFIG_MEDIA_TUNER_SIMPLE=m -CONFIG_MEDIA_TUNER_TDA8290=m -CONFIG_MEDIA_TUNER_TDA827X=m -CONFIG_MEDIA_TUNER_TDA18271=m -CONFIG_MEDIA_TUNER_TDA9887=m -CONFIG_MEDIA_TUNER_TEA5761=m -CONFIG_MEDIA_TUNER_TEA5767=m -CONFIG_MEDIA_TUNER_MT20XX=m -CONFIG_MEDIA_TUNER_XC2028=m -CONFIG_MEDIA_TUNER_XC5000=m -CONFIG_MEDIA_TUNER_XC4000=m -CONFIG_MEDIA_TUNER_MC44S803=m CONFIG_VIDEO_V4L2=m +# CONFIG_VIDEO_ADV_DEBUG is not set +# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set CONFIG_VIDEOBUF2_CORE=m CONFIG_VIDEOBUF2_MEMOPS=m CONFIG_VIDEOBUF2_VMALLOC=m -CONFIG_VIDEO_CAPTURE_DRIVERS=y -# CONFIG_VIDEO_ADV_DEBUG is not set -# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set -# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set +# CONFIG_VIDEO_V4L2_INT_DEVICE is not set +# CONFIG_TTPCI_EEPROM is not set # -# Encoders, decoders, sensors and other helper chips +# Media drivers # +CONFIG_MEDIA_USB_SUPPORT=y # -# Audio decoders, processors and mixers +# Webcam devices # -# CONFIG_VIDEO_TVAUDIO is not set -# CONFIG_VIDEO_TDA7432 is not set -# CONFIG_VIDEO_TDA9840 is not set -# CONFIG_VIDEO_TEA6415C is not set -# CONFIG_VIDEO_TEA6420 is not set -# CONFIG_VIDEO_MSP3400 is not set -# CONFIG_VIDEO_CS5345 is not set -# CONFIG_VIDEO_CS53L32A is not set -# CONFIG_VIDEO_TLV320AIC23B is not set -# CONFIG_VIDEO_WM8775 is not set -# CONFIG_VIDEO_WM8739 is not set -# CONFIG_VIDEO_VP27SMPX is not set - -# -# RDS decoders -# -# CONFIG_VIDEO_SAA6588 is not set - -# -# Video decoders -# -# CONFIG_VIDEO_ADV7180 is not set -# CONFIG_VIDEO_BT819 is not set -# CONFIG_VIDEO_BT856 is not set -# CONFIG_VIDEO_BT866 is not set -# CONFIG_VIDEO_KS0127 is not set -# CONFIG_VIDEO_SAA7110 is not set -# CONFIG_VIDEO_SAA711X is not set -# CONFIG_VIDEO_SAA7191 is not set -# CONFIG_VIDEO_TVP514X is not set -# CONFIG_VIDEO_TVP5150 is not set -# CONFIG_VIDEO_TVP7002 is not set -# CONFIG_VIDEO_VPX3220 is not set - -# -# Video and audio decoders -# -# CONFIG_VIDEO_SAA717X is not set -# CONFIG_VIDEO_CX25840 is not set - -# -# MPEG video encoders -# -# CONFIG_VIDEO_CX2341X is not set - -# -# Video encoders -# -# CONFIG_VIDEO_SAA7127 is not set -# CONFIG_VIDEO_SAA7185 is not set -# CONFIG_VIDEO_ADV7170 is not set -# CONFIG_VIDEO_ADV7175 is not set -# CONFIG_VIDEO_ADV7343 is not set -# CONFIG_VIDEO_AK881X is not set - -# -# Camera sensor devices -# -# CONFIG_VIDEO_OV7670 is not set -# CONFIG_VIDEO_MT9V011 is not set -# CONFIG_VIDEO_TCM825X is not set -# CONFIG_VIDEO_SR030PC30 is not set - -# -# Flash devices -# - -# -# Video improvement chips -# -# CONFIG_VIDEO_UPD64031A is not set -# CONFIG_VIDEO_UPD64083 is not set - -# -# Miscelaneous helper chips -# -# CONFIG_VIDEO_THS7303 is not set -# CONFIG_VIDEO_M52790 is not set -# CONFIG_VIDEO_VIVI is not set -CONFIG_V4L_USB_DRIVERS=y CONFIG_USB_VIDEO_CLASS=m CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y CONFIG_USB_GSPCA=m @@ -2721,12 +2806,6 @@ CONFIG_USB_GSPCA_VC032X=m # CONFIG_USB_GSPCA_VICAM is not set # CONFIG_USB_GSPCA_XIRLINK_CIT is not set CONFIG_USB_GSPCA_ZC3XX=m -# CONFIG_VIDEO_PVRUSB2 is not set -# CONFIG_VIDEO_HDPVR is not set -# CONFIG_VIDEO_EM28XX is not set -# CONFIG_VIDEO_USBVISION is not set -# CONFIG_USB_ET61X251 is not set -CONFIG_USB_SN9C102=m CONFIG_USB_PWC=m # CONFIG_USB_PWC_DEBUG is not set # CONFIG_USB_PWC_INPUT_EVDEV is not set @@ -2734,19 +2813,134 @@ CONFIG_VIDEO_CPIA2=m # CONFIG_USB_ZR364XX is not set # CONFIG_USB_STKWEBCAM is not set # CONFIG_USB_S2255 is not set -CONFIG_V4L_PCI_DRIVERS=y -# CONFIG_VIDEO_HEXIUM_GEMINI is not set -# CONFIG_VIDEO_HEXIUM_ORION is not set -# CONFIG_VIDEO_MXB is not set -# CONFIG_VIDEO_SAA7134 is not set -# CONFIG_VIDEO_ZORAN is not set -CONFIG_V4L_ISA_PARPORT_DRIVERS=y -# CONFIG_VIDEO_PMS is not set +CONFIG_USB_SN9C102=m + +# +# Webcam, TV (analog/digital) USB devices +# +# CONFIG_VIDEO_EM28XX is not set +# CONFIG_MEDIA_PCI_SUPPORT is not set CONFIG_V4L_PLATFORM_DRIVERS=y # CONFIG_VIDEO_CAFE_CCIC is not set # CONFIG_SOC_CAMERA is not set # CONFIG_V4L_MEM2MEM_DRIVERS is not set -# CONFIG_RADIO_ADAPTERS is not set +# CONFIG_V4L_TEST_DRIVERS is not set + +# +# Supported MMC/SDIO adapters +# +# CONFIG_MEDIA_PARPORT_SUPPORT is not set +# CONFIG_CYPRESS_FIRMWARE is not set + +# +# Media ancillary drivers (tuners, sensors, i2c, frontends) +# +# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set + +# +# Encoders, decoders, sensors and other helper chips +# + +# +# Audio decoders, processors and mixers +# +# CONFIG_VIDEO_TVAUDIO is not set +# CONFIG_VIDEO_TDA7432 is not set +# CONFIG_VIDEO_TDA9840 is not set +# CONFIG_VIDEO_TEA6415C is not set +# CONFIG_VIDEO_TEA6420 is not set +# CONFIG_VIDEO_MSP3400 is not set +# CONFIG_VIDEO_CS5345 is not set +# CONFIG_VIDEO_CS53L32A is not set +# CONFIG_VIDEO_TLV320AIC23B is not set +# CONFIG_VIDEO_UDA1342 is not set +# CONFIG_VIDEO_WM8775 is not set +# CONFIG_VIDEO_WM8739 is not set +# CONFIG_VIDEO_VP27SMPX is not set +# CONFIG_VIDEO_SONY_BTF_MPX is not set + +# +# RDS decoders +# +# CONFIG_VIDEO_SAA6588 is not set + +# +# Video decoders +# +# CONFIG_VIDEO_ADV7180 is not set +# CONFIG_VIDEO_ADV7183 is not set +# CONFIG_VIDEO_BT819 is not set +# CONFIG_VIDEO_BT856 is not set +# CONFIG_VIDEO_BT866 is not set +# CONFIG_VIDEO_KS0127 is not set +# CONFIG_VIDEO_SAA7110 is not set +# CONFIG_VIDEO_SAA711X is not set +# CONFIG_VIDEO_SAA7191 is not set +# CONFIG_VIDEO_TVP514X is not set +# CONFIG_VIDEO_TVP5150 is not set +# CONFIG_VIDEO_TVP7002 is not set +# CONFIG_VIDEO_TW2804 is not set +# CONFIG_VIDEO_TW9903 is not set +# CONFIG_VIDEO_TW9906 is not set +# CONFIG_VIDEO_VPX3220 is not set + +# +# Video and audio decoders +# +# CONFIG_VIDEO_SAA717X is not set +# CONFIG_VIDEO_CX25840 is not set + +# +# Video encoders +# +# CONFIG_VIDEO_SAA7127 is not set +# CONFIG_VIDEO_SAA7185 is not set +# CONFIG_VIDEO_ADV7170 is not set +# CONFIG_VIDEO_ADV7175 is not set +# CONFIG_VIDEO_ADV7343 is not set +# CONFIG_VIDEO_ADV7393 is not set +# CONFIG_VIDEO_AK881X is not set + +# +# Camera sensor devices +# +# CONFIG_VIDEO_OV7640 is not set +# CONFIG_VIDEO_OV7670 is not set +# CONFIG_VIDEO_VS6624 is not set +# CONFIG_VIDEO_MT9V011 is not set +# CONFIG_VIDEO_SR030PC30 is not set + +# +# Flash devices +# + +# +# Video improvement chips +# +# CONFIG_VIDEO_UPD64031A is not set +# CONFIG_VIDEO_UPD64083 is not set + +# +# Miscelaneous helper chips +# +# CONFIG_VIDEO_THS7303 is not set +# CONFIG_VIDEO_M52790 is not set + +# +# Sensors used on soc_camera driver +# + +# +# Customise DVB Frontends +# +# CONFIG_DVB_AU8522_V4L is not set +# CONFIG_DVB_TUNER_DIB0070 is not set +# CONFIG_DVB_TUNER_DIB0090 is not set + +# +# Tools to develop new frontends +# +# CONFIG_DVB_DUMMY_FE is not set # # Graphics support @@ -2766,9 +2960,18 @@ CONFIG_AGP_INTEL=y # CONFIG_VGA_SWITCHEROO is not set CONFIG_DRM=y CONFIG_DRM_KMS_HELPER=y +# CONFIG_DRM_LOAD_EDID_FIRMWARE is not set + +# +# I2C encoder or helper chips +# +# CONFIG_DRM_I2C_CH7006 is not set +# CONFIG_DRM_I2C_SIL164 is not set +# CONFIG_DRM_I2C_NXP_TDA998X is not set # CONFIG_DRM_TDFX is not set # CONFIG_DRM_R128 is not set # CONFIG_DRM_RADEON is not set +# CONFIG_DRM_NOUVEAU is not set # CONFIG_DRM_I810 is not set CONFIG_DRM_I915=y CONFIG_DRM_I915_KMS=y @@ -2778,9 +2981,14 @@ CONFIG_DRM_I915_KMS=y # CONFIG_DRM_SAVAGE is not set # CONFIG_DRM_VMWGFX is not set # CONFIG_DRM_GMA500 is not set -# CONFIG_STUB_POULSBO is not set +# CONFIG_DRM_UDL is not set +# CONFIG_DRM_AST is not set +# CONFIG_DRM_MGAG200 is not set +# CONFIG_DRM_CIRRUS_QEMU is not set +# CONFIG_DRM_QXL is not set # CONFIG_VGASTATE is not set CONFIG_VIDEO_OUTPUT_CONTROL=y +CONFIG_HDMI=y CONFIG_FB=y # CONFIG_FIRMWARE_EDID is not set # CONFIG_FB_DDC is not set @@ -2794,7 +3002,6 @@ CONFIG_FB_CFB_IMAGEBLIT=y # CONFIG_FB_SYS_IMAGEBLIT is not set # CONFIG_FB_FOREIGN_ENDIAN is not set # CONFIG_FB_SYS_FOPS is not set -# CONFIG_FB_WMT_GE_ROPS is not set # CONFIG_FB_SVGALIB is not set # CONFIG_FB_MACMODES is not set # CONFIG_FB_BACKLIGHT is not set @@ -2817,6 +3024,7 @@ CONFIG_FB_CFB_IMAGEBLIT=y # CONFIG_FB_S1D13XXX is not set # CONFIG_FB_NVIDIA is not set # CONFIG_FB_RIVA is not set +# CONFIG_FB_I740 is not set # CONFIG_FB_I810 is not set # CONFIG_FB_LE80578 is not set # CONFIG_FB_MATROX is not set @@ -2840,19 +3048,24 @@ CONFIG_FB_CFB_IMAGEBLIT=y # CONFIG_FB_TMIO is not set # CONFIG_FB_SMSCUFX is not set # CONFIG_FB_UDL is not set +# CONFIG_FB_GOLDFISH is not set # CONFIG_FB_VIRTUAL is not set # CONFIG_FB_METRONOME is not set # CONFIG_FB_MB862XX is not set # CONFIG_FB_BROADSHEET is not set +# CONFIG_FB_AUO_K190X is not set +# CONFIG_EXYNOS_VIDEO is not set CONFIG_BACKLIGHT_LCD_SUPPORT=y # CONFIG_LCD_CLASS_DEVICE is not set CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_BACKLIGHT_GENERIC=y -# CONFIG_BACKLIGHT_PROGEAR is not set # CONFIG_BACKLIGHT_APPLE is not set # CONFIG_BACKLIGHT_SAHARA is not set # CONFIG_BACKLIGHT_ADP8860 is not set # CONFIG_BACKLIGHT_ADP8870 is not set +# CONFIG_BACKLIGHT_LM3630 is not set +# CONFIG_BACKLIGHT_LM3639 is not set +# CONFIG_BACKLIGHT_LP855X is not set # # Console display driver support @@ -2877,6 +3090,7 @@ CONFIG_SND_TIMER=m CONFIG_SND_PCM=m CONFIG_SND_HWDEP=m CONFIG_SND_RAWMIDI=m +CONFIG_SND_COMPRESS_OFFLOAD=m CONFIG_SND_JACK=y CONFIG_SND_SEQUENCER=m CONFIG_SND_SEQ_DUMMY=m @@ -2900,7 +3114,7 @@ CONFIG_SND_RAWMIDI_SEQ=m # CONFIG_SND_EMU10K1_SEQ is not set CONFIG_SND_AC97_CODEC=m CONFIG_SND_DRIVERS=y -# CONFIG_SND_PCSP is not set +CONFIG_SND_PCSP=m # CONFIG_SND_DUMMY is not set # CONFIG_SND_ALOOP is not set CONFIG_SND_VIRMIDI=m @@ -2989,27 +3203,21 @@ CONFIG_SND_USB_AUDIO=m # CONFIG_SND_FIREWIRE is not set # CONFIG_SND_PCMCIA is not set CONFIG_SND_SOC=m +# CONFIG_SND_ATMEL_SOC is not set CONFIG_SND_SOC_I2C_AND_SPI=m # CONFIG_SND_SOC_ALL_CODECS is not set +# CONFIG_SND_SIMPLE_CARD is not set # CONFIG_SOUND_PRIME is not set CONFIG_AC97_BUS=m -CONFIG_HID_SUPPORT=y + +# +# HID support +# CONFIG_HID=y CONFIG_HID_BATTERY_STRENGTH=y -# CONFIG_HIDRAW is not set - -# -# USB Input Devices -# -CONFIG_USB_HID=m -# CONFIG_HID_PID is not set -CONFIG_USB_HIDDEV=y - -# -# USB HID Boot Protocol drivers -# -# CONFIG_USB_KBD is not set -# CONFIG_USB_MOUSE is not set +CONFIG_HIDRAW=y +# CONFIG_UHID is not set +CONFIG_HID_GENERIC=m # # Special HID drivers @@ -3017,6 +3225,8 @@ CONFIG_USB_HIDDEV=y # CONFIG_HID_A4TECH is not set # CONFIG_HID_ACRUX is not set # CONFIG_HID_APPLE is not set +# CONFIG_HID_APPLEIR is not set +# CONFIG_HID_AUREAL is not set # CONFIG_HID_BELKIN is not set # CONFIG_HID_CHERRY is not set # CONFIG_HID_CHICONY is not set @@ -3032,9 +3242,11 @@ CONFIG_USB_HIDDEV=y # CONFIG_HID_UCLOGIC is not set # CONFIG_HID_WALTOP is not set # CONFIG_HID_GYRATION is not set +# CONFIG_HID_ICADE is not set # CONFIG_HID_TWINHAN is not set # CONFIG_HID_KENSINGTON is not set # CONFIG_HID_LCPOWER is not set +# CONFIG_HID_LENOVO_TPKBD is not set # CONFIG_HID_LOGITECH is not set # CONFIG_HID_MAGICMOUSE is not set # CONFIG_HID_MICROSOFT is not set @@ -3046,25 +3258,49 @@ CONFIG_USB_HIDDEV=y # CONFIG_HID_PETALYNX is not set # CONFIG_HID_PICOLCD is not set # CONFIG_HID_PRIMAX is not set +# CONFIG_HID_PS3REMOTE is not set # CONFIG_HID_ROCCAT is not set +# CONFIG_HID_SAITEK is not set # CONFIG_HID_SAMSUNG is not set # CONFIG_HID_SONY is not set # CONFIG_HID_SPEEDLINK is not set +# CONFIG_HID_STEELSERIES is not set # CONFIG_HID_SUNPLUS is not set # CONFIG_HID_GREENASIA is not set # CONFIG_HID_SMARTJOYPLUS is not set +# CONFIG_HID_TIVO is not set # CONFIG_HID_TOPSEED is not set +# CONFIG_HID_THINGM is not set # CONFIG_HID_THRUSTMASTER is not set # CONFIG_HID_WACOM is not set # CONFIG_HID_WIIMOTE is not set # CONFIG_HID_ZEROPLUS is not set # CONFIG_HID_ZYDACRON is not set -CONFIG_USB_SUPPORT=y -CONFIG_USB_COMMON=y -CONFIG_USB_ARCH_HAS_HCD=y +# CONFIG_HID_SENSOR_HUB is not set + +# +# USB HID support +# +CONFIG_USB_HID=m +# CONFIG_HID_PID is not set +CONFIG_USB_HIDDEV=y + +# +# USB HID Boot Protocol drivers +# +# CONFIG_USB_KBD is not set +# CONFIG_USB_MOUSE is not set + +# +# I2C HID support +# +# CONFIG_I2C_HID is not set CONFIG_USB_ARCH_HAS_OHCI=y CONFIG_USB_ARCH_HAS_EHCI=y CONFIG_USB_ARCH_HAS_XHCI=y +CONFIG_USB_SUPPORT=y +CONFIG_USB_COMMON=y +CONFIG_USB_ARCH_HAS_HCD=y CONFIG_USB=y # CONFIG_USB_DEBUG is not set # CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set @@ -3072,41 +3308,45 @@ CONFIG_USB=y # # Miscellaneous USB options # -CONFIG_USB_DEVICEFS=y -# CONFIG_USB_DEVICE_CLASS is not set +CONFIG_USB_DEFAULT_PERSIST=y # CONFIG_USB_DYNAMIC_MINORS is not set # CONFIG_USB_OTG_WHITELIST is not set # CONFIG_USB_OTG_BLACKLIST_HUB is not set -# CONFIG_USB_MON is not set +CONFIG_USB_MON=m # CONFIG_USB_WUSB_CBAF is not set # # USB Host Controller Drivers # # CONFIG_USB_C67X00_HCD is not set -# CONFIG_USB_XHCI_HCD is not set +CONFIG_USB_XHCI_HCD=m +# CONFIG_USB_XHCI_HCD_DEBUGGING is not set CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_ROOT_HUB_TT=y CONFIG_USB_EHCI_TT_NEWSCHED=y -# CONFIG_USB_EHCI_MV is not set +CONFIG_USB_EHCI_PCI=y +CONFIG_USB_EHCI_HCD_PLATFORM=y # CONFIG_USB_OXU210HP_HCD is not set # CONFIG_USB_ISP116X_HCD is not set # CONFIG_USB_ISP1760_HCD is not set # CONFIG_USB_ISP1362_HCD is not set CONFIG_USB_OHCI_HCD=y +CONFIG_USB_OHCI_HCD_PLATFORM=y # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set CONFIG_USB_OHCI_LITTLE_ENDIAN=y CONFIG_USB_UHCI_HCD=y # CONFIG_USB_SL811_HCD is not set # CONFIG_USB_R8A66597_HCD is not set +# CONFIG_USB_HCD_BCMA is not set +# CONFIG_USB_HCD_SSB is not set # # USB Device Class drivers # CONFIG_USB_ACM=m CONFIG_USB_PRINTER=m -# CONFIG_USB_WDM is not set +CONFIG_USB_WDM=m # CONFIG_USB_TMC is not set # @@ -3131,20 +3371,21 @@ CONFIG_USB_STORAGE_ALAUDA=m CONFIG_USB_STORAGE_KARMA=m CONFIG_USB_STORAGE_CYPRESS_ATACB=m # CONFIG_USB_STORAGE_ENE_UB6250 is not set -# CONFIG_USB_UAS is not set -# CONFIG_USB_LIBUSUAL is not set # # USB Imaging devices # # CONFIG_USB_MDC800 is not set # CONFIG_USB_MICROTEK is not set +# CONFIG_USB_DWC3 is not set +CONFIG_USB_CHIPIDEA=m +CONFIG_USB_CHIPIDEA_HOST=y +CONFIG_USB_CHIPIDEA_DEBUG=y # # USB port drivers # CONFIG_USB_SERIAL=m -CONFIG_USB_EZUSB=y CONFIG_USB_SERIAL_GENERIC=y # CONFIG_USB_SERIAL_AIRCABLE is not set CONFIG_USB_SERIAL_ARK3116=m @@ -3162,6 +3403,7 @@ CONFIG_USB_SERIAL_VISOR=m # CONFIG_USB_SERIAL_IR is not set # CONFIG_USB_SERIAL_EDGEPORT is not set # CONFIG_USB_SERIAL_EDGEPORT_TI is not set +# CONFIG_USB_SERIAL_F81232 is not set # CONFIG_USB_SERIAL_GARMIN is not set CONFIG_USB_SERIAL_IPW=m # CONFIG_USB_SERIAL_IUU is not set @@ -3182,6 +3424,7 @@ CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y # CONFIG_USB_SERIAL_KLSI is not set # CONFIG_USB_SERIAL_KOBIL_SCT is not set CONFIG_USB_SERIAL_MCT_U232=m +# CONFIG_USB_SERIAL_METRO is not set CONFIG_USB_SERIAL_MOS7720=m # CONFIG_USB_SERIAL_MOS7840 is not set CONFIG_USB_SERIAL_MOTOROLA=m @@ -3204,8 +3447,12 @@ CONFIG_USB_SERIAL_OPTION=m # CONFIG_USB_SERIAL_OMNINET is not set # CONFIG_USB_SERIAL_OPTICON is not set # CONFIG_USB_SERIAL_VIVOPAY_SERIAL is not set +# CONFIG_USB_SERIAL_XSENS_MT is not set # CONFIG_USB_SERIAL_ZIO is not set +# CONFIG_USB_SERIAL_WISHBONE is not set +# CONFIG_USB_SERIAL_ZTE is not set # CONFIG_USB_SERIAL_SSU100 is not set +# CONFIG_USB_SERIAL_QT2 is not set # CONFIG_USB_SERIAL_DEBUG is not set # @@ -3231,17 +3478,15 @@ CONFIG_USB_SERIAL_OPTION=m CONFIG_USB_TEST=m # CONFIG_USB_ISIGHTFW is not set # CONFIG_USB_YUREX is not set +CONFIG_USB_EZUSB_FX2=m +# CONFIG_USB_HSIC_USB3503 is not set CONFIG_USB_ATM=m CONFIG_USB_SPEEDTOUCH=m CONFIG_USB_CXACRU=m CONFIG_USB_UEAGLEATM=m # CONFIG_USB_XUSBATM is not set +# CONFIG_USB_PHY is not set # CONFIG_USB_GADGET is not set - -# -# OTG and related infrastructure -# -# CONFIG_NOP_USB_XCEIV is not set # CONFIG_UWB is not set CONFIG_MMC=m # CONFIG_MMC_DEBUG is not set @@ -3260,7 +3505,10 @@ CONFIG_MMC_BLOCK_BOUNCE=y # # MMC/SD/SDIO Host Controller Drivers # -# CONFIG_MMC_SDHCI is not set +CONFIG_MMC_SDHCI=m +# CONFIG_MMC_SDHCI_PCI is not set +# CONFIG_MMC_SDHCI_ACPI is not set +CONFIG_MMC_SDHCI_PLTFM=m # CONFIG_MMC_WBSD is not set # CONFIG_MMC_TIFM_SD is not set CONFIG_MMC_SPI=m @@ -3277,33 +3525,42 @@ CONFIG_LEDS_CLASS=y # LED drivers # # CONFIG_LEDS_LM3530 is not set +# CONFIG_LEDS_LM3642 is not set CONFIG_LEDS_NET48XX=m CONFIG_LEDS_WRAP=m # CONFIG_LEDS_PCA9532 is not set # CONFIG_LEDS_LP3944 is not set # CONFIG_LEDS_LP5521 is not set # CONFIG_LEDS_LP5523 is not set +# CONFIG_LEDS_LP5562 is not set # CONFIG_LEDS_CLEVO_MAIL is not set # CONFIG_LEDS_PCA955X is not set +# CONFIG_LEDS_PCA9633 is not set # CONFIG_LEDS_DAC124S085 is not set # CONFIG_LEDS_BD2802 is not set # CONFIG_LEDS_INTEL_SS4200 is not set # CONFIG_LEDS_TCA6507 is not set +# CONFIG_LEDS_LM355x is not set # CONFIG_LEDS_OT200 is not set -CONFIG_LEDS_TRIGGERS=y +# CONFIG_LEDS_BLINKM is not set # # LED Triggers # +CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=y +CONFIG_LEDS_TRIGGER_ONESHOT=m # CONFIG_LEDS_TRIGGER_IDE_DISK is not set CONFIG_LEDS_TRIGGER_HEARTBEAT=m # CONFIG_LEDS_TRIGGER_BACKLIGHT is not set +# CONFIG_LEDS_TRIGGER_CPU is not set CONFIG_LEDS_TRIGGER_DEFAULT_ON=y # # iptables trigger is under Netfilter config (LED target) # +# CONFIG_LEDS_TRIGGER_TRANSIENT is not set +# CONFIG_LEDS_TRIGGER_CAMERA is not set CONFIG_LEDS_TRIGGER_MORSE=m CONFIG_LEDS_TRIGGER_NETDEV=y CONFIG_LEDS_TRIGGER_USBDEV=m @@ -3313,6 +3570,7 @@ CONFIG_LEDS_TRIGGER_USBDEV=m CONFIG_RTC_LIB=y CONFIG_RTC_CLASS=y CONFIG_RTC_HCTOSYS=y +CONFIG_RTC_SYSTOHC=y CONFIG_RTC_HCTOSYS_DEVICE="rtc0" # CONFIG_RTC_DEBUG is not set @@ -3330,13 +3588,14 @@ CONFIG_RTC_INTF_DEV=y # # CONFIG_RTC_DRV_DS1307 is not set # CONFIG_RTC_DRV_DS1374 is not set -# CONFIG_RTC_DRV_DS1672 is not set +CONFIG_RTC_DRV_DS1672=m # CONFIG_RTC_DRV_DS3232 is not set # CONFIG_RTC_DRV_MAX6900 is not set # CONFIG_RTC_DRV_RS5C372 is not set -# CONFIG_RTC_DRV_ISL1208 is not set +CONFIG_RTC_DRV_ISL1208=m # CONFIG_RTC_DRV_ISL12022 is not set # CONFIG_RTC_DRV_X1205 is not set +# CONFIG_RTC_DRV_PCF8523 is not set CONFIG_RTC_DRV_PCF8563=m # CONFIG_RTC_DRV_PCF8583 is not set # CONFIG_RTC_DRV_M41T80 is not set @@ -3361,6 +3620,7 @@ CONFIG_RTC_DRV_PT7C4338=m # CONFIG_RTC_DRV_RS5C348 is not set # CONFIG_RTC_DRV_DS3234 is not set CONFIG_RTC_DRV_PCF2123=m +# CONFIG_RTC_DRV_RX4581 is not set # # Platform RTC drivers @@ -3378,26 +3638,31 @@ CONFIG_RTC_DRV_CMOS=y # CONFIG_RTC_DRV_BQ4802 is not set # CONFIG_RTC_DRV_RP5C01 is not set # CONFIG_RTC_DRV_V3020 is not set +# CONFIG_RTC_DRV_DS2404 is not set # CONFIG_RTC_DRV_RTC7301 is not set # # on-CPU RTC drivers # + +# +# HID Sensor RTC drivers +# +# CONFIG_RTC_DRV_HID_SENSOR_TIME is not set # CONFIG_DMADEVICES is not set # CONFIG_AUXDISPLAY is not set # CONFIG_UIO is not set +# CONFIG_VIRT_DRIVERS is not set # # Virtio drivers # # CONFIG_VIRTIO_PCI is not set -# CONFIG_VIRTIO_BALLOON is not set # CONFIG_VIRTIO_MMIO is not set # # Microsoft Hyper-V guest support # -# CONFIG_HYPERV is not set CONFIG_STAGING=y CONFIG_ET131X=m # CONFIG_SLICOSS is not set @@ -3412,27 +3677,109 @@ CONFIG_USBIP_HOST=m # CONFIG_RTL8192U is not set # CONFIG_RTLLIB is not set # CONFIG_R8712U is not set -# CONFIG_RTS_PSTOR is not set # CONFIG_RTS5139 is not set # CONFIG_TRANZPORT is not set # CONFIG_IDE_PHISON is not set # CONFIG_LINE6_USB is not set -# CONFIG_DRM_NOUVEAU is not set - -# -# I2C encoder or helper chips -# -# CONFIG_DRM_I2C_CH7006 is not set -# CONFIG_DRM_I2C_SIL164 is not set # CONFIG_USB_SERIAL_QUATECH2 is not set -# CONFIG_USB_SERIAL_QUATECH_USB2 is not set # CONFIG_VT6655 is not set # CONFIG_VT6656 is not set -# CONFIG_VME_BUS is not set # CONFIG_DX_SEP is not set -# CONFIG_IIO is not set -# CONFIG_XVMALLOC is not set -# CONFIG_ZRAM is not set + +# +# IIO staging drivers +# + +# +# Accelerometers +# +# CONFIG_ADIS16201 is not set +# CONFIG_ADIS16203 is not set +# CONFIG_ADIS16204 is not set +# CONFIG_ADIS16209 is not set +# CONFIG_ADIS16220 is not set +# CONFIG_ADIS16240 is not set +# CONFIG_SCA3000 is not set + +# +# Analog to digital converters +# +# CONFIG_AD7291 is not set +CONFIG_AD799X=m +CONFIG_AD799X_RING_BUFFER=y +# CONFIG_AD7192 is not set +# CONFIG_AD7280 is not set + +# +# Analog digital bi-direction converters +# + +# +# Capacitance to digital converters +# +# CONFIG_AD7150 is not set +# CONFIG_AD7152 is not set +# CONFIG_AD7746 is not set + +# +# Direct Digital Synthesis +# +# CONFIG_AD5930 is not set +# CONFIG_AD9832 is not set +# CONFIG_AD9834 is not set +# CONFIG_AD9850 is not set +# CONFIG_AD9852 is not set +# CONFIG_AD9910 is not set +# CONFIG_AD9951 is not set + +# +# Digital gyroscope sensors +# +# CONFIG_ADIS16060 is not set +# CONFIG_ADIS16130 is not set +# CONFIG_ADIS16260 is not set + +# +# Network Analyzer, Impedance Converters +# +# CONFIG_AD5933 is not set + +# +# Light sensors +# +# CONFIG_SENSORS_ISL29018 is not set +# CONFIG_SENSORS_ISL29028 is not set +# CONFIG_TSL2583 is not set +# CONFIG_TSL2x7x is not set + +# +# Magnetometer sensors +# +# CONFIG_SENSORS_HMC5843 is not set + +# +# Active energy metering IC +# +# CONFIG_ADE7753 is not set +# CONFIG_ADE7754 is not set +# CONFIG_ADE7758 is not set +# CONFIG_ADE7759 is not set +# CONFIG_ADE7854 is not set + +# +# Resolver to digital converters +# +# CONFIG_AD2S90 is not set + +# +# Triggers - standalone +# +# CONFIG_IIO_PERIODIC_RTC_TRIGGER is not set +# CONFIG_IIO_SYSFS_TRIGGER is not set +# CONFIG_IIO_SIMPLE_DUMMY is not set +CONFIG_ZSMALLOC=m +CONFIG_ZRAM=m +# CONFIG_ZRAM_DEBUG is not set # CONFIG_WLAGS49_H2 is not set # CONFIG_WLAGS49_H25 is not set # CONFIG_FB_SM7XX is not set @@ -3454,33 +3801,39 @@ CONFIG_USBIP_HOST=m # Android # # CONFIG_ANDROID is not set +# CONFIG_USB_WPAN_HCD is not set +# CONFIG_WIMAX_GDM72XX is not set +CONFIG_NET_VENDOR_SILICOM=y +# CONFIG_SBYPASS is not set +# CONFIG_BPCTL is not set +# CONFIG_CED1401 is not set +# CONFIG_DGRP is not set +# CONFIG_FIREWIRE_SERIAL is not set +CONFIG_USB_DWC2=m +# CONFIG_USB_DWC2_DEBUG is not set +# CONFIG_USB_DWC2_TRACK_MISSED_SOFS is not set CONFIG_X86_PLATFORM_DEVICES=y # CONFIG_ACERHDF is not set # CONFIG_ASUS_LAPTOP is not set +# CONFIG_CHROMEOS_LAPTOP is not set # CONFIG_FUJITSU_LAPTOP is not set # CONFIG_FUJITSU_TABLET is not set -# CONFIG_AMILO_RFKILL is not set # CONFIG_HP_ACCEL is not set -# CONFIG_MSI_LAPTOP is not set # CONFIG_PANASONIC_LAPTOP is not set -# CONFIG_COMPAL_LAPTOP is not set -# CONFIG_SONY_LAPTOP is not set -# CONFIG_IDEAPAD_LAPTOP is not set # CONFIG_THINKPAD_ACPI is not set # CONFIG_SENSORS_HDAPS is not set # CONFIG_INTEL_MENLOW is not set # CONFIG_ACPI_WMI is not set -# CONFIG_ACPI_ASUS is not set # CONFIG_TOPSTAR_LAPTOP is not set -# CONFIG_ACPI_TOSHIBA is not set # CONFIG_TOSHIBA_BT_RFKILL is not set # CONFIG_ACPI_CMPC is not set # CONFIG_INTEL_IPS is not set # CONFIG_IBM_RTL is not set # CONFIG_XO15_EBOOK is not set # CONFIG_SAMSUNG_LAPTOP is not set -# CONFIG_INTEL_OAKTRAIL is not set # CONFIG_SAMSUNG_Q10 is not set +# CONFIG_APPLE_GMUX is not set +# CONFIG_PVPANIC is not set # # Hardware Spinlock drivers @@ -3489,9 +3842,119 @@ CONFIG_CLKSRC_I8253=y CONFIG_CLKEVT_I8253=y CONFIG_I8253_LOCK=y CONFIG_CLKBLD_I8253=y +# CONFIG_MAILBOX is not set # CONFIG_IOMMU_SUPPORT is not set -# CONFIG_VIRT_DRIVERS is not set + +# +# Remoteproc drivers +# +# CONFIG_STE_MODEM_RPROC is not set + +# +# Rpmsg drivers +# # CONFIG_PM_DEVFREQ is not set +# CONFIG_EXTCON is not set +# CONFIG_MEMORY is not set +CONFIG_IIO=m +CONFIG_IIO_BUFFER=y +# CONFIG_IIO_BUFFER_CB is not set +CONFIG_IIO_KFIFO_BUF=m +CONFIG_IIO_TRIGGERED_BUFFER=m +CONFIG_IIO_TRIGGER=y +CONFIG_IIO_CONSUMERS_PER_TRIGGER=2 + +# +# Accelerometers +# +# CONFIG_KXSD9 is not set +# CONFIG_IIO_ST_ACCEL_3AXIS is not set + +# +# Analog to digital converters +# +# CONFIG_AD7266 is not set +# CONFIG_AD7298 is not set +# CONFIG_AD7923 is not set +# CONFIG_AD7791 is not set +# CONFIG_AD7793 is not set +# CONFIG_AD7476 is not set +# CONFIG_AD7887 is not set +# CONFIG_MAX1363 is not set +# CONFIG_TI_ADC081C is not set + +# +# Amplifiers +# +# CONFIG_AD8366 is not set + +# +# Hid Sensor IIO Common +# + +# +# Digital to analog converters +# +# CONFIG_AD5064 is not set +# CONFIG_AD5360 is not set +# CONFIG_AD5380 is not set +# CONFIG_AD5421 is not set +# CONFIG_AD5624R_SPI is not set +# CONFIG_AD5446 is not set +# CONFIG_AD5449 is not set +# CONFIG_AD5504 is not set +# CONFIG_AD5755 is not set +# CONFIG_AD5764 is not set +# CONFIG_AD5791 is not set +# CONFIG_AD5686 is not set +# CONFIG_MAX517 is not set +# CONFIG_MCP4725 is not set + +# +# Frequency Synthesizers DDS/PLL +# + +# +# Clock Generator/Distribution +# +# CONFIG_AD9523 is not set + +# +# Phase-Locked Loop (PLL) frequency synthesizers +# +# CONFIG_ADF4350 is not set + +# +# Digital gyroscope sensors +# +# CONFIG_ADIS16080 is not set +# CONFIG_ADIS16136 is not set +# CONFIG_ADXRS450 is not set +# CONFIG_IIO_ST_GYRO_3AXIS is not set +# CONFIG_ITG3200 is not set + +# +# Inertial measurement units +# +# CONFIG_ADIS16400 is not set +# CONFIG_ADIS16480 is not set +# CONFIG_INV_MPU6050_IIO is not set + +# +# Light sensors +# +# CONFIG_ADJD_S311 is not set +# CONFIG_SENSORS_TSL2563 is not set +# CONFIG_VCNL4000 is not set + +# +# Magnetometer sensors +# +# CONFIG_IIO_ST_MAGN_3AXIS is not set +# CONFIG_VME_BUS is not set +# CONFIG_PWM is not set +# CONFIG_IPACK_BUS is not set +# CONFIG_RESET_CONTROLLER is not set # # Firmware Drivers @@ -3508,11 +3971,11 @@ CONFIG_FIRMWARE_MEMMAP=y # # File systems # +CONFIG_DCACHE_WORD_ACCESS=y # CONFIG_EXT2_FS is not set # CONFIG_EXT3_FS is not set CONFIG_EXT4_FS=y CONFIG_EXT4_USE_FOR_EXT23=y -CONFIG_EXT4_FS_XATTR=y # CONFIG_EXT4_FS_POSIX_ACL is not set # CONFIG_EXT4_FS_SECURITY is not set # CONFIG_EXT4_DEBUG is not set @@ -3523,21 +3986,30 @@ CONFIG_REISERFS_FS=m # CONFIG_REISERFS_CHECK is not set # CONFIG_REISERFS_PROC_INFO is not set # CONFIG_REISERFS_FS_XATTR is not set -# CONFIG_JFS_FS is not set +CONFIG_JFS_FS=m +# CONFIG_JFS_POSIX_ACL is not set +# CONFIG_JFS_SECURITY is not set +# CONFIG_JFS_DEBUG is not set +# CONFIG_JFS_STATISTICS is not set CONFIG_XFS_FS=m # CONFIG_XFS_QUOTA is not set # CONFIG_XFS_POSIX_ACL is not set # CONFIG_XFS_RT is not set +# CONFIG_XFS_WARN is not set # CONFIG_XFS_DEBUG is not set # CONFIG_GFS2_FS is not set +# CONFIG_OCFS2_FS is not set CONFIG_BTRFS_FS=m # CONFIG_BTRFS_FS_POSIX_ACL is not set # CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set +# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set +# CONFIG_BTRFS_DEBUG is not set # CONFIG_NILFS2_FS is not set # CONFIG_YAFFS_FS is not set # CONFIG_FS_POSIX_ACL is not set CONFIG_EXPORTFS=m CONFIG_FILE_LOCKING=y +CONFIG_DIRECT_IO=y CONFIG_FSNOTIFY=y CONFIG_DNOTIFY=y CONFIG_INOTIFY_USER=y @@ -3546,20 +4018,27 @@ CONFIG_INOTIFY_USER=y # CONFIG_QUOTACTL is not set CONFIG_AUTOFS4_FS=m CONFIG_FUSE_FS=m -CONFIG_OVERLAYFS_FS=y # CONFIG_CUSE is not set +CONFIG_OVERLAYFS_FS=y # # Caches # -# CONFIG_FSCACHE is not set +CONFIG_FSCACHE=m +CONFIG_FSCACHE_STATS=y +# CONFIG_FSCACHE_HISTOGRAM is not set +# CONFIG_FSCACHE_DEBUG is not set +# CONFIG_FSCACHE_OBJECT_LIST is not set +CONFIG_CACHEFILES=m +# CONFIG_CACHEFILES_DEBUG is not set +# CONFIG_CACHEFILES_HISTOGRAM is not set # # CD-ROM/DVD Filesystems # -CONFIG_ISO9660_FS=m +CONFIG_ISO9660_FS=y CONFIG_JOLIET=y -CONFIG_ZISOFS=y +# CONFIG_ZISOFS is not set CONFIG_UDF_FS=m CONFIG_UDF_NLS=y @@ -3581,17 +4060,19 @@ CONFIG_NTFS_FS=m CONFIG_PROC_FS=y # CONFIG_PROC_KCORE is not set CONFIG_PROC_SYSCTL=y -CONFIG_PROC_PAGE_MONITOR=y +# CONFIG_PROC_PAGE_MONITOR is not set +CONFIG_PROC_STRIPPED=y CONFIG_SYSFS=y CONFIG_TMPFS=y # CONFIG_TMPFS_POSIX_ACL is not set CONFIG_TMPFS_XATTR=y # CONFIG_HUGETLBFS is not set # CONFIG_HUGETLB_PAGE is not set -# CONFIG_CONFIGFS_FS is not set +CONFIG_CONFIGFS_FS=m CONFIG_MISC_FILESYSTEMS=y # CONFIG_ADFS_FS is not set # CONFIG_AFFS_FS is not set +# CONFIG_ECRYPT_FS is not set CONFIG_HFS_FS=m CONFIG_HFSPLUS_FS=m # CONFIG_BEFS_FS is not set @@ -3616,7 +4097,7 @@ CONFIG_JFFS2_CMODE_PRIORITY=y # CONFIG_JFFS2_CMODE_SIZE is not set # CONFIG_JFFS2_CMODE_FAVOURLZO is not set # CONFIG_LOGFS is not set -# CONFIG_CRAMFS is not set +CONFIG_CRAMFS=m CONFIG_SQUASHFS=y # CONFIG_SQUASHFS_XATTR is not set # CONFIG_SQUASHFS_ZLIB is not set @@ -3630,15 +4111,20 @@ CONFIG_MINIX_FS=m # CONFIG_OMFS_FS is not set # CONFIG_HPFS_FS is not set # CONFIG_QNX4FS_FS is not set +# CONFIG_QNX6FS_FS is not set # CONFIG_ROMFS_FS is not set # CONFIG_PSTORE is not set # CONFIG_SYSV_FS is not set # CONFIG_UFS_FS is not set +# CONFIG_F2FS_FS is not set CONFIG_NETWORK_FILESYSTEMS=y CONFIG_NFS_FS=m -CONFIG_NFS_V3=y +# CONFIG_NFS_V2 is not set +CONFIG_NFS_V3=m # CONFIG_NFS_V3_ACL is not set # CONFIG_NFS_V4 is not set +# CONFIG_NFS_SWAP is not set +# CONFIG_NFS_FSCACHE is not set CONFIG_NFSD=m CONFIG_NFSD_V3=y # CONFIG_NFSD_V3_ACL is not set @@ -3647,16 +4133,23 @@ CONFIG_LOCKD=m CONFIG_LOCKD_V4=y CONFIG_NFS_COMMON=y CONFIG_SUNRPC=m +# CONFIG_SUNRPC_DEBUG is not set # CONFIG_CEPH_FS is not set CONFIG_CIFS=m CONFIG_CIFS_STATS=y # CONFIG_CIFS_STATS2 is not set # CONFIG_CIFS_WEAK_PW_HASH is not set +# CONFIG_CIFS_UPCALL is not set # CONFIG_CIFS_XATTR is not set -# CONFIG_CIFS_DEBUG2 is not set +# CONFIG_CIFS_DEBUG is not set +# CONFIG_CIFS_DFS_UPCALL is not set +# CONFIG_CIFS_SMB2 is not set +# CONFIG_CIFS_FSCACHE is not set # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set -# CONFIG_AFS_FS is not set +CONFIG_AFS_FS=m +# CONFIG_AFS_DEBUG is not set +CONFIG_AFS_FSCACHE=y CONFIG_NLS=y CONFIG_NLS_DEFAULT="iso8859-1" CONFIG_NLS_CODEPAGE_437=m @@ -3668,18 +4161,18 @@ CONFIG_NLS_CODEPAGE_852=m # CONFIG_NLS_CODEPAGE_857 is not set # CONFIG_NLS_CODEPAGE_860 is not set # CONFIG_NLS_CODEPAGE_861 is not set -# CONFIG_NLS_CODEPAGE_862 is not set +CONFIG_NLS_CODEPAGE_862=m # CONFIG_NLS_CODEPAGE_863 is not set -# CONFIG_NLS_CODEPAGE_864 is not set +CONFIG_NLS_CODEPAGE_864=m # CONFIG_NLS_CODEPAGE_865 is not set CONFIG_NLS_CODEPAGE_866=m # CONFIG_NLS_CODEPAGE_869 is not set # CONFIG_NLS_CODEPAGE_936 is not set # CONFIG_NLS_CODEPAGE_950 is not set -# CONFIG_NLS_CODEPAGE_932 is not set +CONFIG_NLS_CODEPAGE_932=m # CONFIG_NLS_CODEPAGE_949 is not set # CONFIG_NLS_CODEPAGE_874 is not set -# CONFIG_NLS_ISO8859_8 is not set +CONFIG_NLS_ISO8859_8=m CONFIG_NLS_CODEPAGE_1250=m CONFIG_NLS_CODEPAGE_1251=m # CONFIG_NLS_ASCII is not set @@ -3688,7 +4181,7 @@ CONFIG_NLS_ISO8859_2=m # CONFIG_NLS_ISO8859_3 is not set # CONFIG_NLS_ISO8859_4 is not set # CONFIG_NLS_ISO8859_5 is not set -# CONFIG_NLS_ISO8859_6 is not set +CONFIG_NLS_ISO8859_6=m # CONFIG_NLS_ISO8859_7 is not set # CONFIG_NLS_ISO8859_9 is not set CONFIG_NLS_ISO8859_13=m @@ -3696,7 +4189,19 @@ CONFIG_NLS_ISO8859_13=m CONFIG_NLS_ISO8859_15=m CONFIG_NLS_KOI8_R=m # CONFIG_NLS_KOI8_U is not set +# CONFIG_NLS_MAC_ROMAN is not set +# CONFIG_NLS_MAC_CELTIC is not set +# CONFIG_NLS_MAC_CENTEURO is not set +# CONFIG_NLS_MAC_CROATIAN is not set +# CONFIG_NLS_MAC_CYRILLIC is not set +# CONFIG_NLS_MAC_GAELIC is not set +# CONFIG_NLS_MAC_GREEK is not set +# CONFIG_NLS_MAC_ICELAND is not set +# CONFIG_NLS_MAC_INUIT is not set +# CONFIG_NLS_MAC_ROMANIAN is not set +# CONFIG_NLS_MAC_TURKISH is not set CONFIG_NLS_UTF8=m +# CONFIG_DLM is not set # # Kernel hacking @@ -3709,6 +4214,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y CONFIG_FRAME_WARN=1024 CONFIG_MAGIC_SYSRQ=y CONFIG_STRIP_ASM_SYMS=y +# CONFIG_READABLE_ASM is not set # CONFIG_UNUSED_SYMBOLS is not set CONFIG_DEBUG_FS=y # CONFIG_HEADERS_CHECK is not set @@ -3716,7 +4222,8 @@ CONFIG_DEBUG_FS=y CONFIG_DEBUG_KERNEL=y # CONFIG_DEBUG_SHIRQ is not set # CONFIG_LOCKUP_DETECTOR is not set -# CONFIG_HARDLOCKUP_DETECTOR is not set +# CONFIG_PANIC_ON_OOPS is not set +CONFIG_PANIC_ON_OOPS_VALUE=0 # CONFIG_DETECT_HUNG_TASK is not set # CONFIG_SCHED_DEBUG is not set # CONFIG_SCHEDSTATS is not set @@ -3724,6 +4231,7 @@ CONFIG_DEBUG_KERNEL=y # CONFIG_DEBUG_OBJECTS is not set # CONFIG_SLUB_DEBUG_ON is not set # CONFIG_SLUB_STATS is not set +CONFIG_HAVE_DEBUG_KMEMLEAK=y # CONFIG_DEBUG_KMEMLEAK is not set # CONFIG_DEBUG_RT_MUTEXES is not set # CONFIG_RT_MUTEX_TESTER is not set @@ -3731,7 +4239,6 @@ CONFIG_DEBUG_KERNEL=y # CONFIG_DEBUG_MUTEXES is not set # CONFIG_DEBUG_LOCK_ALLOC is not set # CONFIG_PROVE_LOCKING is not set -# CONFIG_SPARSE_RCU_POINTER is not set # CONFIG_LOCK_STAT is not set # CONFIG_DEBUG_ATOMIC_SLEEP is not set # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set @@ -3752,14 +4259,22 @@ CONFIG_DEBUG_MEMORY_INIT=y CONFIG_ARCH_WANT_FRAME_POINTERS=y # CONFIG_FRAME_POINTER is not set # CONFIG_BOOT_PRINTK_DELAY is not set + +# +# RCU Debugging +# +# CONFIG_SPARSE_RCU_POINTER is not set # CONFIG_RCU_TORTURE_TEST is not set +# CONFIG_RCU_TRACE is not set # CONFIG_BACKTRACE_SELF_TEST is not set # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set # CONFIG_LKDTM is not set +# CONFIG_NOTIFIER_ERROR_INJECTION is not set # CONFIG_FAULT_INJECTION is not set # CONFIG_LATENCYTOP is not set -# CONFIG_SYSCTL_SYSCALL_CHECK is not set +CONFIG_ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS=y +# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set # CONFIG_DEBUG_PAGEALLOC is not set CONFIG_USER_STACKTRACE_SUPPORT=y CONFIG_HAVE_FUNCTION_TRACER=y @@ -3767,11 +4282,14 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y CONFIG_HAVE_DYNAMIC_FTRACE=y +CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y CONFIG_HAVE_SYSCALL_TRACEPOINTS=y CONFIG_HAVE_C_RECORDMCOUNT=y CONFIG_TRACING_SUPPORT=y # CONFIG_FTRACE is not set +# CONFIG_RBTREE_TEST is not set +# CONFIG_INTERVAL_TREE_TEST is not set # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set # CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set # CONFIG_DYNAMIC_DEBUG is not set @@ -3783,6 +4301,7 @@ CONFIG_HAVE_ARCH_KGDB=y # CONFIG_KGDB is not set CONFIG_HAVE_ARCH_KMEMCHECK=y # CONFIG_KMEMCHECK is not set +# CONFIG_TEST_STRING_HELPERS is not set # CONFIG_TEST_KSTRTOX is not set CONFIG_STRICT_DEVMEM=y CONFIG_X86_VERBOSE_BOOTUP=y @@ -3794,6 +4313,7 @@ CONFIG_EARLY_PRINTK=y # CONFIG_DEBUG_SET_MODULE_RONX is not set # CONFIG_DEBUG_NX_TEST is not set CONFIG_DOUBLEFAULT=y +# CONFIG_DEBUG_TLBFLUSH is not set # CONFIG_IOMMU_STRESS is not set CONFIG_HAVE_MMIOTRACE_SUPPORT=y CONFIG_IO_DELAY_TYPE_0X80=0 @@ -3808,13 +4328,14 @@ CONFIG_DEFAULT_IO_DELAY_TYPE=0 # CONFIG_DEBUG_BOOT_PARAMS is not set # CONFIG_CPA_DEBUG is not set # CONFIG_OPTIMIZE_INLINING is not set -# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set # CONFIG_DEBUG_NMI_SELFTEST is not set # # Security options # -# CONFIG_KEYS is not set +CONFIG_KEYS=y +# CONFIG_ENCRYPTED_KEYS is not set +# CONFIG_KEYS_DEBUG_PROC_KEYS is not set # CONFIG_SECURITY_DMESG_RESTRICT is not set # CONFIG_SECURITY is not set # CONFIG_SECURITYFS is not set @@ -3831,19 +4352,18 @@ CONFIG_CRYPTO=y # # Crypto core or helper # -CONFIG_CRYPTO_ALGAPI=m -CONFIG_CRYPTO_ALGAPI2=m +CONFIG_CRYPTO_ALGAPI=y +CONFIG_CRYPTO_ALGAPI2=y CONFIG_CRYPTO_AEAD=m CONFIG_CRYPTO_AEAD2=m CONFIG_CRYPTO_BLKCIPHER=m CONFIG_CRYPTO_BLKCIPHER2=m -CONFIG_CRYPTO_HASH=m -CONFIG_CRYPTO_HASH2=m +CONFIG_CRYPTO_HASH=y +CONFIG_CRYPTO_HASH2=y # CONFIG_CRYPTO_RNG is not set CONFIG_CRYPTO_RNG2=m -CONFIG_CRYPTO_PCOMP2=m CONFIG_CRYPTO_MANAGER=m -CONFIG_CRYPTO_MANAGER2=m +CONFIG_CRYPTO_MANAGER2=y # CONFIG_CRYPTO_USER is not set CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y CONFIG_CRYPTO_GF128MUL=m @@ -3868,12 +4388,13 @@ CONFIG_CRYPTO_CBC=m # CONFIG_CRYPTO_CTS is not set CONFIG_CRYPTO_ECB=m # CONFIG_CRYPTO_LRW is not set -# CONFIG_CRYPTO_PCBC is not set +CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_XTS=m # # Hash modes # +# CONFIG_CRYPTO_CMAC is not set CONFIG_CRYPTO_HMAC=m # CONFIG_CRYPTO_XCBC is not set # CONFIG_CRYPTO_VMAC is not set @@ -3881,8 +4402,10 @@ CONFIG_CRYPTO_HMAC=m # # Digest # -CONFIG_CRYPTO_CRC32C=m +CONFIG_CRYPTO_CRC32C=y # CONFIG_CRYPTO_CRC32C_INTEL is not set +# CONFIG_CRYPTO_CRC32 is not set +# CONFIG_CRYPTO_CRC32_PCLMUL is not set # CONFIG_CRYPTO_GHASH is not set CONFIG_CRYPTO_MD4=m CONFIG_CRYPTO_MD5=m @@ -3900,7 +4423,7 @@ CONFIG_CRYPTO_WP512=m # # Ciphers # -CONFIG_CRYPTO_AES=m +CONFIG_CRYPTO_AES=y CONFIG_CRYPTO_AES_586=m # CONFIG_CRYPTO_AES_NI_INTEL is not set CONFIG_CRYPTO_ANUBIS=m @@ -3908,6 +4431,7 @@ CONFIG_CRYPTO_ARC4=m CONFIG_CRYPTO_BLOWFISH=m CONFIG_CRYPTO_BLOWFISH_COMMON=m CONFIG_CRYPTO_CAMELLIA=m +CONFIG_CRYPTO_CAST_COMMON=m CONFIG_CRYPTO_CAST5=m CONFIG_CRYPTO_CAST6=m CONFIG_CRYPTO_DES=m @@ -3945,6 +4469,7 @@ CONFIG_CRYPTO_DEV_PADLOCK_SHA=m CONFIG_CRYPTO_DEV_GEODE=m CONFIG_CRYPTO_DEV_HIFN_795X=m CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y +# CONFIG_ASYMMETRIC_KEY_TYPE is not set # # OCF Configuration @@ -3975,35 +4500,42 @@ CONFIG_HAVE_KVM=y # CONFIG_RAID6_PQ=m CONFIG_BITREVERSE=y +CONFIG_GENERIC_STRNCPY_FROM_USER=y +CONFIG_GENERIC_STRNLEN_USER=y CONFIG_GENERIC_FIND_FIRST_BIT=y CONFIG_GENERIC_PCI_IOMAP=y CONFIG_GENERIC_IOMAP=y +CONFIG_GENERIC_IO=y CONFIG_CRC_CCITT=m CONFIG_CRC16=y # CONFIG_CRC_T10DIF is not set CONFIG_CRC_ITU_T=m CONFIG_CRC32=y +# CONFIG_CRC32_SELFTEST is not set +# CONFIG_CRC32_SLICEBY8 is not set +# CONFIG_CRC32_SLICEBY4 is not set +CONFIG_CRC32_SARWATE=y +# CONFIG_CRC32_BIT is not set CONFIG_CRC7=m CONFIG_LIBCRC32C=m CONFIG_CRC8=m CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=m -CONFIG_LZO_COMPRESS=y -CONFIG_LZO_DECOMPRESS=y +CONFIG_LZO_COMPRESS=m +CONFIG_LZO_DECOMPRESS=m CONFIG_XZ_DEC=y -# CONFIG_XZ_DEC_X86 is not set +CONFIG_XZ_DEC_X86=y # CONFIG_XZ_DEC_POWERPC is not set # CONFIG_XZ_DEC_IA64 is not set # CONFIG_XZ_DEC_ARM is not set # CONFIG_XZ_DEC_ARMTHUMB is not set # CONFIG_XZ_DEC_SPARC is not set -# CONFIG_XZ_DEC_BCJ is not set +CONFIG_XZ_DEC_BCJ=y # CONFIG_XZ_DEC_TEST is not set CONFIG_LZMA_COMPRESS=y CONFIG_LZMA_DECOMPRESS=y CONFIG_DECOMPRESS_GZIP=y CONFIG_DECOMPRESS_BZIP2=y -CONFIG_DECOMPRESS_LZMA=y CONFIG_TEXTSEARCH=y CONFIG_TEXTSEARCH_KMP=m CONFIG_TEXTSEARCH_BM=m @@ -4013,5 +4545,7 @@ CONFIG_HAS_IOPORT=y CONFIG_HAS_DMA=y CONFIG_DQL=y CONFIG_NLATTR=y +CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y CONFIG_AVERAGE=y CONFIG_CORDIC=m +# CONFIG_DDR is not set diff --git a/targets/x86-generic/kernel-vermagic b/targets/x86-generic/kernel-vermagic index 4d135532..a36aaf8f 100644 --- a/targets/x86-generic/kernel-vermagic +++ b/targets/x86-generic/kernel-vermagic @@ -1 +1 @@ -fa7af62e0ef1d529ecb7f7efccc706c3 +142143844bfcd7ade9ea7e57dd843e69