From 40286cfb04a05e630a4539b99af015550fd258ab Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Mon, 4 Aug 2014 23:55:36 +0200 Subject: [PATCH 001/100] Add experimental support for the TL-WR703N --- targets/ar71xx-generic/profiles.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/targets/ar71xx-generic/profiles.mk b/targets/ar71xx-generic/profiles.mk index a5bc6723..c85df19e 100644 --- a/targets/ar71xx-generic/profiles.mk +++ b/targets/ar71xx-generic/profiles.mk @@ -2,6 +2,12 @@ ## TP-Link +# TL-WR703N v1 +ifeq ($(BROKEN),1) +$(eval $(call GluonProfile,TLWR703)) +$(eval $(call GluonModel,TLWR703,tl-wr703n-v1-squashfs,tp-link-tl-wr703n-v1)) +endif + # TL-WR740N v1, v3, v4 $(eval $(call GluonProfile,TLWR740)) $(eval $(call GluonModel,TLWR740,tl-wr740n-v1-squashfs,tp-link-tl-wr740n-nd-v1)) From a0635e4ca998726c89f1445c7b15b30263038bbf Mon Sep 17 00:00:00 2001 From: Nils Schneider Date: Tue, 5 Aug 2014 20:47:00 +0200 Subject: [PATCH 002/100] docs: add site-example --- docs/site-example/modules | 28 ++++ docs/site-example/site.conf | 254 ++++++++++++++++++++++++++++++++++++ docs/site-example/site.mk | 49 +++++++ docs/user/site.rst | 19 ++- 4 files changed, 349 insertions(+), 1 deletion(-) create mode 100644 docs/site-example/modules create mode 100644 docs/site-example/site.conf create mode 100644 docs/site-example/site.mk diff --git a/docs/site-example/modules b/docs/site-example/modules new file mode 100644 index 00000000..2bfc3731 --- /dev/null +++ b/docs/site-example/modules @@ -0,0 +1,28 @@ +## gluon site modules example +# this file allows to define additional +# package feeds to be used. +# packages from this feeds can then be included +# via site.mk + + +## GLUON_SITE_FEEDS +# feeds to include, note that this is not called +# GLUON_FEEDS as in the Gluon modules file. +# +# for each feed name given, there have to be +# two variables given in the following. + +GLUON_SITE_FEEDS='ffhh_packages' + + +## PACKAGES_$feedname_REPO +# the git repository from where to clone the package feed + +PACKAGES_FFHH_PACKAGES_REPO=git://github.com/freifunkhamburg/ffhh-packages.git + + +## PACKAGES_$feedname_COMMIT +# the version/commit of the git repository to clone + +PACKAGES_FFHH_PACKAGES_COMMIT=0fc9d44e95000c61a69b04278e4d38f2a3f57e49 + diff --git a/docs/site-example/site.conf b/docs/site-example/site.conf new file mode 100644 index 00000000..12607a55 --- /dev/null +++ b/docs/site-example/site.conf @@ -0,0 +1,254 @@ +--[[ gluon site.conf example + + This file is loosely related to the original site.conf used in Lübeck. + There are comments added to most switches to explain the usage of gluon. + + This is lua code now, not perl anymore. + + Happy compiling! +]] + +{ + --[[ Community settings + hostname_prefix: Nodename prefix + freifunk-abcdef123456 (hex-part is generated from node's MAC address) + site_name: Name of your community + site_code: Shortcode of your community + ]] + hostname_prefix = 'freifunk', + site_name = 'Freifunk Lübeck', + site_code = 'ffhl', + + + --[[ General network settings + prefix4: IPv4 range of your community + prefix6: IPv6 range of your community + is also required for radvd + ]] + prefix4 = '10.130.0.0/20', + prefix6 = 'fdef:ffc0:3dd7::/64', + + + --[[ NTP settings + Synchronize the time of the nodes + timezone: Timezone of your community + http://wiki.openwrt.org/doc/uci/system#time.zones + ntp_servers: List of NTP-Servers to query. You can use any public and/or your private NTP-Servers of your community. + http://www.pool.ntp.org/zone/de + ]] + timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', + ntp_servers = {'1.ntp.services.ffhl'}, + + + --[[ Wireless settings + regdom: IEEE 802.11 Regulatory Domain + http://en.wikipedia.org/wiki/IEEE_802.11#Regulatory_domains_and_legal_compliance + wifi24: Wifi settings for 2.4 GHz frequency devices + wifi5: Wifi settings for 5 GHz frequency devices + sub + ssid: Wifi name shown to the user (We recommend %site_code%.freifunk.net) + channel: Wifi channel to use + htmode: Specifies the channel width in 802.11n and 802.11ac mode, possible values are: + HT20 (single 20MHz channel), + HT40- (2x 20MHz channels, primary/control channel is upper, secondary channel is below) + HT40+ (2x 20MHz channels, primary/control channel is lower, secondary channel is above). + VHT20 / VHT40 / VHT80 / VHT160 (channel width in 802.11ac, extra channels are picked according to the specification) + http://wiki.openwrt.org/doc/uci/wireless#common.options (-> htmode) + mesh_ssid: SSID of the mesh-interface, only used between nodes + mesh_bssid: BSSID of the mesh-interface + The supplied default of ff:ff:ff:ff:ff:ff will not work. + You'll need to replace it with randomly generated, non-broadcast BSSID! + mesh_mcast_rate: multicast rate of the mesh-interface + ]] + regdom = 'DE', + + wifi24 = { + ssid = 'luebeck.freifunk.net', + channel = 1, + htmode = 'HT40+', + mesh_ssid = 'ff:ff:ff:ff:ff:ff', + mesh_bssid = 'ff:ff:ff:ff:ff:ff', + mesh_mcast_rate = 12000, + }, + + wifi5 = { + ssid = 'luebeck.freifunk.net', + channel = 44, + htmode = 'HT40+', + mesh_ssid = 'ff:ff:ff:ff:ff:ff', + mesh_bssid = 'ff:ff:ff:ff:ff:ff', + mesh_mcast_rate = 12000, + }, + + + --[[ Next-Node + next_node: Howto reach the node you are currently connected to + The node will always be reachable at that address, and it's the same on all nodes. Because next_node packets are redirected within the node itself, there will be no conflicts. + sub + ip4: IPv4 Address to use + ip6: IPv6 Address to use + mac: MAC Address to use + (TODO: What is the purpose of this MAC-Address here?) + ]] + next_node = { + ip4 = '10.130.0.1', + ip6 = 'fdef:ffc0:3dd7::1', + mac = '16:41:95:40:f7:dc', + }, + + + --[[ Gateway settings + fastd_mesh_vpn: fastd vpn settings + https://projects.universe-factory.net/projects/fastd/wiki/User_manual + sub + methods: encryption algorithms to use + https://projects.universe-factory.net/projects/fastd/wiki/Methods + When multiple method statements are given, the first one has the highest preference. + mtu: package size + backbone: fastd vpn gateways of your community + sub + limit: Number of gateways each node connects to + On startup, each node tries to connect to every gateway, and then chooses the number of 'limit' fastest gateways it could reach + peers: Gateways + sub sub + key: public fastd key of your gateway + https://github.com/tcatm/ecdsautils + remotes: List of fastd configuration strings to connect to your gateway server + ]] + fastd_mesh_vpn = { + methods = {'salsa2012+gmac'}, + mtu = 1426, + backbone = { + limit = 2, + peers = { + burgtor = { + key = '657af03e36ff1b8bbe5a5134982a4f110c8523a9a63293870caf548916a95a03', + remotes = {'ipv4 "burgtor.mesh.ffhl.chaotikum.org" port 10000'}, + }, + holstentor = { + key = '8c660f7511bf101ea1b599fe53af20e1146cd923c9e9d2a3a0d534ee75af9067', + remotes = {'ipv4 "holstentor.mesh.ffhl.chaotikum.org" port 10000'}, + }, + huextertor = { + key = 'a1b124f43eae4f5929850c09cda825ef35d659e3db4d7746e3d97627e9fa7238', + remotes = {'ipv4 "huextertor.mesh.ffhl.chaotikum.org" port 10000'}, + }, + muehlentor = { + key = 'bd4ec3cf87bb0042eed2fa121fbc402154d28fb1ae9dff9cdb71bb21892f401a', + remotes = {'ipv4 "muehlentor.mesh.ffhl.chaotikum.org" port 10000'}, + }, + }, + }, + }, + + + --[[ Autoupdater settings + branch: Automatically update to this branch + branches: Available branches your community is publishing + sub sub + name: Name of branch (is used when compiling images) + mirrors: List of urls where to find the firmware + just serve the images on port 80 via http. a simple apache file-listing is enough. + see: http://luebeck.freifunk.net/firmware/ + probability: How often should a node search for updates + 1.0 - perform an update every hour + 0.5 - on average, perform an update every two hours + 0.0 - inhibit any automatic updates + good_signatures: How many signatures should be valid so the node decides to upgrade itself + pubkeys: public keys by developers used in manifest file of branch + manifest file - see gluon readme + $ make manifest GLUON_BRANCH=mybranch + $ contrib/sign.sh $SECRETKEY.file images/sysupgrade/manifest + ]] + autoupdater = { + branch = 'experimental', + branches = { + stable = { + name = 'stable', + mirrors = {'http://1.updates.services.ffhl/stable/sysupgrade'}, + probability = 0.08, + good_signatures = 2, + pubkeys = { + 'daa19b44bbd7033965e02088127bad9516ba0fea8f34267a777144a23ec8900c', -- Linus + 'a8dd60765b07330a4bbfdf8406102befca132881a4b65f3efda32cf2d5b362d9', -- Nils + '323bd3285c4e5547a89cd6da1f2aef67f1654b0928bbd5b104efc9dab2156d0b', -- NeoRaider + }, + }, + experimental = { + -- DE: Name des "braches" wird beim erstellen von Images / update generiert + name = 'experimental', + mirrors = {'http://1.updates.services.ffhl/experimental/sysupgrade'}, + probability = 1.00, + good_signatures = 2, + good_signatures = 1, + -- DE: Oeffentlicher Schluessel / Public Key der Entwickler + pubkeys = { + '496136b37e5f561dfdf523611f14e4b6bc2a745cbc1ab7daffa59fded5f202d1', -- philae + }, + }, + }, + }, + + + --[[ Simple TC settings to limit the bandwidth of the vpn-uplink + mesh_vpn: + sub + ifname: name of the interface/bridge + enabled: default-value + limit_egress: default-value + limit_ingress: default-value + ]] + simple_tc = { + mesh_vpn = { + ifname = 'mesh-vpn', + enabled = false, + limit_egress = 200, + limit_ingress = 3000, + }, + }, + + + --[[ Config Mode settings + Text shown on local website on node while in config mode (after initial flashing or after a long press and hold on the primary button and reboot). You can use html here. + msg_welcome: Welcome message shown at startup + msg_pubkey: Instructions for the user how your community handles the key exchange + only shown if VPN setting is selected + msg_reboot: Message shown when configuration is finished while the node is rebooting. + + Variables + Within the text given here you can use variables which are + replaced when the respective website is delivered to the user. + Variables must be used in the format <%=NAME%>. See msg_pubkey for an example. + hostname hostname of the node + pubkey fastd public key of the node + sysconfig.primary_mac the primary mac of the node, also found printed beneath the device + ... other sysconfig.* variables: config_ifname, lan_ifname, wan_ifname + ]] + config_mode = { + msg_welcome = [[ +Willkommen zum Einrichtungsassistenten für deinen neuen Lübecker +Freifunk-Knoten. Fülle das folgende Formular deinen Vorstellungen +entsprechend aus und sende es ab. +]], + msg_pubkey = [[ +Dies ist der öffentliche Schlüssel deines Freifunk-Knotens. Erst nachdem +er auf den Servern des Lübecker Freifunk-Projektes eingetragen wurde, +kann sich dein Knoten mit dem Lübecker Mesh-VPN zu verbinden. Bitte +schicke dazu diesen Schlüssel und den Namen deines Knotens +(<%=hostname%>) an +keys@luebeck.freifunk.net. +]], + msg_reboot = [[ +

+Dein Knoten startet gerade neu und wird anschließend versuchen, +sich anschließend mit anderen Freifunk-Knoten in seiner Nähe zu +verbinden. Weitere Informationen zur +Lübecker Freifunk-Community findest du auf +unserer Webseite. +

+

+Viel Spaß mit deinem Knoten und der Erkundung von Freifunk! +

+]], + }, +} diff --git a/docs/site-example/site.mk b/docs/site-example/site.mk new file mode 100644 index 00000000..bbdf0b25 --- /dev/null +++ b/docs/site-example/site.mk @@ -0,0 +1,49 @@ +## gluon site.mk makefile example + +## GLUON_SITE_PACKAGES +# specify gluon/openwrt packages to include here + +GLUON_SITE_PACKAGES := \ + gluon-alfred \ + gluon-announced \ + gluon-autoupdater \ + gluon-config-mode-hostname \ + gluon-config-mode-autoupdater \ + gluon-config-mode-mesh-vpn \ + gluon-config-mode-geo-location \ + gluon-config-mode-contact-info \ + gluon-ebtables-filter-multicast \ + gluon-ebtables-filter-ra-dhcp \ + gluon-luci-admin \ + gluon-luci-autoupdater \ + gluon-luci-portconfig \ + gluon-next-node \ + gluon-mesh-batman-adv \ + gluon-mesh-vpn-fastd \ + gluon-radvd \ + gluon-status-page \ + iwinfo \ + iptables \ + haveged + +## DEFAULT_GLUON_RELEASE +# version string to use for images +# gluon relies on +# opkg compare-versions "$1" '>>' "$2" +# to decide if a version is newer or not. + +DEFAULT_GLUON_RELEASE := 0.4+0-exp$(shell date '+%Y%m%d') + + +## GLUON_RELEASE +# call make with custom GLUON_RELEASE flag, to use your own release version scheme. +# e.g.: +# $ make images GLUON_RELEASE=23.42+5 +# would generate images named like this: +# gluon-ff%site_code%-23.42+5-%router_model%.bin + +# Allow overriding the release number from the command line +GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE) + +# Default priority for updates. +GLUON_PRIORITY ?= 0 diff --git a/docs/user/site.rst b/docs/user/site.rst index e3c2d806..86dc30ed 100644 --- a/docs/user/site.rst +++ b/docs/user/site.rst @@ -188,4 +188,21 @@ GLUON_PRIORITY Examples -------- -An example configuration is maintained at https://github.com/freifunk-gluon/site-example. +site.mk +^^^^^^^ + +.. literalinclude:: ../site-example/site.mk + :language: makefile + +site.conf +^^^^^^^^^ + +.. literalinclude:: ../site-example/site.conf + :language: lua + +modules +^^^^^^^ + +.. literalinclude:: ../site-example/modules + :language: makefile + From e92bceb372f084f5bb1032c898b6f0c418a6e1b9 Mon Sep 17 00:00:00 2001 From: Nils Schneider Date: Tue, 5 Aug 2014 20:55:34 +0200 Subject: [PATCH 003/100] docs/site: list of site repos --- docs/user/site.rst | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/docs/user/site.rst b/docs/user/site.rst index 86dc30ed..b85a3919 100644 --- a/docs/user/site.rst +++ b/docs/user/site.rst @@ -206,3 +206,18 @@ modules .. literalinclude:: ../site-example/modules :language: makefile +site-repos in the wild +^^^^^^^^^^^^^^^^^^^^^^ + +This is a non-exhaustive list of site-repos from various communities: + +* `site-ffhb `_ (Bremen) +* `site-ffhh `_ (Hamburg) +* `site-ffhgw `_ (Greifswald) +* `site-ffhl `_ (Lübeck) +* `site-ffmd `_ (Magdeburg) +* `site-ffmz `_ (Mainz & Wiesbaden) +* `site-ffm `_ (München) +* `siteconf-ffol `_ (Oldenburg) +* `site-ffpb `_ (Paderborn) +* `site-ffka `_ (Karlsruhe) From 561941d6a9d0f798faf32e12843a79713045d94f Mon Sep 17 00:00:00 2001 From: Julian Kornberger Date: Tue, 5 Aug 2014 23:30:16 +0200 Subject: [PATCH 004/100] docs: add private WLAN --- docs/features/private-wlan.rst | 30 ++++++++++++++++++++++++++++++ docs/index.rst | 1 + 2 files changed, 31 insertions(+) create mode 100644 docs/features/private-wlan.rst diff --git a/docs/features/private-wlan.rst b/docs/features/private-wlan.rst new file mode 100644 index 00000000..a4106af3 --- /dev/null +++ b/docs/features/private-wlan.rst @@ -0,0 +1,30 @@ +Private WLAN +============ + +It is possible to set up a private WLAN that bridges the WAN port and is seperated from the mesh network. +Please note that you should not enable ``mesh_on_wan`` simultaneously. + +The private WLAN can be enabled through the config mode if the package ``gluon-luci-privatewifi`` is installed. +You may also enable a private WLAN using the command line: + + :: + uci set wireless.wan_radio0=wifi-iface + uci set wireless.wan_radio0.device=radio0 + uci set wireless.wan_radio0.network=wan + uci set wireless.wan_radio0.mode=ap + uci set wireless.wan_radio0.encryption=psk2 + uci set wireless.wan_radio0.ssid="$SSID" + uci set wireless.wan_radio0.key="$KEY" + uci set wireless.wan_radio0.disabled=0 + uci commit + wifi + +Please replace ``$SSID`` by the name of the WLAN and ``$KEY`` by your passphrase (8-63 characters). +If you have two radios (e.g. 2.4 and 5 GHz) you need to do this for radio0 and radio1. + +It may also be disabled by running: + + :: + uci set wireless.wan_radio0.disabled=1 + uci commit + wifi diff --git a/docs/index.rst b/docs/index.rst index cd6092ea..2b4b3187 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -24,6 +24,7 @@ Features features/configmode features/autoupdater + features/private-wlan features/mesh-on-wan features/announce From db72e98d15869829219e6b5872dc8ec1de8ad18c Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Wed, 6 Aug 2014 11:33:06 +0200 Subject: [PATCH 005/100] Update Gluon packages --- modules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules b/modules index b3c32479..7bc85d01 100644 --- a/modules +++ b/modules @@ -7,7 +7,7 @@ PACKAGES_OPENWRT_REPO=git://git.openwrt.org/12.09/packages.git PACKAGES_OPENWRT_COMMIT=381bbea65989b63e30f43ab87e51b042325bbff3 PACKAGES_GLUON_REPO=git://github.com/freifunk-gluon/packages.git -PACKAGES_GLUON_COMMIT=52e2b9e15993925a6c1f36212132b66be8bd68c6 +PACKAGES_GLUON_COMMIT=e65cf26d5302ca6791f9da953d653fd5e0a9ccf3 PACKAGES_ROUTING_REPO=git://github.com/openwrt-routing/packages.git PACKAGES_ROUTING_COMMIT=0e4201a983df967e88e6ce5451f5f5f99bab2370 From ece68f85307d4c5f3adba60b28d5bc3404539d03 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Wed, 6 Aug 2014 11:37:18 +0200 Subject: [PATCH 006/100] docs: add preliminary v2014.4 release notes It's much nicer to fill in the release notes piece by piece as v2014.4 is developed, so let's start with the new modular config mode. --- docs/index.rst | 1 + docs/releases/v2014.4.rst | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 docs/releases/v2014.4.rst diff --git a/docs/index.rst b/docs/index.rst index 2b4b3187..48b01019 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -79,6 +79,7 @@ Releases .. toctree:: :maxdepth: 1 + releases/v2014.4 releases/v2014.3 diff --git a/docs/releases/v2014.4.rst b/docs/releases/v2014.4.rst new file mode 100644 index 00000000..cf53ece8 --- /dev/null +++ b/docs/releases/v2014.4.rst @@ -0,0 +1,35 @@ +Gluon 2014.4 (In development) +============================= + +New hardware support +~~~~~~~~~~~~~~~~~~~~ + +New features +~~~~~~~~~~~~ + +Modular config mode +------------------- + +Bugfixes +~~~~~~~~ + +Site changes +~~~~~~~~~~~~ +* ``site.conf`` + +* ``site.mk`` + + - Obsolete packages: + + + ``gluon-config-mode`` + + - Recommended new packages: + + + ``gluon-config-mode-autoupdater`` + + ``gluon-config-mode-hostname`` + + ``gluon-config-mode-mesh-vpn`` + + ``gluon-config-mode-geo-location`` + + ``gluon-config-mode-contact-info`` + +Internals +~~~~~~~~~ From c30f075ea7da2ecf9177efce18233abdc7b12b4c Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Wed, 6 Aug 2014 11:52:46 +0200 Subject: [PATCH 007/100] Update OpenWrt packages repo to 14.07 The only packages we use from this repo are haveged and (now) fastd and its dependencies, so we can make the switch safely without updating OpenWrt itself to Barrier Breaker yet. --- modules | 7 +- ...er-initial-setup-and-don-t-run-tests.patch | 27 +++ ...-and-add-patch-to-fix-race-condition.patch | 187 ------------------ ...-the-root-partition-has-been-mounted.patch | 17 -- 4 files changed, 31 insertions(+), 207 deletions(-) create mode 100644 patches/packages/openwrt/0001-haveged-start-directly-after-initial-setup-and-don-t-run-tests.patch delete mode 100644 patches/packages/openwrt/0001-radvd-update-to-1.9.8-and-add-patch-to-fix-race-condition.patch delete mode 100644 patches/packages/openwrt/0002-haveged-start-directly-after-the-root-partition-has-been-mounted.patch diff --git a/modules b/modules index 7bc85d01..b5eb93a8 100644 --- a/modules +++ b/modules @@ -3,11 +3,12 @@ GLUON_FEEDS='openwrt gluon routing luci' OPENWRT_REPO=git://git.openwrt.org/12.09/openwrt.git OPENWRT_COMMIT=b0a05d4f7c194c7db43c3c5f1818449e4ecfe653 -PACKAGES_OPENWRT_REPO=git://git.openwrt.org/12.09/packages.git -PACKAGES_OPENWRT_COMMIT=381bbea65989b63e30f43ab87e51b042325bbff3 +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=e65cf26d5302ca6791f9da953d653fd5e0a9ccf3 +PACKAGES_GLUON_COMMIT=1628f219607339492b00fb921757ac8716d1358b PACKAGES_ROUTING_REPO=git://github.com/openwrt-routing/packages.git PACKAGES_ROUTING_COMMIT=0e4201a983df967e88e6ce5451f5f5f99bab2370 diff --git a/patches/packages/openwrt/0001-haveged-start-directly-after-initial-setup-and-don-t-run-tests.patch b/patches/packages/openwrt/0001-haveged-start-directly-after-initial-setup-and-don-t-run-tests.patch new file mode 100644 index 00000000..ff3d871e --- /dev/null +++ b/patches/packages/openwrt/0001-haveged-start-directly-after-initial-setup-and-don-t-run-tests.patch @@ -0,0 +1,27 @@ +From: Matthias Schiffer +Date: Sat, 26 Jul 2014 18:06:07 +0200 +Subject: haveged: start directly after initial setup and don't run tests + +diff --git a/utils/haveged/files/haveged.init b/utils/haveged/files/haveged.init +index ce28e61..aa8d3c7 100644 +--- a/utils/haveged/files/haveged.init ++++ b/utils/haveged/files/haveged.init +@@ -1,14 +1,16 @@ + #!/bin/sh /etc/rc.common + # Copyright (C) 2012 OpenWrt.org + +-START=98 ++START=13 + + HAVEGED_THRESHOLD=1024 + HAVEGED_DCACHE=32 + HAVEGED_ICACHE=32 ++HAVEGED_TESTS_TOT= ++HAVEGED_TESTS_CONT= + + start() { +- service_start /usr/sbin/haveged -w $HAVEGED_THRESHOLD -d $HAVEGED_DCACHE -i $HAVEGED_ICACHE -v 1 ++ service_start /usr/sbin/haveged -w $HAVEGED_THRESHOLD -d $HAVEGED_DCACHE -i $HAVEGED_ICACHE -v 1 -o t${HAVEGED_TESTS_TOT}c${HAVEGED_TESTS_CONT} + } + + stop() { diff --git a/patches/packages/openwrt/0001-radvd-update-to-1.9.8-and-add-patch-to-fix-race-condition.patch b/patches/packages/openwrt/0001-radvd-update-to-1.9.8-and-add-patch-to-fix-race-condition.patch deleted file mode 100644 index 4974f75c..00000000 --- a/patches/packages/openwrt/0001-radvd-update-to-1.9.8-and-add-patch-to-fix-race-condition.patch +++ /dev/null @@ -1,187 +0,0 @@ -From: Matthias Schiffer -Date: Sun, 12 Jan 2014 00:42:43 +0100 -Subject: radvd: update to 1.9.8 and add patch to fix race condition - -diff --git a/ipv6/radvd/Makefile b/ipv6/radvd/Makefile -index 571d9de..b14c02b 100644 ---- a/ipv6/radvd/Makefile -+++ b/ipv6/radvd/Makefile -@@ -8,13 +8,13 @@ - include $(TOPDIR)/rules.mk - - PKG_NAME:=radvd --PKG_VERSION:=1.9.1 --PKG_RELEASE:=2 -+PKG_VERSION:=1.9.8 -+PKG_RELEASE:=1 - - PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz - PKG_SOURCE_URL:=http://v6web.litech.org/radvd/dist \ - http://download.sourcemage.org/mirror --PKG_MD5SUM:=e807ad7e9a76d46b6133df391385cd31 -+PKG_MD5SUM:=7a96a38252c3964ee18bbc1fdeae25fa - - PKG_INSTALL:=1 - -diff --git a/ipv6/radvd/patches/100-silent-netlink-config-reload.patch b/ipv6/radvd/patches/100-silent-netlink-config-reload.patch -index 049d654..313b8cb 100644 ---- a/ipv6/radvd/patches/100-silent-netlink-config-reload.patch -+++ b/ipv6/radvd/patches/100-silent-netlink-config-reload.patch -@@ -1,26 +1,26 @@ - --- a/netlink.c - +++ b/netlink.c --@@ -67,7 +67,7 @@ void process_netlink_msg(int sock) -- else { -- dlog(LOG_DEBUG, 3, "%s, ifindex %d, flags is *NOT* running", ifname, ifinfo->ifi_index); -- } --- reload_config(); --+ reload_config(LOG_DEBUG); -- } -- } -- -+@@ -75,7 +75,7 @@ void process_netlink_msg(int sock) -+ dlog(LOG_DEBUG, 3, "%s, ifindex %d, flags is *NOT* running", ifname, ifinfo->ifi_index); -+ } -+ if (!reloaded) { -+- reload_config(); -++ reload_config(LOG_DEBUG); -+ reloaded = 1; -+ } -+ } - --- a/radvd.c - +++ b/radvd.c - @@ -443,7 +443,7 @@ void main_loop(void) -- if (sighup_received) -- { -+ -+ if (sighup_received) { - dlog(LOG_INFO, 3, "sig hup received.\n"); - - reload_config(); - + reload_config(LOG_INFO); - sighup_received = 0; - } - --@@ -552,11 +552,11 @@ stop_adverts(void) -+@@ -545,11 +545,11 @@ void stop_adverts(void) - } - } - -@@ -32,9 +32,9 @@ - - flog(LOG_INFO, "attempting to reread config file"); - + flog(loglevel, "attempting to reread config file"); - -- iface=IfaceList; -- while(iface) --@@ -626,7 +626,7 @@ void reload_config(void) -+ iface = IfaceList; -+ while (iface) { -+@@ -614,7 +614,7 @@ void reload_config(void) - config_interface(); - kickoff_adverts(); - -@@ -42,10 +42,10 @@ - + flog(loglevel, "resuming normal operation"); - } - -- void -+ void sighup_handler(int sig) - --- a/radvd.h - +++ b/radvd.h --@@ -185,7 +185,7 @@ int yylex(void); -+@@ -186,7 +186,7 @@ int yylex(void); - - /* radvd.c */ - int check_ip6_forwarding(void); -@@ -56,7 +56,7 @@ - /* timer.c */ - --- a/send.c - +++ b/send.c --@@ -154,7 +154,7 @@ send_ra(struct Interface *iface, struct -+@@ -143,7 +143,7 @@ int send_ra(struct Interface *iface, str - * reload_config() will kick off new timers anyway. This avoids - * timer list corruption. - */ -diff --git a/ipv6/radvd/patches/200-handle-setup_linklocal_addr-failure.patch b/ipv6/radvd/patches/200-handle-setup_linklocal_addr-failure.patch -new file mode 100644 -index 0000000..3f22f76 ---- /dev/null -+++ b/ipv6/radvd/patches/200-handle-setup_linklocal_addr-failure.patch -@@ -0,0 +1,78 @@ -+diff --git a/device-linux.c b/device-linux.c -+index bbf508d..054937e 100644 -+--- a/device-linux.c -++++ b/device-linux.c -+@@ -141,7 +141,13 @@ int setup_linklocal_addr(struct Interface *iface) -+ } -+ } -+ -+- flog(LOG_ERR, "no linklocal address configured for %s", iface->Name); -++ if (iface->IgnoreIfMissing) -++ dlog(LOG_DEBUG, 4, "no linklocal address configured for %s", iface->Name); -++ else -++ flog(LOG_ERR, "no linklocal address configured for %s", iface->Name); -++ -++ iface->if_index = 0; -++ -+ fclose(fp); -+ return (-1); -+ } -+diff --git a/gram.y b/gram.y -+index 9b453a1..3239848 100644 -+--- a/gram.y -++++ b/gram.y -+@@ -176,19 +176,33 @@ ifacedef : ifacehead '{' ifaceparams '}' ';' -+ flog(LOG_ERR, "interface %s does not exist", iface->Name); -+ ABORT; -+ } -++ -++ iface->HasFailed = 1; -+ } -+- if (update_device_info(iface) < 0) -++ if (update_device_info(iface) < 0) { -+ if (!iface->IgnoreIfMissing) -+- ABORT; -+- if (check_iface(iface) < 0) -++ ABORT; -++ -++ iface->HasFailed = 1; -++ } -++ if (check_iface(iface) < 0) { -+ if (!iface->IgnoreIfMissing) -+- ABORT; -+- if (setup_linklocal_addr(iface) < 0) -++ ABORT; -++ -++ iface->HasFailed = 1; -++ } -++ if (setup_linklocal_addr(iface) < 0) { -+ if (!iface->IgnoreIfMissing) -+- ABORT; -+- if (setup_allrouters_membership(iface) < 0) -++ ABORT; -++ -++ iface->HasFailed = 1; -++ } -++ if (setup_allrouters_membership(iface) < 0) { -+ if (!iface->IgnoreIfMissing) -+- ABORT; -++ ABORT; -++ -++ iface->HasFailed = 1; -++ } -+ -+ dlog(LOG_DEBUG, 4, "interface definition for %s is ok", iface->Name); -+ -+diff --git a/send.c b/send.c -+index 0d7ed5b..d6a3da2 100644 -+--- a/send.c -++++ b/send.c -+@@ -124,7 +124,7 @@ int send_ra(struct Interface *iface, struct in6_addr *dest) -+ update_device_info(iface); -+ -+ /* First we need to check that the interface hasn't been removed or deactivated */ -+- if (check_device(iface) < 0) { -++ if (check_device(iface) < 0 || (iface->if_index == 0 && setup_linklocal_addr(iface) < 0)) { -+ if (iface->IgnoreIfMissing) /* a bit more quiet warning message.. */ -+ dlog(LOG_DEBUG, 4, "interface %s does not exist, ignoring the interface", iface->Name); -+ else { diff --git a/patches/packages/openwrt/0002-haveged-start-directly-after-the-root-partition-has-been-mounted.patch b/patches/packages/openwrt/0002-haveged-start-directly-after-the-root-partition-has-been-mounted.patch deleted file mode 100644 index dd6fd5a5..00000000 --- a/patches/packages/openwrt/0002-haveged-start-directly-after-the-root-partition-has-been-mounted.patch +++ /dev/null @@ -1,17 +0,0 @@ -From: Matthias Schiffer -Date: Sun, 12 Jan 2014 00:44:29 +0100 -Subject: haveged: start directly after the root partition has been mounted - -diff --git a/utils/haveged/files/haveged.init b/utils/haveged/files/haveged.init -index 129d951..2c5be1d 100644 ---- a/utils/haveged/files/haveged.init -+++ b/utils/haveged/files/haveged.init -@@ -1,7 +1,7 @@ - #!/bin/sh /etc/rc.common - # Copyright (C) 2012 OpenWrt.org - --START=98 -+START=11 - - HAVEGED_THRESHOLD=1024 - HAVEGED_DCACHE=32 From f204ca87f035d973ad92f1b6ecfe0b179227c6b9 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Wed, 6 Aug 2014 11:56:45 +0200 Subject: [PATCH 008/100] Update routing repo to 14.07 This gets us an up-to-date alfred (and batman-adv 2014.x, as soon as we start to support it). --- modules | 3 +- ...tch => 0001-alfred-adjust-intervals.patch} | 13 ++--- .../0001-alfred-fix-socket-fd-leak.patch | 49 ------------------- 3 files changed, 9 insertions(+), 56 deletions(-) rename patches/packages/routing/{0002-alfred-adjust-intervals.patch => 0001-alfred-adjust-intervals.patch} (61%) delete mode 100644 patches/packages/routing/0001-alfred-fix-socket-fd-leak.patch diff --git a/modules b/modules index b5eb93a8..5a946024 100644 --- a/modules +++ b/modules @@ -11,7 +11,8 @@ PACKAGES_GLUON_REPO=git://github.com/freifunk-gluon/packages.git PACKAGES_GLUON_COMMIT=1628f219607339492b00fb921757ac8716d1358b PACKAGES_ROUTING_REPO=git://github.com/openwrt-routing/packages.git -PACKAGES_ROUTING_COMMIT=0e4201a983df967e88e6ce5451f5f5f99bab2370 +PACKAGES_ROUTING_COMMIT=9d3c311fdd7dc15fd5e333b55c259fc2cf661ea2 +PACKAGES_ROUTING_BRANCH=for-14.07 PACKAGES_LUCI_REPO=git://github.com/freifunk-gluon/luci.git PACKAGES_LUCI_COMMIT=bed710786d8a3a63f5908823e6382a51efc91003 diff --git a/patches/packages/routing/0002-alfred-adjust-intervals.patch b/patches/packages/routing/0001-alfred-adjust-intervals.patch similarity index 61% rename from patches/packages/routing/0002-alfred-adjust-intervals.patch rename to patches/packages/routing/0001-alfred-adjust-intervals.patch index b3bce5a6..707dd68c 100644 --- a/patches/packages/routing/0002-alfred-adjust-intervals.patch +++ b/patches/packages/routing/0001-alfred-adjust-intervals.patch @@ -1,21 +1,22 @@ From: Matthias Schiffer -Date: Sat, 18 Jan 2014 21:52:09 +0100 +Date: Sat, 26 Jul 2014 18:58:22 +0200 Subject: alfred: adjust intervals -diff --git a/alfred/patches/0003-alfred-adjust-intervals.patch b/alfred/patches/0003-alfred-adjust-intervals.patch +diff --git a/alfred/patches/0001-alfred-adjust-intervals.patch b/alfred/patches/0001-alfred-adjust-intervals.patch new file mode 100644 -index 0000000..eb31f91 +index 0000000..e8ffd3a --- /dev/null -+++ b/alfred/patches/0003-alfred-adjust-intervals.patch -@@ -0,0 +1,14 @@ ++++ b/alfred/patches/0001-alfred-adjust-intervals.patch +@@ -0,0 +1,15 @@ +--- a/alfred.h ++++ b/alfred.h -+@@ -30,9 +30,9 @@ ++@@ -30,10 +30,10 @@ + #include "list.h" + #include "packet.h" + +-#define ALFRED_INTERVAL 10 ++#define ALFRED_INTERVAL 60 ++ #define ALFRED_IF_CHECK_INTERVAL 60 + #define ALFRED_REQUEST_TIMEOUT 10 +-#define ALFRED_SERVER_TIMEOUT 60 ++#define ALFRED_SERVER_TIMEOUT 180 diff --git a/patches/packages/routing/0001-alfred-fix-socket-fd-leak.patch b/patches/packages/routing/0001-alfred-fix-socket-fd-leak.patch deleted file mode 100644 index 971d2146..00000000 --- a/patches/packages/routing/0001-alfred-fix-socket-fd-leak.patch +++ /dev/null @@ -1,49 +0,0 @@ -From: Matthias Schiffer -Date: Sat, 18 Jan 2014 21:15:16 +0100 -Subject: alfred: fix socket fd leak - -diff --git a/alfred/patches/0002-batadv-vis-don-t-leak-socket-fd-in-get_if_mac.patch b/alfred/patches/0002-batadv-vis-don-t-leak-socket-fd-in-get_if_mac.patch -new file mode 100644 -index 0000000..2374e25 ---- /dev/null -+++ b/alfred/patches/0002-batadv-vis-don-t-leak-socket-fd-in-get_if_mac.patch -@@ -0,0 +1,39 @@ -+From 449b94ee85a42fbabec550d920002ad07738e733 Mon Sep 17 00:00:00 2001 -+Message-Id: <449b94ee85a42fbabec550d920002ad07738e733.1390075976.git.mschiffer@universe-factory.net> -+From: Matthias Schiffer -+Date: Sat, 18 Jan 2014 21:04:05 +0100 -+Subject: [PATCH] batadv-vis: don't leak socket fd in get_if_mac() -+ -+Leaking an fd every time get_if_mac() is called causes a batadv-vis server -+process to hit the open file limit in a matter of hours when there are many -+active interfaces and the limit is as low as 1024 (which it is on OpenWRT). -+ -+Reported-by: Jan-Philipp Litza -+Signed-off-by: Matthias Schiffer -+--- -+ vis/vis.c | 7 ++++++- -+ 1 file changed, 6 insertions(+), 1 deletion(-) -+ -+--- a/vis/vis.c -++++ b/vis/vis.c -+@@ -97,6 +97,7 @@ static int get_if_mac(char *ifname, uint -+ { -+ struct ifreq ifr; -+ int sock; -++ int ret; -+ -+ strncpy(ifr.ifr_name, ifname, IFNAMSIZ); -+ -+@@ -105,7 +106,11 @@ static int get_if_mac(char *ifname, uint -+ return -1; -+ } -+ -+- if (ioctl(sock, SIOCGIFHWADDR, &ifr) == -1) { -++ ret = ioctl(sock, SIOCGIFHWADDR, &ifr); -++ -++ close(sock); -++ -++ if (ret == -1) { -+ fprintf(stderr, "can't get MAC address: %s\n", strerror(errno)); -+ return -1; -+ } From 51c0ea9078a21264968751e38965c4f3b65df9ed Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Wed, 6 Aug 2014 12:09:15 +0200 Subject: [PATCH 009/100] Switch to "official" LuCi git mirror on git.openwrt.org and update to current master --- modules | 6 +++--- ...r-field-mmap-to-the-more-generic-data.patch | 12 ++++++------ ...trange-static-on-variable-declaration.patch | 6 +++--- ...ring-templates-to-the-template-parser.patch | 18 +++++++++--------- ...ing-templates-to-luci.template-module.patch | 6 +++--- 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/modules b/modules index 5a946024..d337b41f 100644 --- a/modules +++ b/modules @@ -8,11 +8,11 @@ PACKAGES_OPENWRT_COMMIT=a5944176bc761a3fd233c59bad1af96165e5b60f PACKAGES_OPENWRT_BRANCH=for-14.07 PACKAGES_GLUON_REPO=git://github.com/freifunk-gluon/packages.git -PACKAGES_GLUON_COMMIT=1628f219607339492b00fb921757ac8716d1358b +PACKAGES_GLUON_COMMIT=1eff492575007ff8d7eb7d079a6cbd2c8979c6b7 PACKAGES_ROUTING_REPO=git://github.com/openwrt-routing/packages.git PACKAGES_ROUTING_COMMIT=9d3c311fdd7dc15fd5e333b55c259fc2cf661ea2 PACKAGES_ROUTING_BRANCH=for-14.07 -PACKAGES_LUCI_REPO=git://github.com/freifunk-gluon/luci.git -PACKAGES_LUCI_COMMIT=bed710786d8a3a63f5908823e6382a51efc91003 +PACKAGES_LUCI_REPO=git://git.openwrt.org/project/luci.git +PACKAGES_LUCI_COMMIT=834961d9f34f5282f98a480196924a42541d1474 diff --git a/patches/packages/luci/0001-libs-web-rename-template_parser-field-mmap-to-the-more-generic-data.patch b/patches/packages/luci/0001-libs-web-rename-template_parser-field-mmap-to-the-more-generic-data.patch index a771e7b8..dad16cfd 100644 --- a/patches/packages/luci/0001-libs-web-rename-template_parser-field-mmap-to-the-more-generic-data.patch +++ b/patches/packages/luci/0001-libs-web-rename-template_parser-field-mmap-to-the-more-generic-data.patch @@ -2,10 +2,10 @@ From: Matthias Schiffer Date: Fri, 16 May 2014 10:57:26 +0200 Subject: libs/web: rename template_parser field "mmap" to the more generic "data" -diff --git a/libs/web/src/template_parser.c b/libs/web/src/template_parser.c +diff --git a/modules/base/src/template_parser.c b/modules/base/src/template_parser.c index 6054451..fc8607b 100644 ---- a/libs/web/src/template_parser.c -+++ b/libs/web/src/template_parser.c +--- a/modules/base/src/template_parser.c ++++ b/modules/base/src/template_parser.c @@ -82,15 +82,15 @@ struct template_parser * template_open(const char *file) goto err; @@ -91,10 +91,10 @@ index 6054451..fc8607b 100644 if (*ptr == '\n') line++; -diff --git a/libs/web/src/template_parser.h b/libs/web/src/template_parser.h +diff --git a/modules/base/src/template_parser.h b/modules/base/src/template_parser.h index d1c6062..ad03cbc 100644 ---- a/libs/web/src/template_parser.h -+++ b/libs/web/src/template_parser.h +--- a/modules/base/src/template_parser.h ++++ b/modules/base/src/template_parser.h @@ -58,7 +58,7 @@ struct template_chunk { struct template_parser { int fd; diff --git a/patches/packages/luci/0002-libs-web-remove-strange-static-on-variable-declaration.patch b/patches/packages/luci/0002-libs-web-remove-strange-static-on-variable-declaration.patch index 4341e267..8b9808c2 100644 --- a/patches/packages/luci/0002-libs-web-remove-strange-static-on-variable-declaration.patch +++ b/patches/packages/luci/0002-libs-web-remove-strange-static-on-variable-declaration.patch @@ -2,10 +2,10 @@ From: Matthias Schiffer Date: Fri, 16 May 2014 11:29:22 +0200 Subject: libs/web: remove strange 'static' on variable declaration -diff --git a/libs/web/src/template_parser.c b/libs/web/src/template_parser.c +diff --git a/modules/base/src/template_parser.c b/modules/base/src/template_parser.c index fc8607b..1aa5131 100644 ---- a/libs/web/src/template_parser.c -+++ b/libs/web/src/template_parser.c +--- a/modules/base/src/template_parser.c ++++ b/modules/base/src/template_parser.c @@ -66,7 +66,7 @@ static char *strfind(char *haystack, int hslen, const char *needle, int ndlen) struct template_parser * template_open(const char *file) { diff --git a/patches/packages/luci/0003-libs-web-add-support-for-string-templates-to-the-template-parser.patch b/patches/packages/luci/0003-libs-web-add-support-for-string-templates-to-the-template-parser.patch index e1efe487..2770645a 100644 --- a/patches/packages/luci/0003-libs-web-add-support-for-string-templates-to-the-template-parser.patch +++ b/patches/packages/luci/0003-libs-web-add-support-for-string-templates-to-the-template-parser.patch @@ -2,10 +2,10 @@ From: Matthias Schiffer Date: Fri, 16 May 2014 11:37:21 +0200 Subject: libs/web: add support for string templates to the template parser -diff --git a/libs/web/src/template_lualib.c b/libs/web/src/template_lualib.c +diff --git a/modules/base/src/template_lualib.c b/modules/base/src/template_lualib.c index 0d43641..1035611 100644 ---- a/libs/web/src/template_lualib.c -+++ b/libs/web/src/template_lualib.c +--- a/modules/base/src/template_lualib.c ++++ b/modules/base/src/template_lualib.c @@ -18,10 +18,8 @@ #include "template_lualib.h" @@ -59,10 +59,10 @@ index 0d43641..1035611 100644 { "utf8", template_L_utf8 }, { "pcdata", template_L_pcdata }, { "striptags", template_L_striptags }, -diff --git a/libs/web/src/template_parser.c b/libs/web/src/template_parser.c +diff --git a/modules/base/src/template_parser.c b/modules/base/src/template_parser.c index 1aa5131..c263fbf 100644 ---- a/libs/web/src/template_parser.c -+++ b/libs/web/src/template_parser.c +--- a/modules/base/src/template_parser.c ++++ b/modules/base/src/template_parser.c @@ -100,6 +100,36 @@ err: return NULL; } @@ -128,10 +128,10 @@ index 1aa5131..c263fbf 100644 lua_pushnil(L); lua_pushinteger(L, line + chunkline); -diff --git a/libs/web/src/template_parser.h b/libs/web/src/template_parser.h +diff --git a/modules/base/src/template_parser.h b/modules/base/src/template_parser.h index ad03cbc..a3200a2 100644 ---- a/libs/web/src/template_parser.h -+++ b/libs/web/src/template_parser.h +--- a/modules/base/src/template_parser.h ++++ b/modules/base/src/template_parser.h @@ -71,6 +71,7 @@ struct template_parser { }; diff --git a/patches/packages/luci/0004-libs-web-add-support-for-string-templates-to-luci.template-module.patch b/patches/packages/luci/0004-libs-web-add-support-for-string-templates-to-luci.template-module.patch index e767af23..49504881 100644 --- a/patches/packages/luci/0004-libs-web-add-support-for-string-templates-to-luci.template-module.patch +++ b/patches/packages/luci/0004-libs-web-add-support-for-string-templates-to-luci.template-module.patch @@ -2,10 +2,10 @@ From: Matthias Schiffer Date: Fri, 16 May 2014 11:48:42 +0200 Subject: libs/web: add support for string templates to luci.template module -diff --git a/libs/web/luasrc/template.lua b/libs/web/luasrc/template.lua +diff --git a/modules/base/luasrc/template.lua b/modules/base/luasrc/template.lua index 72127d1..ea01d3c 100644 ---- a/libs/web/luasrc/template.lua -+++ b/libs/web/luasrc/template.lua +--- a/modules/base/luasrc/template.lua ++++ b/modules/base/luasrc/template.lua @@ -50,6 +50,13 @@ function render(name, scope) return Template(name):render(scope or getfenv(2)) end From 547fc42ff9629912dc7fc2de279fab1e4760745e Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Wed, 6 Aug 2014 14:09:21 +0200 Subject: [PATCH 010/100] Improve haveged patch --- ...fter-initial-setup-and-disable-tests.patch | 33 +++++++++++++++++++ ...er-initial-setup-and-don-t-run-tests.patch | 27 --------------- 2 files changed, 33 insertions(+), 27 deletions(-) create mode 100644 patches/packages/openwrt/0001-haveged-start-directly-after-initial-setup-and-disable-tests.patch delete mode 100644 patches/packages/openwrt/0001-haveged-start-directly-after-initial-setup-and-don-t-run-tests.patch diff --git a/patches/packages/openwrt/0001-haveged-start-directly-after-initial-setup-and-disable-tests.patch b/patches/packages/openwrt/0001-haveged-start-directly-after-initial-setup-and-disable-tests.patch new file mode 100644 index 00000000..915dfff0 --- /dev/null +++ b/patches/packages/openwrt/0001-haveged-start-directly-after-initial-setup-and-disable-tests.patch @@ -0,0 +1,33 @@ +From: Matthias Schiffer +Date: Sat, 26 Jul 2014 18:06:07 +0200 +Subject: haveged: start directly after initial setup and disable tests + +diff --git a/utils/haveged/Makefile b/utils/haveged/Makefile +index 12a6237..e9ff3f1 100644 +--- a/utils/haveged/Makefile ++++ b/utils/haveged/Makefile +@@ -41,8 +41,9 @@ define Package/libhavege + endef + + CONFIGURE_ARGS+= \ +- --enable-daemon=yes +- --enable-threads=no ++ --enable-daemon=yes \ ++ --enable-threads=no \ ++ --enable-olt=no + + define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/include +diff --git a/utils/haveged/files/haveged.init b/utils/haveged/files/haveged.init +index ce28e61..113d64f 100644 +--- a/utils/haveged/files/haveged.init ++++ b/utils/haveged/files/haveged.init +@@ -1,7 +1,7 @@ + #!/bin/sh /etc/rc.common + # Copyright (C) 2012 OpenWrt.org + +-START=98 ++START=13 + + HAVEGED_THRESHOLD=1024 + HAVEGED_DCACHE=32 diff --git a/patches/packages/openwrt/0001-haveged-start-directly-after-initial-setup-and-don-t-run-tests.patch b/patches/packages/openwrt/0001-haveged-start-directly-after-initial-setup-and-don-t-run-tests.patch deleted file mode 100644 index ff3d871e..00000000 --- a/patches/packages/openwrt/0001-haveged-start-directly-after-initial-setup-and-don-t-run-tests.patch +++ /dev/null @@ -1,27 +0,0 @@ -From: Matthias Schiffer -Date: Sat, 26 Jul 2014 18:06:07 +0200 -Subject: haveged: start directly after initial setup and don't run tests - -diff --git a/utils/haveged/files/haveged.init b/utils/haveged/files/haveged.init -index ce28e61..aa8d3c7 100644 ---- a/utils/haveged/files/haveged.init -+++ b/utils/haveged/files/haveged.init -@@ -1,14 +1,16 @@ - #!/bin/sh /etc/rc.common - # Copyright (C) 2012 OpenWrt.org - --START=98 -+START=13 - - HAVEGED_THRESHOLD=1024 - HAVEGED_DCACHE=32 - HAVEGED_ICACHE=32 -+HAVEGED_TESTS_TOT= -+HAVEGED_TESTS_CONT= - - start() { -- service_start /usr/sbin/haveged -w $HAVEGED_THRESHOLD -d $HAVEGED_DCACHE -i $HAVEGED_ICACHE -v 1 -+ service_start /usr/sbin/haveged -w $HAVEGED_THRESHOLD -d $HAVEGED_DCACHE -i $HAVEGED_ICACHE -v 1 -o t${HAVEGED_TESTS_TOT}c${HAVEGED_TESTS_CONT} - } - - stop() { From d96054c5df7b28c818724dded1de7173933465ae Mon Sep 17 00:00:00 2001 From: Julian Kornberger Date: Thu, 7 Aug 2014 10:49:55 +0200 Subject: [PATCH 011/100] docs: fix literal blocks --- docs/features/mesh-on-wan.rst | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/docs/features/mesh-on-wan.rst b/docs/features/mesh-on-wan.rst index 2c6b0bb0..2f1a8a47 100644 --- a/docs/features/mesh-on-wan.rst +++ b/docs/features/mesh-on-wan.rst @@ -1,15 +1,13 @@ Mesh on WAN =========== -It's possible to enable the mesh on the WAN port like this: +It's possible to enable the mesh on the WAN port like this:: - :: uci set network.mesh_wan.auto=1 uci commit -It may also be disabled again by running: +It may also be disabled again by running:: - :: uci set network.mesh_wan.auto=0 uci commit From ab7735cd5d28cee5753e4ba57b6bdf8f26f19947 Mon Sep 17 00:00:00 2001 From: Julian Kornberger Date: Thu, 7 Aug 2014 10:41:21 +0200 Subject: [PATCH 012/100] docs: renaming gluon-luci-privatewifi into gluon-luci-private-wifi --- docs/features/private-wlan.rst | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/docs/features/private-wlan.rst b/docs/features/private-wlan.rst index a4106af3..343cd5c3 100644 --- a/docs/features/private-wlan.rst +++ b/docs/features/private-wlan.rst @@ -4,10 +4,9 @@ Private WLAN It is possible to set up a private WLAN that bridges the WAN port and is seperated from the mesh network. Please note that you should not enable ``mesh_on_wan`` simultaneously. -The private WLAN can be enabled through the config mode if the package ``gluon-luci-privatewifi`` is installed. -You may also enable a private WLAN using the command line: +The private WLAN can be enabled through the config mode if the package ``gluon-luci-private-wifi`` is installed. +You may also enable a private WLAN using the command line:: - :: uci set wireless.wan_radio0=wifi-iface uci set wireless.wan_radio0.device=radio0 uci set wireless.wan_radio0.network=wan @@ -22,9 +21,8 @@ You may also enable a private WLAN using the command line: Please replace ``$SSID`` by the name of the WLAN and ``$KEY`` by your passphrase (8-63 characters). If you have two radios (e.g. 2.4 and 5 GHz) you need to do this for radio0 and radio1. -It may also be disabled by running: +It may also be disabled by running:: - :: uci set wireless.wan_radio0.disabled=1 uci commit wifi From e164bac87a809f0c73d50359db59f5a3ecf3185d Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Sat, 26 Jul 2014 16:11:27 +0200 Subject: [PATCH 013/100] 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 From e53f3102a78a5447b667520413c4c1342986cb4e Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Thu, 7 Aug 2014 14:47:16 +0200 Subject: [PATCH 014/100] Add support for TL-WR1043N/ND v2 --- ...R1043N-ND-v2-Fix-MAC-address-of-WMAC.patch | 32 +++++++++++++++++++ targets/ar71xx-generic/profiles.mk | 3 +- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 patches/openwrt/0003-ar71xx-TL-WR1043N-ND-v2-Fix-MAC-address-of-WMAC.patch diff --git a/patches/openwrt/0003-ar71xx-TL-WR1043N-ND-v2-Fix-MAC-address-of-WMAC.patch b/patches/openwrt/0003-ar71xx-TL-WR1043N-ND-v2-Fix-MAC-address-of-WMAC.patch new file mode 100644 index 00000000..dd40c598 --- /dev/null +++ b/patches/openwrt/0003-ar71xx-TL-WR1043N-ND-v2-Fix-MAC-address-of-WMAC.patch @@ -0,0 +1,32 @@ +From: Matthias Schiffer +Date: Thu, 7 Aug 2014 15:07:15 +0200 +Subject: ar71xx: TL-WR1043N/ND v2: Fix MAC address of WMAC + +This sets the MAC address of the WLAN interface to the "official" primary MAC +address (the one on the label under the devices, and the one used with the stock +firmware). The MAC address used so far (primary-1) isn't even used at all with +the stock firmware, which sets (primary) on LAN and WLAN and (primary+1) on the +WAN interface (like OpenWrt does with this patch). + +diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr1043nd-v2.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr1043nd-v2.c +index 4f873e2..3e79ee1 100644 +--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr1043nd-v2.c ++++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr1043nd-v2.c +@@ -168,7 +168,6 @@ static void __init tl_wr1043nd_v2_setup(void) + { + u8 *mac = (u8 *) KSEG1ADDR(0x1f01fc00); + u8 *art = (u8 *) KSEG1ADDR(0x1fff0000); +- u8 tmpmac[ETH_ALEN]; + + ath79_register_m25p80(&wr1043nd_v2_flash_data); + +@@ -178,8 +177,7 @@ static void __init tl_wr1043nd_v2_setup(void) + ARRAY_SIZE(tl_wr1043_v2_gpio_keys), + tl_wr1043_v2_gpio_keys); + +- ath79_init_mac(tmpmac, mac, -1); +- ath79_register_wmac(art + TL_WR1043_V2_WMAC_CALDATA_OFFSET, tmpmac); ++ ath79_register_wmac(art + TL_WR1043_V2_WMAC_CALDATA_OFFSET, mac); + + mdiobus_register_board_info(wr1043nd_v2_mdio0_info, + ARRAY_SIZE(wr1043nd_v2_mdio0_info)); diff --git a/targets/ar71xx-generic/profiles.mk b/targets/ar71xx-generic/profiles.mk index 63c7d8f1..a7f87d86 100644 --- a/targets/ar71xx-generic/profiles.mk +++ b/targets/ar71xx-generic/profiles.mk @@ -39,9 +39,10 @@ $(eval $(call GluonModel,TLWR941,tl-wr941nd-v2-squashfs,tp-link-tl-wr941n-nd-v2) $(eval $(call GluonModel,TLWR941,tl-wr941nd-v3-squashfs,tp-link-tl-wr941n-nd-v3)) $(eval $(call GluonModel,TLWR941,tl-wr941nd-v4-squashfs,tp-link-tl-wr941n-nd-v4)) -# TL-WR1043N/ND v1 +# TL-WR1043N/ND v1, v2 $(eval $(call GluonProfile,TLWR1043)) $(eval $(call GluonModel,TLWR1043,tl-wr1043nd-v1-squashfs,tp-link-tl-wr1043n-nd-v1)) +$(eval $(call GluonModel,TLWR1043,tl-wr1043nd-v2-squashfs,tp-link-tl-wr1043n-nd-v2)) # TL-WDR3500/3600/4300 v1 $(eval $(call GluonProfile,TLWDR4300)) From 26320061bcd664a444721d034ca496d3704504b4 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Thu, 7 Aug 2014 17:24:56 +0200 Subject: [PATCH 015/100] docs: some updates for the recent changes --- docs/index.rst | 2 +- docs/releases/v2014.4.rst | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/index.rst b/docs/index.rst index 48b01019..7d0a80b6 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -46,7 +46,7 @@ Supported Devices - TL-WR841N/ND (v3, v5, v7, v8, v9) - TL-WR842N/ND (v1, v2) - TL-WR941N/ND (v2, v3, v4) - - TL-WR1043N/ND (v1) + - TL-WR1043N/ND (v1, v2) - TL-WDR3500 (v1) - TL-WDR3600 (v1) - TL-WDR4300 (v1) diff --git a/docs/releases/v2014.4.rst b/docs/releases/v2014.4.rst index cf53ece8..8339b9de 100644 --- a/docs/releases/v2014.4.rst +++ b/docs/releases/v2014.4.rst @@ -3,6 +3,7 @@ Gluon 2014.4 (In development) New hardware support ~~~~~~~~~~~~~~~~~~~~ +* TP-Link TL-WR1043N/ND v2 New features ~~~~~~~~~~~~ @@ -33,3 +34,4 @@ Site changes Internals ~~~~~~~~~ +* We're on Barrier Breaker now! From ddd7c163ffc30d04eb3620c2980d3ed15157f446 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Thu, 7 Aug 2014 17:25:50 +0200 Subject: [PATCH 016/100] docs: fix another warning --- docs/releases/v2014.3.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/releases/v2014.3.rst b/docs/releases/v2014.3.rst index 3c292949..494ab186 100644 --- a/docs/releases/v2014.3.rst +++ b/docs/releases/v2014.3.rst @@ -94,7 +94,7 @@ Improved ath9k stability Multiple bugs in the WLAN driver ath9k have been fixed upstream. This should greatly improve the WLAN stability. odhcp6c 50 day bug ---------------- +------------------ An important update for odhcp6c fixes a bug which caused Gluon nodes to lose their IPv6 addresses on br-client after an uptime of 50 days, making the nodes unable perform automated updates (besides other issues). From 8402e9795efdc52b5dc295ea8d69624d11be5af6 Mon Sep 17 00:00:00 2001 From: hexa- Date: Fri, 8 Aug 2014 00:59:21 +0200 Subject: [PATCH 017/100] docs: configure ntp servers in site.conf, not site.mk --- docs/releases/v2014.3.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/releases/v2014.3.rst b/docs/releases/v2014.3.rst index 494ab186..7fd5d089 100644 --- a/docs/releases/v2014.3.rst +++ b/docs/releases/v2014.3.rst @@ -28,7 +28,7 @@ the probability will proportional to the time passed. I.e. the update probabilit and slowly increase to 1 until ``PRIORITY`` days have passed. From then, the probability will be fixed at 1. **Note:** For the new update logic to work, a valid NTP server reachable over the mesh (using IPv6) must -be configured in ``site.mk``. If the autoupdater is unable to determine the correct time, it will fall back to +be configured in ``site.conf``. If the autoupdater is unable to determine the correct time, it will fall back to a behavior similar to the old implementation (i.e. hourly update attempts). Seperation of announced data From 354ebb495b59669287fe7c9c359fc8c48f8b7eee Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Fri, 8 Aug 2014 16:25:03 +0200 Subject: [PATCH 018/100] Keep ordering of package lists --- include/gluon.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/gluon.mk b/include/gluon.mk index e5cc164b..0bf92db5 100644 --- a/include/gluon.mk +++ b/include/gluon.mk @@ -45,7 +45,7 @@ endif define merge-lists $(1) := -$(foreach var,$(2),$(1) := $$(sort $$(filter-out -% $$(patsubst -%,%,$$(filter -%,$$($(var)))),$$($(1)) $$($(var)))) +$(foreach var,$(2),$(1) := $$(filter-out -% $$(patsubst -%,%,$$(filter -%,$$($(var)))),$$($(1)) $$($(var))) ) endef From 64bac337c78faf11694db9d238bed1c7953f661b Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Fri, 8 Aug 2014 16:06:37 +0200 Subject: [PATCH 019/100] docs: gluon-mesh-batman-adv split --- docs/releases/v2014.4.rst | 2 ++ docs/site-example/site.mk | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/docs/releases/v2014.4.rst b/docs/releases/v2014.4.rst index 8339b9de..5471d419 100644 --- a/docs/releases/v2014.4.rst +++ b/docs/releases/v2014.4.rst @@ -23,6 +23,7 @@ Site changes - Obsolete packages: + ``gluon-config-mode`` + + ``gluon-mesh-batman-adv`` - Recommended new packages: @@ -31,6 +32,7 @@ Site changes + ``gluon-config-mode-mesh-vpn`` + ``gluon-config-mode-geo-location`` + ``gluon-config-mode-contact-info`` + + ``gluon-mesh-batman-adv-14`` or ``gluon-mesh-batman-adv-15`` (specify this before all other packages in the list) Internals ~~~~~~~~~ diff --git a/docs/site-example/site.mk b/docs/site-example/site.mk index bbdf0b25..f7304337 100644 --- a/docs/site-example/site.mk +++ b/docs/site-example/site.mk @@ -2,8 +2,10 @@ ## GLUON_SITE_PACKAGES # specify gluon/openwrt packages to include here +# The gluon-mesh-batman-adv-* package must come first because of the dependency resolution GLUON_SITE_PACKAGES := \ + gluon-mesh-batman-adv-15 \ gluon-alfred \ gluon-announced \ gluon-autoupdater \ @@ -18,7 +20,6 @@ GLUON_SITE_PACKAGES := \ gluon-luci-autoupdater \ gluon-luci-portconfig \ gluon-next-node \ - gluon-mesh-batman-adv \ gluon-mesh-vpn-fastd \ gluon-radvd \ gluon-status-page \ From d2d8f6d5647c635935cdb04dbf1e78af1fb7186d Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Fri, 8 Aug 2014 17:08:20 +0200 Subject: [PATCH 020/100] Update Gluon packages --- modules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules b/modules index 8e408217..1469e0bb 100644 --- a/modules +++ b/modules @@ -8,7 +8,7 @@ PACKAGES_OPENWRT_COMMIT=a5944176bc761a3fd233c59bad1af96165e5b60f PACKAGES_OPENWRT_BRANCH=for-14.07 PACKAGES_GLUON_REPO=git://github.com/freifunk-gluon/packages.git -PACKAGES_GLUON_COMMIT=2d49f5770480d7bd612e0fa89065c52c8db7b957 +PACKAGES_GLUON_COMMIT=33ae97125c932adc62d9b4dcf88bdae8fdcaf83f PACKAGES_ROUTING_REPO=git://github.com/openwrt-routing/packages.git PACKAGES_ROUTING_COMMIT=9d3c311fdd7dc15fd5e333b55c259fc2cf661ea2 From 1c1fbe38d5cd0e29a2aee38d38c2573738ce9676 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Fri, 8 Aug 2014 17:34:50 +0200 Subject: [PATCH 021/100] Always ignore profile-specific packages supplied by OpenWrt --- Makefile | 5 ++--- include/gluon.mk | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index f3391391..e9d770c0 100644 --- a/Makefile +++ b/Makefile @@ -121,12 +121,11 @@ PROFILE_PACKAGES := define Profile $(eval $(call Profile/Default)) $(eval $(call Profile/$(1))) - $(1)_PACKAGES := $(PACKAGES) endef define GluonProfile PROFILES += $(1) -PROFILE_PACKAGES += $(filter-out -%,$($(1)_PACKAGES) $(2) $(GLUON_$(1)_SITE_PACKAGES)) +PROFILE_PACKAGES += $(filter-out -%,$(2) $(GLUON_$(1)_SITE_PACKAGES)) GLUON_$(1)_DEFAULT_PACKAGES := $(2) GLUON_$(1)_MODELS := endef @@ -303,7 +302,7 @@ enable_initscripts: FORCE # Generate package list -$(eval $(call merge-lists,INSTALL_PACKAGES,DEFAULT_PACKAGES $(PROFILE)_PACKAGES GLUON_DEFAULT_PACKAGES GLUON_SITE_PACKAGES GLUON_$(PROFILE)_DEFAULT_PACKAGES GLUON_$(PROFILE)_SITE_PACKAGES)) +$(eval $(call merge-lists,INSTALL_PACKAGES,DEFAULT_PACKAGES GLUON_DEFAULT_PACKAGES GLUON_SITE_PACKAGES GLUON_$(PROFILE)_DEFAULT_PACKAGES GLUON_$(PROFILE)_SITE_PACKAGES)) package_install: FORCE $(OPKG) update diff --git a/include/gluon.mk b/include/gluon.mk index 0bf92db5..178c6241 100644 --- a/include/gluon.mk +++ b/include/gluon.mk @@ -60,7 +60,7 @@ endef regex-escape = $(shell echo '$(1)' | sed -e 's/[]\/()$*.^|[]/\\&/g') -GLUON_DEFAULT_PACKAGES := gluon-core kmod-ipv6 firewall ip6tables -uboot-envtools -kmod-usb-core -kmod-usb2 -kmod-ledtrig-usbdev +GLUON_DEFAULT_PACKAGES := gluon-core kmod-ipv6 firewall ip6tables -uboot-envtools override DEFAULT_PACKAGES.router := From 23435baac5d4a68887a026d4590e46ec194b7d39 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Fri, 8 Aug 2014 17:56:46 +0200 Subject: [PATCH 022/100] Update Gluon packages --- modules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules b/modules index 1469e0bb..71f931c3 100644 --- a/modules +++ b/modules @@ -8,7 +8,7 @@ PACKAGES_OPENWRT_COMMIT=a5944176bc761a3fd233c59bad1af96165e5b60f PACKAGES_OPENWRT_BRANCH=for-14.07 PACKAGES_GLUON_REPO=git://github.com/freifunk-gluon/packages.git -PACKAGES_GLUON_COMMIT=33ae97125c932adc62d9b4dcf88bdae8fdcaf83f +PACKAGES_GLUON_COMMIT=5afa7ae59d4bed7007e350aa63782136ced5a48a PACKAGES_ROUTING_REPO=git://github.com/openwrt-routing/packages.git PACKAGES_ROUTING_COMMIT=9d3c311fdd7dc15fd5e333b55c259fc2cf661ea2 From 024d3e3c99f7ae17b19f69404cf9b0b644871de1 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Fri, 8 Aug 2014 17:57:18 +0200 Subject: [PATCH 023/100] Add experimental support for the TL-WDR4900 (MPC85xx target) --- targets/mpc85xx-generic/config | 1 + targets/mpc85xx-generic/kernel-config | 3946 +++++++++++++++++++++++ targets/mpc85xx-generic/kernel-vermagic | 1 + targets/mpc85xx-generic/profiles.mk | 7 + targets/targets.mk | 1 + 5 files changed, 3956 insertions(+) create mode 100644 targets/mpc85xx-generic/config create mode 100644 targets/mpc85xx-generic/kernel-config create mode 100644 targets/mpc85xx-generic/kernel-vermagic create mode 100644 targets/mpc85xx-generic/profiles.mk diff --git a/targets/mpc85xx-generic/config b/targets/mpc85xx-generic/config new file mode 100644 index 00000000..83737ebe --- /dev/null +++ b/targets/mpc85xx-generic/config @@ -0,0 +1 @@ +CONFIG_TARGET_mpc85xx=y diff --git a/targets/mpc85xx-generic/kernel-config b/targets/mpc85xx-generic/kernel-config new file mode 100644 index 00000000..86c84db4 --- /dev/null +++ b/targets/mpc85xx-generic/kernel-config @@ -0,0 +1,3946 @@ +# +# Automatically generated file; DO NOT EDIT. +# Linux/powerpc 3.10.49 Kernel Configuration +# +# CONFIG_PPC64 is not set + +# +# Processor support +# +# CONFIG_PPC_BOOK3S_32 is not set +CONFIG_PPC_85xx=y +# CONFIG_PPC_8xx is not set +# CONFIG_40x is not set +# CONFIG_44x is not set +# CONFIG_E200 is not set +CONFIG_E500=y +# CONFIG_PPC_E500MC is not set +CONFIG_FSL_EMB_PERFMON=y +CONFIG_BOOKE=y +CONFIG_FSL_BOOKE=y +CONFIG_PPC_FSL_BOOK3E=y +# CONFIG_PHYS_64BIT is not set +CONFIG_SPE=y +CONFIG_PPC_MMU_NOHASH=y +CONFIG_PPC_BOOK3E_MMU=y +# CONFIG_PPC_MM_SLICES is not set +# CONFIG_SMP is not set +CONFIG_PPC_DOORBELL=y +CONFIG_PPC32=y +CONFIG_32BIT=y +CONFIG_WORD_SIZE=32 +# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set +# CONFIG_ARCH_DMA_ADDR_T_64BIT is not set +CONFIG_MMU=y +# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set +# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set +CONFIG_NR_IRQS=512 +CONFIG_STACKTRACE_SUPPORT=y +CONFIG_HAVE_LATENCYTOP_SUPPORT=y +CONFIG_TRACE_IRQFLAGS_SUPPORT=y +CONFIG_LOCKDEP_SUPPORT=y +CONFIG_RWSEM_XCHGADD_ALGORITHM=y +CONFIG_ARCH_HAS_ILOG2_U32=y +CONFIG_GENERIC_HWEIGHT=y +CONFIG_PPC=y +CONFIG_EARLY_PRINTK=y +CONFIG_GENERIC_NVRAM=y +CONFIG_SCHED_OMIT_FRAME_POINTER=y +CONFIG_ARCH_MAY_HAVE_PC_FDC=y +CONFIG_PPC_OF=y +CONFIG_PPC_UDBG_16550=y +# CONFIG_GENERIC_TBSYNC is not set +CONFIG_AUDIT_ARCH=y +CONFIG_GENERIC_BUG=y +# CONFIG_EPAPR_BOOT is not set +CONFIG_DEFAULT_UIMAGE=y +CONFIG_ARCH_HIBERNATION_POSSIBLE=y +CONFIG_ARCH_SUSPEND_POSSIBLE=y +# CONFIG_PPC_DCR_NATIVE is not set +# CONFIG_PPC_DCR_MMIO is not set +CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y +CONFIG_ARCH_SUPPORTS_UPROBES=y +CONFIG_PPC_ADV_DEBUG_REGS=y +CONFIG_PPC_ADV_DEBUG_IACS=2 +CONFIG_PPC_ADV_DEBUG_DACS=2 +CONFIG_PPC_ADV_DEBUG_DVCS=0 +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" +CONFIG_IRQ_WORK=y + +# +# General setup +# +CONFIG_BROKEN_ON_SMP=y +CONFIG_INIT_ENV_ARG_LIMIT=32 +CONFIG_CROSS_COMPILE="" +CONFIG_LOCALVERSION="" +# CONFIG_LOCALVERSION_AUTO is not set +CONFIG_DEFAULT_HOSTNAME="(none)" +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +CONFIG_SYSVIPC_SYSCTL=y +# CONFIG_POSIX_MQUEUE is not set +# CONFIG_FHANDLE is not set +# CONFIG_AUDIT is not set +CONFIG_HAVE_GENERIC_HARDIRQS=y + +# +# IRQ subsystem +# +CONFIG_GENERIC_HARDIRQS=y +CONFIG_GENERIC_IRQ_SHOW=y +CONFIG_GENERIC_IRQ_SHOW_LEVEL=y +CONFIG_IRQ_DOMAIN=y +# CONFIG_IRQ_DOMAIN_DEBUG is not set +CONFIG_IRQ_FORCED_THREADING=y +CONFIG_SPARSE_IRQ=y +CONFIG_GENERIC_TIME_VSYSCALL_OLD=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_STALL_COMMON is not set +# CONFIG_TREE_RCU_TRACE 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 +# CONFIG_NAMESPACES is not set +# CONFIG_SCHED_AUTOGROUP is not set +# CONFIG_SYSFS_DEPRECATED is not set +CONFIG_RELAY=y +CONFIG_BLK_DEV_INITRD=y +CONFIG_INITRAMFS_SOURCE="" +# CONFIG_RD_GZIP is not set +# CONFIG_RD_BZIP2 is not set +# 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_SYSCTL_EXCEPTION_TRACE=y +# CONFIG_KALLSYMS_UNCOMPRESSED is not set +CONFIG_HOTPLUG=y +CONFIG_EXPERT=y +# CONFIG_SYSCTL_SYSCALL is not set +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_ALL is not set +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_EPOLL=y +CONFIG_SIGNALFD=y +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 + +# +# Kernel Performance Events And Counters +# +# CONFIG_PERF_EVENTS is not set +CONFIG_VM_EVENT_COUNTERS=y +# CONFIG_SLUB_DEBUG is not set +# CONFIG_COMPAT_BRK is not set +# CONFIG_SLAB is not set +CONFIG_SLUB=y +# CONFIG_SLOB is not set +# CONFIG_PROFILING is not set +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_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_ARCH_TRACEHOOK=y +CONFIG_HAVE_DMA_ATTRS=y +CONFIG_GENERIC_SMP_IDLE_THREAD=y +CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y +CONFIG_HAVE_DMA_API_DEBUG=y +CONFIG_HAVE_ARCH_JUMP_LABEL=y +CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y +CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y +CONFIG_HAVE_MOD_ARCH_SPECIFIC=y +CONFIG_MODULES_USE_ELF_RELA=y +CONFIG_CLONE_BACKWARDS=y +CONFIG_OLD_SIGSUSPEND=y +CONFIG_OLD_SIGACTION=y + +# +# GCOV-based kernel profiling +# +# CONFIG_GCOV_KERNEL is not set +# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set +CONFIG_RT_MUTEXES=y +CONFIG_BASE_SMALL=0 +CONFIG_MODULES=y +# CONFIG_MODULE_FORCE_LOAD is not set +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 is not set +# CONFIG_BLK_DEV_BSGLIB is not set +# CONFIG_BLK_DEV_INTEGRITY is not set + +# +# Partition Types +# +CONFIG_PARTITION_ADVANCED=y +# CONFIG_ACORN_PARTITION is not set +# CONFIG_OSF_PARTITION is not set +# CONFIG_AMIGA_PARTITION is not set +# CONFIG_ATARI_PARTITION is not set +# CONFIG_MAC_PARTITION is not set +CONFIG_MSDOS_PARTITION=y +# CONFIG_BSD_DISKLABEL is not set +# CONFIG_MINIX_SUBPARTITION is not set +# CONFIG_SOLARIS_X86_PARTITION is not set +# CONFIG_UNIXWARE_DISKLABEL is not set +# CONFIG_LDM_PARTITION is not set +# CONFIG_SGI_PARTITION is not set +# CONFIG_ULTRIX_PARTITION is not set +# CONFIG_SUN_PARTITION is not set +# CONFIG_KARMA_PARTITION is not set +CONFIG_EFI_PARTITION=y +# CONFIG_SYSV68_PARTITION is not set + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +CONFIG_IOSCHED_DEADLINE=y +# CONFIG_IOSCHED_CFQ is not set +CONFIG_DEFAULT_DEADLINE=y +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="deadline" +CONFIG_INLINE_SPIN_UNLOCK_IRQ=y +CONFIG_INLINE_READ_UNLOCK=y +CONFIG_INLINE_READ_UNLOCK_IRQ=y +CONFIG_INLINE_WRITE_UNLOCK=y +CONFIG_INLINE_WRITE_UNLOCK_IRQ=y +# CONFIG_FREEZER is not set +# CONFIG_PPC_XICS is not set +# CONFIG_PPC_ICP_NATIVE is not set +# CONFIG_PPC_ICP_HV is not set +# CONFIG_PPC_ICS_RTAS is not set +# CONFIG_GE_FPGA is not set + +# +# Platform support +# +# CONFIG_PPC_CELL is not set +# CONFIG_PPC_CELL_NATIVE is not set +# CONFIG_PQ2ADS is not set +CONFIG_FSL_SOC_BOOKE=y +# CONFIG_BSC9131_RDB is not set +# CONFIG_MPC8540_ADS is not set +# CONFIG_MPC8560_ADS is not set +CONFIG_MPC85xx_CDS=y +CONFIG_MPC85xx_MDS=y +# CONFIG_MPC8536_DS is not set +# CONFIG_MPC85xx_DS is not set +CONFIG_MPC85xx_RDB=y +CONFIG_P1010_RDB=y +# CONFIG_P1022_DS is not set +# CONFIG_P1022_RDK is not set +# CONFIG_P1023_RDS is not set +# CONFIG_SOCRATES is not set +# CONFIG_KSI8560 is not set +# CONFIG_XES_MPC85xx is not set +# CONFIG_STX_GP3 is not set +CONFIG_TL_WDR4900_V1=y +# CONFIG_TQM8540 is not set +# CONFIG_TQM8541 is not set +# CONFIG_TQM8548 is not set +# CONFIG_TQM8555 is not set +# CONFIG_TQM8560 is not set +# CONFIG_SBC8548 is not set +# CONFIG_PPA8548 is not set +# CONFIG_GE_IMP3A is not set +# CONFIG_P2041_RDB is not set +# CONFIG_P3041_DS is not set +# CONFIG_P4080_DS is not set +# CONFIG_P5020_DS is not set +# CONFIG_P5040_DS is not set +# CONFIG_PPC_QEMU_E500 is not set +# CONFIG_PPC_WSP is not set +# CONFIG_KVM_GUEST is not set +# CONFIG_EPAPR_PARAVIRT is not set +CONFIG_PPC_SMP_MUXED_IPI=y +# CONFIG_IPIC is not set +CONFIG_MPIC=y +# CONFIG_PPC_EPAPR_HV_PIC is not set +# CONFIG_MPIC_WEIRD is not set +# CONFIG_MPIC_MSGR is not set +CONFIG_PPC_I8259=y +# CONFIG_PPC_RTAS is not set +# CONFIG_MMIO_NVRAM is not set +# CONFIG_MPIC_U3_HT_IRQS is not set +# CONFIG_PPC_MPC106 is not set +# CONFIG_PPC_970_NAP is not set +# CONFIG_PPC_P7_NAP is not set + +# +# CPU Frequency scaling +# +# CONFIG_CPU_FREQ is not set + +# +# CPUIdle driver +# +# CONFIG_CPU_IDLE is not set +# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set +CONFIG_QUICC_ENGINE=y +CONFIG_QE_GPIO=y +# CONFIG_CPM2 is not set +CONFIG_FSL_ULI1575=y +CONFIG_SIMPLE_GPIO=y + +# +# Kernel options +# +# CONFIG_HIGHMEM is not set +# CONFIG_HZ_100 is not set +CONFIG_HZ_250=y +# CONFIG_HZ_300 is not set +# CONFIG_HZ_1000 is not set +CONFIG_HZ=250 +CONFIG_SCHED_HRTICK=y +CONFIG_PREEMPT_NONE=y +# CONFIG_PREEMPT_VOLUNTARY is not set +# CONFIG_PREEMPT is not set +CONFIG_BINFMT_ELF=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_MATH_EMULATION is not set +CONFIG_IOMMU_HELPER=y +CONFIG_SWIOTLB=y +CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y +CONFIG_ARCH_HAS_WALK_MEMORY=y +CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y +# CONFIG_KEXEC is not set +# CONFIG_CRASH_DUMP is not set +CONFIG_ARCH_FLATMEM_ENABLE=y +CONFIG_FLATMEM=y +CONFIG_FLAT_NODE_MEM_MAP=y +CONFIG_HAVE_MEMBLOCK=y +CONFIG_HAVE_MEMBLOCK_NODE_MAP=y +# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set +CONFIG_PAGEFLAGS_EXTENDED=y +CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_COMPACTION is not set +CONFIG_MIGRATION=y +# CONFIG_PHYS_ADDR_T_64BIT is not set +CONFIG_ZONE_DMA_FLAG=1 +CONFIG_BOUNCE=y +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_FRONTSWAP is not set +CONFIG_PPC_4K_PAGES=y +CONFIG_FORCE_MAX_ZONEORDER=11 +CONFIG_CMDLINE_BOOL=y +CONFIG_CMDLINE="console=ttyS0,115200" +CONFIG_EXTRA_TARGETS="" +# CONFIG_SUSPEND is not set +# CONFIG_HIBERNATION is not set +# CONFIG_PM_RUNTIME is not set +# CONFIG_SECCOMP is not set +CONFIG_ISA_DMA_API=y + +# +# Bus options +# +CONFIG_ZONE_DMA=y +# CONFIG_NEED_DMA_MAP_STATE is not set +CONFIG_NEED_SG_DMA_LENGTH=y +CONFIG_GENERIC_ISA_DMA=y +CONFIG_PPC_INDIRECT_PCI=y +CONFIG_FSL_SOC=y +CONFIG_FSL_PCI=y +CONFIG_FSL_LBC=y +CONFIG_PPC_PCI_CHOICE=y +CONFIG_PCI=y +CONFIG_PCI_DOMAINS=y +CONFIG_PCI_SYSCALL=y +CONFIG_PCIEPORTBUS=y +CONFIG_PCIEAER=y +# CONFIG_PCIE_ECRC is not set +# CONFIG_PCIEAER_INJECT is not set +CONFIG_PCIEASPM=y +# CONFIG_PCIEASPM_DEBUG is not set +CONFIG_PCIEASPM_DEFAULT=y +# CONFIG_PCIEASPM_POWERSAVE is not set +# CONFIG_PCIEASPM_PERFORMANCE is not set +CONFIG_ARCH_SUPPORTS_MSI=y +# CONFIG_PCI_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 is not set +# CONFIG_PCI_IOV is not set +# CONFIG_PCI_PRI is not set +# CONFIG_PCI_PASID is not set +# CONFIG_PCCARD is not set +# CONFIG_HOTPLUG_PCI is not set +CONFIG_HAS_RAPIDIO=y +# CONFIG_RAPIDIO is not set +# CONFIG_NONSTATIC_KERNEL is not set + +# +# Advanced setup +# +# CONFIG_ADVANCED_OPTIONS is not set + +# +# Default settings for advanced configuration options are used +# +CONFIG_LOWMEM_SIZE=0x30000000 +CONFIG_LOWMEM_CAM_NUM=3 +CONFIG_PAGE_OFFSET=0xc0000000 +CONFIG_KERNEL_START=0xc0000000 +CONFIG_PHYSICAL_START=0x00000000 +CONFIG_PHYSICAL_ALIGN=0x04000000 +CONFIG_TASK_SIZE=0xc0000000 +CONFIG_NET=y +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 +# CONFIG_XFRM_STATISTICS is not set +CONFIG_XFRM_IPCOMP=m +CONFIG_NET_KEY=m +# CONFIG_NET_KEY_MIGRATE is not set +CONFIG_INET=y +CONFIG_IP_MULTICAST=y +CONFIG_IP_ADVANCED_ROUTER=y +# CONFIG_IP_FIB_TRIE_STATS is not set +CONFIG_IP_MULTIPLE_TABLES=y +CONFIG_IP_ROUTE_MULTIPATH=y +CONFIG_IP_ROUTE_VERBOSE=y +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 +CONFIG_IP_MROUTE_MULTIPLE_TABLES=y +# CONFIG_IP_PIMSM_V1 is not set +# 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 +CONFIG_INET_XFRM_TUNNEL=m +CONFIG_INET_TUNNEL=m +CONFIG_INET_XFRM_MODE_TRANSPORT=m +CONFIG_INET_XFRM_MODE_TUNNEL=m +CONFIG_INET_XFRM_MODE_BEET=m +# CONFIG_INET_LRO is not set +CONFIG_INET_DIAG=y +CONFIG_INET_TCP_DIAG=y +# CONFIG_INET_UDP_DIAG is not set +CONFIG_TCP_CONG_ADVANCED=y +# CONFIG_TCP_CONG_BIC is not set +CONFIG_TCP_CONG_CUBIC=y +# CONFIG_TCP_CONG_WESTWOOD is not set +# CONFIG_TCP_CONG_HTCP is not set +# CONFIG_TCP_CONG_HSTCP is not set +# CONFIG_TCP_CONG_HYBLA is not set +# CONFIG_TCP_CONG_VEGAS is not set +# CONFIG_TCP_CONG_SCALABLE is not set +# CONFIG_TCP_CONG_LP is not set +# CONFIG_TCP_CONG_VENO is not set +# CONFIG_TCP_CONG_YEAH is not set +# CONFIG_TCP_CONG_ILLINOIS is not set +CONFIG_DEFAULT_CUBIC=y +# CONFIG_DEFAULT_RENO is not set +CONFIG_DEFAULT_TCP_CONG="cubic" +# CONFIG_TCP_MD5SIG is not set +CONFIG_IPV6=m +CONFIG_IPV6_PRIVACY=y +# CONFIG_IPV6_ROUTER_PREF is not set +# CONFIG_IPV6_OPTIMISTIC_DAD is not set +CONFIG_INET6_AH=m +CONFIG_INET6_ESP=m +CONFIG_INET6_IPCOMP=m +# CONFIG_IPV6_MIP6 is not set +CONFIG_INET6_XFRM_TUNNEL=m +CONFIG_INET6_TUNNEL=m +CONFIG_INET6_XFRM_MODE_TRANSPORT=m +CONFIG_INET6_XFRM_MODE_TUNNEL=m +CONFIG_INET6_XFRM_MODE_BEET=m +# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set +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 +# CONFIG_IPV6_MROUTE_MULTIPLE_TABLES is not set +# CONFIG_IPV6_PIMSM_V2 is not set +CONFIG_SOCK_DIAG=y +# CONFIG_NETWORK_SECMARK is not set +# CONFIG_NETWORK_PHY_TIMESTAMPING is not set +CONFIG_NETFILTER=y +# CONFIG_NETFILTER_DEBUG is not set +CONFIG_NETFILTER_ADVANCED=y +CONFIG_BRIDGE_NETFILTER=y + +# +# Core Netfilter Configuration +# +CONFIG_NETFILTER_NETLINK=m +# CONFIG_NETFILTER_NETLINK_ACCT is not set +CONFIG_NETFILTER_NETLINK_QUEUE=m +CONFIG_NETFILTER_NETLINK_LOG=m +CONFIG_NF_CONNTRACK=m +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 +# CONFIG_NF_CT_PROTO_SCTP is not set +# CONFIG_NF_CT_PROTO_UDPLITE is not set +CONFIG_NF_CONNTRACK_AMANDA=m +CONFIG_NF_CONNTRACK_FTP=m +CONFIG_NF_CONNTRACK_H323=m +CONFIG_NF_CONNTRACK_IRC=m +CONFIG_NF_CONNTRACK_BROADCAST=m +# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set +CONFIG_NF_CONNTRACK_SNMP=m +CONFIG_NF_CONNTRACK_PPTP=m +# CONFIG_NF_CONNTRACK_SANE is not set +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 + +# +# Xtables combined modules +# +CONFIG_NETFILTER_XT_MARK=m +CONFIG_NETFILTER_XT_CONNMARK=m + +# +# Xtables targets +# +# CONFIG_NETFILTER_XT_TARGET_CHECKSUM is not set +CONFIG_NETFILTER_XT_TARGET_CLASSIFY=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_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 +CONFIG_NETFILTER_XT_TARGET_TCPMSS=m +# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set + +# +# Xtables matches +# +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_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 +# CONFIG_NETFILTER_XT_MATCH_DEVGROUP is not set +CONFIG_NETFILTER_XT_MATCH_DSCP=m +CONFIG_NETFILTER_XT_MATCH_ECN=m +CONFIG_NETFILTER_XT_MATCH_ESP=m +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_LENGTH=m +CONFIG_NETFILTER_XT_MATCH_LIMIT=m +CONFIG_NETFILTER_XT_MATCH_MAC=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 +CONFIG_NETFILTER_XT_MATCH_OWNER=m +CONFIG_NETFILTER_XT_MATCH_POLICY=m +CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m +CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m +CONFIG_NETFILTER_XT_MATCH_QUOTA=m +# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set +# CONFIG_NETFILTER_XT_MATCH_REALM is not set +CONFIG_NETFILTER_XT_MATCH_RECENT=m +# CONFIG_NETFILTER_XT_MATCH_SCTP is not set +CONFIG_NETFILTER_XT_MATCH_SOCKET=m +CONFIG_NETFILTER_XT_MATCH_STATE=m +CONFIG_NETFILTER_XT_MATCH_STATISTIC=m +CONFIG_NETFILTER_XT_MATCH_STRING=m +CONFIG_NETFILTER_XT_MATCH_TCPMSS=m +CONFIG_NETFILTER_XT_MATCH_TIME=m +CONFIG_NETFILTER_XT_MATCH_U32=m +# CONFIG_IP_SET is not set +# CONFIG_IP_VS is not set + +# +# IP: Netfilter Configuration +# +CONFIG_NF_DEFRAG_IPV4=m +CONFIG_NF_CONNTRACK_IPV4=m +# CONFIG_NF_CONNTRACK_PROC_COMPAT is not set +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_AH=m +# CONFIG_IP_NF_MATCH_ECN is not set +# CONFIG_IP_NF_MATCH_RPFILTER is not set +# CONFIG_IP_NF_MATCH_TTL is not set +CONFIG_IP_NF_FILTER=m +CONFIG_IP_NF_TARGET_REJECT=m +CONFIG_IP_NF_TARGET_ULOG=m +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_PPTP=m +CONFIG_NF_NAT_H323=m +CONFIG_IP_NF_MANGLE=m +# CONFIG_IP_NF_TARGET_CLUSTERIP is not set +CONFIG_IP_NF_TARGET_ECN=m +# CONFIG_IP_NF_TARGET_TTL is not set +CONFIG_IP_NF_RAW=m +CONFIG_IP_NF_ARPTABLES=m +CONFIG_IP_NF_ARPFILTER=m +CONFIG_IP_NF_ARP_MANGLE=m + +# +# IPv6: Netfilter Configuration +# +CONFIG_NF_DEFRAG_IPV6=m +CONFIG_NF_CONNTRACK_IPV6=m +CONFIG_IP6_NF_IPTABLES=m +CONFIG_IP6_NF_MATCH_AH=m +CONFIG_IP6_NF_MATCH_EUI64=m +CONFIG_IP6_NF_MATCH_FRAG=m +CONFIG_IP6_NF_MATCH_OPTS=m +# CONFIG_IP6_NF_MATCH_HL is not set +CONFIG_IP6_NF_MATCH_IPV6HEADER=m +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_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 +CONFIG_BRIDGE_EBT_T_NAT=m +CONFIG_BRIDGE_EBT_802_3=m +CONFIG_BRIDGE_EBT_AMONG=m +CONFIG_BRIDGE_EBT_ARP=m +CONFIG_BRIDGE_EBT_IP=m +CONFIG_BRIDGE_EBT_IP6=m +CONFIG_BRIDGE_EBT_LIMIT=m +CONFIG_BRIDGE_EBT_MARK=m +CONFIG_BRIDGE_EBT_PKTTYPE=m +CONFIG_BRIDGE_EBT_STP=m +CONFIG_BRIDGE_EBT_VLAN=m +CONFIG_BRIDGE_EBT_ARPREPLY=m +CONFIG_BRIDGE_EBT_DNAT=m +CONFIG_BRIDGE_EBT_MARK_T=m +CONFIG_BRIDGE_EBT_REDIRECT=m +CONFIG_BRIDGE_EBT_SNAT=m +CONFIG_BRIDGE_EBT_LOG=m +CONFIG_BRIDGE_EBT_ULOG=m +CONFIG_BRIDGE_EBT_NFLOG=m +# CONFIG_IP_DCCP is not set +CONFIG_IP_SCTP=m +# CONFIG_SCTP_DBG_MSG is not set +# CONFIG_SCTP_DBG_OBJCNT is not set +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 +CONFIG_ATM_CLIP=m +CONFIG_ATM_CLIP_NO_ICMP=y +# CONFIG_ATM_LANE is not set +CONFIG_ATM_BR2684=m +CONFIG_ATM_BR2684_IPFILTER=y +CONFIG_L2TP=m +# CONFIG_L2TP_DEBUGFS is not set +CONFIG_L2TP_V3=y +CONFIG_L2TP_IP=m +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_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 +# CONFIG_IPX is not set +CONFIG_ATALK=m +CONFIG_DEV_APPLETALK=m +CONFIG_IPDDP=m +CONFIG_IPDDP_ENCAP=y +# CONFIG_X25 is not set +# CONFIG_LAPB is not set +# CONFIG_PHONET is not set +# CONFIG_IEEE802154 is not set +CONFIG_NET_SCHED=y + +# +# Queueing/Scheduling +# +# CONFIG_NET_SCH_CBQ is not set +CONFIG_NET_SCH_HTB=m +CONFIG_NET_SCH_HFSC=m +# CONFIG_NET_SCH_ATM is not set +CONFIG_NET_SCH_PRIO=m +# CONFIG_NET_SCH_MULTIQ is not set +CONFIG_NET_SCH_RED=m +# CONFIG_NET_SCH_SFB is not set +CONFIG_NET_SCH_SFQ=m +CONFIG_NET_SCH_ESFQ=m +CONFIG_NET_SCH_ESFQ_NFCT=y +CONFIG_NET_SCH_TEQL=m +CONFIG_NET_SCH_TBF=m +CONFIG_NET_SCH_GRED=m +CONFIG_NET_SCH_DSMARK=m +CONFIG_NET_SCH_NETEM=m +# CONFIG_NET_SCH_DRR is not set +# CONFIG_NET_SCH_MQPRIO is not set +# CONFIG_NET_SCH_CHOKE is not set +# CONFIG_NET_SCH_QFQ is not set +CONFIG_NET_SCH_CODEL=m +CONFIG_NET_SCH_FQ_CODEL=y +CONFIG_NET_SCH_INGRESS=m +# CONFIG_NET_SCH_PLUG is not set + +# +# Classification +# +CONFIG_NET_CLS=y +CONFIG_NET_CLS_BASIC=m +CONFIG_NET_CLS_TCINDEX=m +CONFIG_NET_CLS_ROUTE4=m +CONFIG_NET_CLS_FW=m +CONFIG_NET_CLS_U32=m +# 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 +CONFIG_NET_CLS_FLOW=m +CONFIG_NET_EMATCH=y +CONFIG_NET_EMATCH_STACK=32 +CONFIG_NET_EMATCH_CMP=m +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 +CONFIG_NET_ACT_MIRRED=m +CONFIG_NET_ACT_IPT=m +# CONFIG_NET_ACT_NAT is not set +# CONFIG_NET_ACT_PEDIT is not set +# CONFIG_NET_ACT_SIMP is not set +CONFIG_NET_ACT_SKBEDIT=m +# CONFIG_NET_ACT_CSUM is not set +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 + +# +# Network testing +# +CONFIG_NET_PKTGEN=m +# CONFIG_HAMRADIO 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_HAVE_CAN_FLEXCAN=y +# CONFIG_CAN_FLEXCAN is not set +# CONFIG_PCH_CAN is not set +# CONFIG_CAN_GRCAN is not set +# CONFIG_CAN_MSCAN 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 +CONFIG_BT_RFCOMM_TTY=y +CONFIG_BT_BNEP=m +CONFIG_BT_BNEP_MC_FILTER=y +CONFIG_BT_BNEP_PROTO_FILTER=y +# CONFIG_BT_CMTP is not set +CONFIG_BT_HIDP=m + +# +# Bluetooth device drivers +# +CONFIG_BT_HCIBTUSB=m +# CONFIG_BT_HCIBTSDIO is not set +CONFIG_BT_HCIUART=m +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=m +# CONFIG_AF_RXRPC_DEBUG is not set +CONFIG_RXKAD=m +CONFIG_FIB_RULES=y +CONFIG_WIRELESS=y +CONFIG_WIRELESS_EXT=y +CONFIG_WEXT_CORE=y +CONFIG_WEXT_PROC=y +CONFIG_WEXT_SPY=y +CONFIG_WEXT_PRIV=y +# CONFIG_CFG80211 is not set +CONFIG_LIB80211=m +CONFIG_LIB80211_CRYPT_WEP=m +CONFIG_LIB80211_CRYPT_CCMP=m +CONFIG_LIB80211_CRYPT_TKIP=m +# CONFIG_LIB80211_DEBUG is not set + +# +# CFG80211 needs to be enabled for MAC80211 +# +# CONFIG_WIMAX is not set +# CONFIG_RFKILL is not set +# CONFIG_NET_9P is not set +# CONFIG_CAIF is not set +# CONFIG_CEPH_LIB is not set +# CONFIG_NFC is not set + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" +# CONFIG_DEVTMPFS is not set +CONFIG_STANDALONE=y +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=m +CONFIG_REGMAP_I2C=m +CONFIG_REGMAP_SPI=m +CONFIG_DMA_SHARED_BUFFER=y + +# +# Bus devices +# +# CONFIG_CONNECTOR is not set +CONFIG_MTD=y + +# +# 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_OF_PARTS=y +# CONFIG_MTD_AR7_PARTS is not set + +# +# User Modules And Translation Layers +# +CONFIG_MTD_BLKDEVS=y +CONFIG_MTD_BLOCK=y +# CONFIG_FTL is not set +# CONFIG_NFTL is not set +# CONFIG_INFTL is not set +# CONFIG_RFD_FTL is not set +# CONFIG_SSFDC is not set +# CONFIG_SM_FTL is not set +# CONFIG_MTD_OOPS is not set +# CONFIG_MTD_SWAP is not set + +# +# RAM/ROM/Flash chip drivers +# +# CONFIG_MTD_CFI is not set +# CONFIG_MTD_JEDECPROBE is not set +CONFIG_MTD_MAP_BANK_WIDTH_1=y +CONFIG_MTD_MAP_BANK_WIDTH_2=y +CONFIG_MTD_MAP_BANK_WIDTH_4=y +# 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_I4 is not set +# CONFIG_MTD_CFI_I8 is not set +# CONFIG_MTD_RAM is not set +# CONFIG_MTD_ROM is not set +# CONFIG_MTD_ABSENT is not set + +# +# Mapping drivers for chip access +# +CONFIG_MTD_COMPLEX_MAPPINGS=y +# CONFIG_MTD_PCI is not set +# CONFIG_MTD_GPIO_ADDR is not set +# CONFIG_MTD_INTEL_VR_NOR is not set +# CONFIG_MTD_PLATRAM is not set +# CONFIG_MTD_LATCH_ADDR is not set + +# +# Self-contained MTD device drivers +# +# CONFIG_MTD_PMC551 is not set +# CONFIG_MTD_DATAFLASH is not set +CONFIG_MTD_M25P80=y +CONFIG_M25PXX_USE_FAST_READ=y +# CONFIG_M25PXX_PREFER_SMALL_SECTOR_ERASE is not set +# CONFIG_MTD_SST25L is not set +# CONFIG_MTD_SLRAM is not set +# CONFIG_MTD_PHRAM is not set +# CONFIG_MTD_MTDRAM is not set +CONFIG_MTD_BLOCK2MTD=m + +# +# Disk-On-Chip Device Drivers +# +# 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_ECC_BCH is not set +# CONFIG_MTD_SM_COMMON 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_FSL_ELBC is not set +# CONFIG_MTD_NAND_FSL_IFC is not set +# CONFIG_MTD_NAND_FSL_UPM is not set +# CONFIG_MTD_ONENAND is not set + +# +# LPDDR flash memory drivers +# +# CONFIG_MTD_LPDDR is not set +# CONFIG_MTD_UBI is not set +CONFIG_DTC=y +CONFIG_OF=y + +# +# Device Tree and Open Firmware support +# +CONFIG_PROC_DEVICETREE=y +# CONFIG_OF_SELFTEST is not set +CONFIG_OF_FLATTREE=y +CONFIG_OF_EARLY_FLATTREE=y +CONFIG_OF_ADDRESS=y +CONFIG_OF_IRQ=y +CONFIG_OF_DEVICE=y +CONFIG_OF_I2C=m +CONFIG_OF_NET=y +CONFIG_OF_MDIO=y +CONFIG_OF_PCI=y +CONFIG_OF_PCI_IRQ=y +CONFIG_OF_MTD=y +# CONFIG_PARPORT is not set +CONFIG_BLK_DEV=y +# CONFIG_BLK_DEV_FD 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 +# CONFIG_BLK_DEV_DAC960 is not set +# CONFIG_BLK_DEV_UMEM is not set +# CONFIG_BLK_DEV_COW_COMMON is not set +CONFIG_BLK_DEV_LOOP=m +CONFIG_BLK_DEV_LOOP_MIN_COUNT=8 +# CONFIG_BLK_DEV_CRYPTOLOOP is not set +# 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_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_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 +# CONFIG_ISL29003 is not set +# CONFIG_ISL29020 is not set +# CONFIG_SENSORS_TSL2550 is not set +# CONFIG_SENSORS_BH1780 is not set +# CONFIG_SENSORS_BH1770 is not set +# CONFIG_SENSORS_APDS990X is not set +# CONFIG_HMC6352 is not set +# CONFIG_DS1682 is not set +# CONFIG_TI_DAC7512 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 + +# +# EEPROM support +# +CONFIG_EEPROM_AT24=m +CONFIG_EEPROM_AT25=m +# CONFIG_EEPROM_LEGACY is not set +# CONFIG_EEPROM_MAX6875 is not set +CONFIG_EEPROM_93CX6=m +# CONFIG_EEPROM_93XX46 is not set +# CONFIG_CB710_CORE is not set + +# +# Texas Instruments shared transport line discipline +# +# CONFIG_TI_ST is not set +# CONFIG_SENSORS_LIS3_SPI is not set +# CONFIG_SENSORS_LIS3_I2C is not set + +# +# Altera FPGA firmware download module +# +# CONFIG_ALTERA_STAPL is not set +CONFIG_HAVE_IDE=y +CONFIG_IDE=m + +# +# Please see Documentation/ide/ide.txt for help/info on IDE drives +# +CONFIG_IDE_XFER_MODE=y +# CONFIG_BLK_DEV_IDE_SATA is not set +CONFIG_IDE_GD=m +CONFIG_IDE_GD_ATA=y +# CONFIG_IDE_GD_ATAPI is not set +# CONFIG_BLK_DEV_IDECD is not set +# CONFIG_BLK_DEV_IDETAPE is not set +# CONFIG_IDE_TASK_IOCTL is not set +# CONFIG_IDE_PROC_FS is not set + +# +# IDE chipset support/bugfixes +# +# CONFIG_BLK_DEV_PLATFORM is not set +CONFIG_BLK_DEV_IDEDMA_SFF=y + +# +# PCI IDE chipsets support +# +CONFIG_BLK_DEV_IDEPCI=y +# CONFIG_BLK_DEV_OFFBOARD is not set +CONFIG_BLK_DEV_GENERIC=m +# CONFIG_BLK_DEV_OPTI621 is not set +CONFIG_BLK_DEV_IDEDMA_PCI=y +CONFIG_BLK_DEV_AEC62XX=m +# CONFIG_BLK_DEV_ALI15X3 is not set +# CONFIG_BLK_DEV_AMD74XX is not set +# CONFIG_BLK_DEV_CMD64X is not set +# CONFIG_BLK_DEV_TRIFLEX is not set +# CONFIG_BLK_DEV_CS5520 is not set +# CONFIG_BLK_DEV_CS5530 is not set +# CONFIG_BLK_DEV_HPT366 is not set +# CONFIG_BLK_DEV_JMICRON is not set +# CONFIG_BLK_DEV_SC1200 is not set +# CONFIG_BLK_DEV_PIIX is not set +# CONFIG_BLK_DEV_IT8172 is not set +# CONFIG_BLK_DEV_IT8213 is not set +CONFIG_BLK_DEV_IT821X=m +# CONFIG_BLK_DEV_NS87415 is not set +CONFIG_BLK_DEV_PDC202XX_OLD=m +# CONFIG_BLK_DEV_PDC202XX_NEW is not set +# CONFIG_BLK_DEV_SVWKS is not set +# CONFIG_BLK_DEV_SIIMAGE is not set +# CONFIG_BLK_DEV_SL82C105 is not set +# CONFIG_BLK_DEV_SLC90E66 is not set +# CONFIG_BLK_DEV_TRM290 is not set +# CONFIG_BLK_DEV_VIA82CXXX is not set +# CONFIG_BLK_DEV_TC86C001 is not set +CONFIG_BLK_DEV_IDEDMA=y + +# +# SCSI device support +# +CONFIG_SCSI_MOD=m +# CONFIG_RAID_ATTRS is not set +CONFIG_SCSI=m +CONFIG_SCSI_DMA=y +# CONFIG_SCSI_TGT is not set +# CONFIG_SCSI_NETLINK is not set +CONFIG_SCSI_PROC_FS=y + +# +# SCSI support type (disk, tape, CD-ROM) +# +CONFIG_BLK_DEV_SD=m +# CONFIG_CHR_DEV_ST is not set +# CONFIG_CHR_DEV_OSST is not set +CONFIG_BLK_DEV_SR=m +# CONFIG_BLK_DEV_SR_VENDOR is not set +CONFIG_CHR_DEV_SG=m +# CONFIG_CHR_DEV_SCH is not set +CONFIG_SCSI_MULTI_LUN=y +# CONFIG_SCSI_CONSTANTS is not set +# CONFIG_SCSI_LOGGING is not set +# CONFIG_SCSI_SCAN_ASYNC is not set + +# +# SCSI Transports +# +# 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 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 +# CONFIG_ISCSI_BOOT_SYSFS is not set +# CONFIG_SCSI_CXGB3_ISCSI is not set +# CONFIG_SCSI_CXGB4_ISCSI is not set +# CONFIG_SCSI_BNX2_ISCSI is not set +# CONFIG_SCSI_BNX2X_FCOE is not set +# CONFIG_BE2ISCSI is not set +# CONFIG_BLK_DEV_3W_XXXX_RAID is not set +# CONFIG_SCSI_HPSA is not set +# CONFIG_SCSI_3W_9XXX is not set +# CONFIG_SCSI_3W_SAS is not set +# CONFIG_SCSI_ACARD is not set +# CONFIG_SCSI_AACRAID is not set +# CONFIG_SCSI_AIC7XXX is not set +# CONFIG_SCSI_AIC7XXX_OLD is not set +# CONFIG_SCSI_AIC79XX is not set +# CONFIG_SCSI_AIC94XX is not set +# CONFIG_SCSI_MVSAS is not set +# CONFIG_SCSI_MVUMI is not set +# CONFIG_SCSI_DPT_I2O is not set +# CONFIG_SCSI_ADVANSYS is not set +# CONFIG_SCSI_ARCMSR is not set +# CONFIG_MEGARAID_NEWGEN is not set +# 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_LIBFC is not set +# CONFIG_LIBFCOE is not set +# CONFIG_FCOE is not set +# CONFIG_SCSI_DMX3191D is not set +# CONFIG_SCSI_EATA is not set +# CONFIG_SCSI_FUTURE_DOMAIN is not set +# CONFIG_SCSI_GDTH is not set +# CONFIG_SCSI_IPS is not set +# CONFIG_SCSI_INITIO is not set +# CONFIG_SCSI_INIA100 is not set +# CONFIG_SCSI_STEX is not set +# CONFIG_SCSI_SYM53C8XX_2 is not set +# CONFIG_SCSI_IPR is not set +# CONFIG_SCSI_QLOGIC_1280 is not set +# CONFIG_SCSI_QLA_FC is not set +# CONFIG_SCSI_QLA_ISCSI is not set +# CONFIG_SCSI_LPFC is not set +# CONFIG_SCSI_DC395x is not set +# CONFIG_SCSI_DC390T is not set +# CONFIG_SCSI_NSP32 is not set +# CONFIG_SCSI_DEBUG is not set +# CONFIG_SCSI_PMCRAID is not set +# 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 +# CONFIG_ATA_NONSTANDARD is not set +# CONFIG_ATA_VERBOSE_ERROR is not set +# CONFIG_SATA_PMP is not set + +# +# Controllers with non-SFF native interface +# +CONFIG_SATA_AHCI=m +# CONFIG_SATA_AHCI_PLATFORM is not set +# CONFIG_SATA_FSL is not set +# CONFIG_SATA_INIC162X is not set +# CONFIG_SATA_ACARD_AHCI is not set +CONFIG_SATA_SIL24=m +CONFIG_ATA_SFF=y + +# +# SFF controllers with custom DMA interface +# +# CONFIG_PDC_ADMA is not set +# CONFIG_SATA_QSTOR is not set +# CONFIG_SATA_SX4 is not set +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 is not set +# CONFIG_SATA_SVW is not set +# CONFIG_SATA_ULI is not set +CONFIG_SATA_VIA=m +# CONFIG_SATA_VITESSE is not set + +# +# PATA SFF controllers with BMDMA +# +# CONFIG_PATA_ALI is not set +# CONFIG_PATA_AMD is not set +CONFIG_PATA_ARTOP=m +# CONFIG_PATA_ATIIXP is not set +# CONFIG_PATA_ATP867X is not set +# CONFIG_PATA_CMD64X is not set +# CONFIG_PATA_CS5520 is not set +# CONFIG_PATA_CS5530 is not set +# CONFIG_PATA_CS5536 is not set +# CONFIG_PATA_CYPRESS is not set +# CONFIG_PATA_EFAR is not set +# CONFIG_PATA_HPT366 is not set +# CONFIG_PATA_HPT37X is not set +# CONFIG_PATA_HPT3X2N is not set +# CONFIG_PATA_HPT3X3 is not set +# CONFIG_PATA_IT8213 is not set +# CONFIG_PATA_IT821X is not set +# CONFIG_PATA_JMICRON is not set +# CONFIG_PATA_MARVELL is not set +# CONFIG_PATA_NETCELL is not set +# CONFIG_PATA_NINJA32 is not set +# CONFIG_PATA_NS87415 is not set +# CONFIG_PATA_OLDPIIX is not set +# CONFIG_PATA_OPTIDMA is not set +# CONFIG_PATA_PDC2027X is not set +CONFIG_PATA_PDC_OLD=m +# CONFIG_PATA_RADISYS is not set +# CONFIG_PATA_RDC is not set +# CONFIG_PATA_SC1200 is not set +# CONFIG_PATA_SCH is not set +# CONFIG_PATA_SERVERWORKS is not set +# CONFIG_PATA_SIL680 is not set +# CONFIG_PATA_SIS is not set +# CONFIG_PATA_TOSHIBA is not set +# CONFIG_PATA_TRIFLEX is not set +# CONFIG_PATA_VIA is not set +# CONFIG_PATA_WINBOND is not set + +# +# PIO-only SFF controllers +# +# CONFIG_PATA_CMD640_PCI is not set +# CONFIG_PATA_MPIIX is not set +# CONFIG_PATA_NS87410 is not set +# CONFIG_PATA_OPTI is not set +# CONFIG_PATA_PLATFORM is not set +# CONFIG_PATA_RZ1000 is not set + +# +# Generic fallback / legacy drivers +# +# CONFIG_ATA_GENERIC is not set +# CONFIG_PATA_LEGACY is not set +CONFIG_MD=y +CONFIG_BLK_DEV_MD=m +CONFIG_MD_LINEAR=m +CONFIG_MD_RAID0=m +CONFIG_MD_RAID1=m +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 +# CONFIG_DM_ZERO is not set +# CONFIG_DM_MULTIPATH is not set +# 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 + +# +# IEEE 1394 (FireWire) support +# +CONFIG_FIREWIRE=m +CONFIG_FIREWIRE_OHCI=m +CONFIG_FIREWIRE_SBP2=m +CONFIG_FIREWIRE_NET=m +# CONFIG_FIREWIRE_NOSY is not set +# CONFIG_I2O is not set +# CONFIG_MACINTOSH_DRIVERS is not set +CONFIG_NETDEVICES=y +CONFIG_NET_CORE=y +CONFIG_BONDING=m +CONFIG_DUMMY=m +# CONFIG_EQUALIZER is not set +# CONFIG_NET_FC is not set +CONFIG_MII=m +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=m +# CONFIG_ARCNET is not set +CONFIG_ATM_DRIVERS=y +# CONFIG_ATM_DUMMY is not set +CONFIG_ATM_TCP=m +# CONFIG_ATM_LANAI is not set +# CONFIG_ATM_ENI is not set +# CONFIG_ATM_FIRESTREAM is not set +# CONFIG_ATM_ZATM is not set +# CONFIG_ATM_NICSTAR is not set +# CONFIG_ATM_IDT77252 is not set +# CONFIG_ATM_AMBASSADOR is not set +# CONFIG_ATM_HORIZON is not set +# CONFIG_ATM_IA is not set +# CONFIG_ATM_FORE200E is not set +# CONFIG_ATM_HE is not set +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_VORTEX=m +# CONFIG_TYPHOON is not set +CONFIG_NET_VENDOR_ADAPTEC=y +# CONFIG_ADAPTEC_STARFIRE is not set +CONFIG_NET_VENDOR_ALTEON=y +# CONFIG_ACENIC is not set +CONFIG_NET_VENDOR_AMD=y +# CONFIG_AMD8111_ETH is not set +CONFIG_PCNET32=m +CONFIG_NET_VENDOR_ATHEROS=y +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 +CONFIG_B44_PCICORE_AUTOSELECT=y +CONFIG_B44_PCI=y +# CONFIG_BNX2 is not set +# CONFIG_CNIC is not set +CONFIG_TIGON3=m +# CONFIG_BNX2X is not set +CONFIG_NET_VENDOR_BROCADE=y +# CONFIG_BNA is not set +# CONFIG_NET_CALXEDA_XGMAC is not set +CONFIG_NET_VENDOR_CHELSIO=y +# CONFIG_CHELSIO_T1 is not set +# CONFIG_CHELSIO_T3 is not set +# CONFIG_CHELSIO_T4 is not set +# CONFIG_CHELSIO_T4VF is not set +CONFIG_NET_VENDOR_CISCO=y +# CONFIG_ENIC is not set +# CONFIG_DNET is not set +CONFIG_NET_VENDOR_DEC=y +CONFIG_NET_TULIP=y +CONFIG_DE2104X=m +CONFIG_DE2104X_DSL=0 +CONFIG_TULIP=m +CONFIG_TULIP_MWI=y +CONFIG_TULIP_MMIO=y +CONFIG_TULIP_NAPI=y +CONFIG_TULIP_NAPI_HW_MITIGATION=y +# CONFIG_DE4X5 is not set +CONFIG_WINBOND_840=m +CONFIG_DM9102=m +CONFIG_ULI526X=m +CONFIG_NET_VENDOR_DLINK=y +# CONFIG_DL2K is not set +# CONFIG_SUNDANCE is not set +CONFIG_NET_VENDOR_EMULEX=y +# CONFIG_BE2NET is not set +CONFIG_NET_VENDOR_EXAR=y +# CONFIG_S2IO is not set +# CONFIG_VXGE is not set +CONFIG_NET_VENDOR_FREESCALE=y +CONFIG_FSL_PQ_MDIO=y +# CONFIG_FSL_XGMAC_MDIO is not set +CONFIG_UCC_GETH=y +# CONFIG_UGETH_TX_ON_DEMAND is not set +CONFIG_GIANFAR=y +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=m +# CONFIG_IGB_HWMON is not set +# CONFIG_IGBVF is not set +# CONFIG_IXGB is not set +# CONFIG_IXGBE is not set +CONFIG_NET_VENDOR_I825XX=y +# CONFIG_IP1000 is not set +# CONFIG_JME is not set +CONFIG_NET_VENDOR_MARVELL=y +# CONFIG_MV643XX_ETH is not set +# CONFIG_MVMDIO is not set +CONFIG_SKGE=m +# CONFIG_SKGE_DEBUG is not set +# CONFIG_SKGE_GENESIS is not set +CONFIG_SKY2=m +# CONFIG_SKY2_DEBUG is not set +CONFIG_NET_VENDOR_MELLANOX=y +# CONFIG_MLX4_EN is not set +# CONFIG_MLX4_CORE is not set +CONFIG_NET_VENDOR_MICREL=y +# CONFIG_KS8851 is not set +# CONFIG_KS8851_MLL is not set +# CONFIG_KSZ884X_PCI is not set +CONFIG_NET_VENDOR_MICROCHIP=y +# CONFIG_ENC28J60 is not set +CONFIG_NET_VENDOR_MYRI=y +# CONFIG_MYRI10GE is not set +# CONFIG_FEALNX is not set +CONFIG_NET_VENDOR_NATSEMI=y +CONFIG_NATSEMI=m +# CONFIG_NS83820 is not set +CONFIG_NET_VENDOR_8390=y +CONFIG_NE2K_PCI=m +CONFIG_NET_VENDOR_NVIDIA=y +CONFIG_FORCEDETH=m +CONFIG_NET_VENDOR_OKI=y +# CONFIG_PCH_GBE is not set +# CONFIG_ETHOC is not set +# CONFIG_NET_PACKET_ENGINE is not set +CONFIG_NET_VENDOR_QLOGIC=y +# CONFIG_QLA3XXX is not set +# CONFIG_QLCNIC is not set +# CONFIG_QLGE is not set +# CONFIG_NETXEN_NIC is not set +CONFIG_NET_VENDOR_REALTEK=y +CONFIG_8139CP=m +CONFIG_8139TOO=m +CONFIG_8139TOO_PIO=y +# CONFIG_8139TOO_TUNE_TWISTER is not set +# CONFIG_8139TOO_8129 is not set +# CONFIG_8139_OLD_RX_RESET is not set +CONFIG_R8169=m +CONFIG_NET_VENDOR_RDC=y +CONFIG_R6040=m +CONFIG_NET_VENDOR_SEEQ=y +CONFIG_NET_VENDOR_SILAN=y +# CONFIG_SC92031 is not set +CONFIG_NET_VENDOR_SIS=y +CONFIG_SIS900=m +CONFIG_SIS190=m +# CONFIG_SFC is not set +CONFIG_NET_VENDOR_SMSC=y +# CONFIG_EPIC100 is not set +# CONFIG_SMSC9420 is not set +CONFIG_NET_VENDOR_STMICRO=y +# CONFIG_STMMAC_ETH is not set +CONFIG_NET_VENDOR_SUN=y +# CONFIG_HAPPYMEAL is not set +# CONFIG_SUNGEM is not set +# CONFIG_CASSINI is not set +# CONFIG_NIU is not set +CONFIG_NET_VENDOR_TEHUTI=y +# CONFIG_TEHUTI is not set +CONFIG_NET_VENDOR_TI=y +# CONFIG_TLAN is not set +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_XILINX=y +# CONFIG_XILINX_EMACLITE is not set +# CONFIG_XILINX_LL_TEMAC is not set +# CONFIG_FDDI is not set +# CONFIG_HIPPI is not set +CONFIG_PHYLIB=y +CONFIG_MDIO_BOARDINFO=y +CONFIG_SWCONFIG=y +# CONFIG_SWCONFIG_LEDS is not set + +# +# 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 +CONFIG_LXT_PHY=y +# CONFIG_CICADA_PHY is not set +# 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 +# CONFIG_STE10XP is not set +# CONFIG_LSI_ET1011C_PHY is not set +# CONFIG_MICREL_PHY is not set +# CONFIG_ADM6996_PHY is not set +# CONFIG_MVSWITCH_PHY is not set +CONFIG_IP17XX_PHY=m +CONFIG_AR8216_PHY=y +# CONFIG_AR8216_PHY_LEDS is not set +# CONFIG_RTL8306_PHY is not set +# CONFIG_FIXED_PHY is not set +# CONFIG_MDIO_BITBANG is not set +# CONFIG_MDIO_BUS_MUX_GPIO is not set +# CONFIG_MDIO_BUS_MUX_MMIOREG is not set +CONFIG_RTL8366_SMI=m +# CONFIG_RTL8366_SMI_DEBUG_FS is not set +CONFIG_RTL8366S_PHY=m +CONFIG_RTL8366RB_PHY=m +# CONFIG_RTL8367_PHY is not set +# 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 +# CONFIG_PPP_BSDCOMP is not set +# CONFIG_PPP_DEFLATE is not set +CONFIG_PPP_FILTER=y +CONFIG_PPP_MPPE=m +CONFIG_PPP_MULTILINK=y +CONFIG_PPPOATM=m +CONFIG_PPPOE=m +CONFIG_PPTP=m +CONFIG_PPPOL2TP=m +CONFIG_PPP_ASYNC=m +CONFIG_PPP_SYNC_TTY=m +CONFIG_SLIP=m +CONFIG_SLHC=m +CONFIG_SLIP_COMPRESSED=y +CONFIG_SLIP_SMART=y +CONFIG_SLIP_MODE_SLIP6=y + +# +# USB Network Adapters +# +# CONFIG_USB_CATC is not set +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=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=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=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=m +CONFIG_USB_NET_QMI_WWAN=m +# CONFIG_USB_NET_INT51X1 is not set +CONFIG_USB_IPHETH=m +CONFIG_USB_SIERRA_NET=m +# CONFIG_USB_VL600 is not set +CONFIG_WLAN=y +CONFIG_AIRO=m +# CONFIG_ATMEL is not set +CONFIG_PRISM54=m +CONFIG_USB_ZD1201=m +CONFIG_HOSTAP=m +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=m +CONFIG_ISDN=y +CONFIG_ISDN_I4L=m +CONFIG_ISDN_PPP=y +CONFIG_ISDN_PPP_VJ=y +CONFIG_ISDN_MPP=y +CONFIG_IPPP_FILTER=y +CONFIG_ISDN_PPP_BSDCOMP=m +CONFIG_ISDN_AUDIO=y +CONFIG_ISDN_TTY_FAX=y + +# +# ISDN feature submodules +# +# CONFIG_ISDN_DRV_LOOP is not set +CONFIG_ISDN_DIVERSION=m + +# +# ISDN4Linux hardware drivers +# + +# +# Passive cards +# +# CONFIG_ISDN_DRV_HISAX is not set + +# +# Active cards +# +CONFIG_ISDN_CAPI=m +# CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON is not set +# CONFIG_CAPI_TRACE is not set +CONFIG_ISDN_CAPI_MIDDLEWARE=y +CONFIG_ISDN_CAPI_CAPI20=m +# CONFIG_ISDN_CAPI_CAPIDRV is not set + +# +# CAPI hardware drivers +# +# CONFIG_CAPI_AVM is not set +# CONFIG_CAPI_EICON is not set +CONFIG_ISDN_DRV_GIGASET=m +# CONFIG_GIGASET_CAPI is not set +CONFIG_GIGASET_I4L=y +# CONFIG_GIGASET_DUMMYLL is not set +CONFIG_GIGASET_BASE=m +CONFIG_GIGASET_M105=m +CONFIG_GIGASET_M101=m +# CONFIG_GIGASET_DEBUG is not set +# CONFIG_HYSDN is not set +CONFIG_MISDN=m +CONFIG_MISDN_DSP=m +CONFIG_MISDN_L1OIP=m + +# +# mISDN hardware drivers +# +CONFIG_MISDN_HFCPCI=m +CONFIG_MISDN_HFCMULTI=m +# CONFIG_MISDN_HFCUSB is not set +# CONFIG_MISDN_AVMFRITZ is not set +# CONFIG_MISDN_SPEEDFAX is not set +# CONFIG_MISDN_INFINEON is not set +# CONFIG_MISDN_W6692 is not set +# CONFIG_MISDN_NETJET is not set + +# +# Input device support +# +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 +# +# CONFIG_INPUT_MOUSEDEV is not set +CONFIG_INPUT_JOYDEV=m +CONFIG_INPUT_EVDEV=m +# CONFIG_INPUT_EVBUG is not set + +# +# Input Device Drivers +# +CONFIG_INPUT_KEYBOARD=y +# CONFIG_KEYBOARD_ADP5588 is not set +# CONFIG_KEYBOARD_ADP5589 is not set +# CONFIG_KEYBOARD_ATKBD is not set +# CONFIG_KEYBOARD_QT1070 is not set +# CONFIG_KEYBOARD_QT2160 is not set +# CONFIG_KEYBOARD_LKKBD is not set +CONFIG_KEYBOARD_GPIO=m +CONFIG_KEYBOARD_GPIO_POLLED=m +# CONFIG_KEYBOARD_TCA6416 is not set +# 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_STOWAWAY is not set +# CONFIG_KEYBOARD_SUNKBD is not set +# CONFIG_KEYBOARD_XTKBD is not set +# CONFIG_INPUT_MOUSE 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_MMA8450 is not set +# CONFIG_INPUT_MPU3050 is not set +# CONFIG_INPUT_GP2A is not set +# CONFIG_INPUT_GPIO_TILT_POLLED is not set +# CONFIG_INPUT_ATI_REMOTE2 is not set +# CONFIG_INPUT_KEYSPAN_REMOTE is not set +# CONFIG_INPUT_KXTJ9 is not set +# CONFIG_INPUT_POWERMATE is not set +CONFIG_INPUT_YEALINK=m +CONFIG_INPUT_CM109=m +# CONFIG_INPUT_UINPUT is not set +# 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 + +# +# Hardware I/O ports +# +# CONFIG_SERIO is not set +# CONFIG_GAMEPORT is not set + +# +# Character devices +# +CONFIG_TTY=y +# CONFIG_VT is not set +CONFIG_UNIX98_PTYS=y +# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set +CONFIG_LEGACY_PTYS=y +CONFIG_LEGACY_PTY_COUNT=256 +# CONFIG_SERIAL_NONSTANDARD is not set +# CONFIG_NOZOMI is not set +# CONFIG_N_GSM is not set +# CONFIG_TRACE_SINK is not set +# CONFIG_PPC_EPAPR_HV_BYTECHAN is not set +CONFIG_DEVKMEM=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 +CONFIG_SERIAL_8250_EXTENDED=y +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_FSL=y +# CONFIG_SERIAL_8250_DW is not set + +# +# Non-8250 serial port support +# +# CONFIG_SERIAL_MAX3100 is not set +# CONFIG_SERIAL_MAX310X is not set +# CONFIG_SERIAL_MFD_HSU is not set +# CONFIG_SERIAL_UARTLITE is not set +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +# CONFIG_SERIAL_JSM is not set +CONFIG_SERIAL_OF_PLATFORM=y +# CONFIG_SERIAL_QE 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_ARC is not set +# CONFIG_SERIAL_RP2 is not set +# CONFIG_TTY_PRINTK is not set +# CONFIG_HVC_UDBG is not set +# CONFIG_IPMI_HANDLER is not set +CONFIG_HW_RANDOM=y +# CONFIG_HW_RANDOM_TIMERIOMEM is not set +# CONFIG_NVRAM is not set +CONFIG_GEN_RTC=y +# CONFIG_GEN_RTC_X is not set +# CONFIG_R3964 is not set +# CONFIG_APPLICOM is not set +# CONFIG_RAW_DRIVER is not set +# CONFIG_TCG_TPM is not set +CONFIG_DEVPORT=y +CONFIG_I2C=m +CONFIG_I2C_BOARDINFO=y +# CONFIG_I2C_COMPAT is not set +CONFIG_I2C_CHARDEV=m +CONFIG_I2C_MUX=m + +# +# Multiplexer I2C Chip support +# +# CONFIG_I2C_ARB_GPIO_CHALLENGE is not set +CONFIG_I2C_MUX_GPIO=m +CONFIG_I2C_MUX_PCA9541=m +CONFIG_I2C_MUX_PCA954x=m +# CONFIG_I2C_HELPER_AUTO is not set +# CONFIG_I2C_SMBUS is not set + +# +# I2C Algorithms +# +CONFIG_I2C_ALGOBIT=m +CONFIG_I2C_ALGOPCF=m +CONFIG_I2C_ALGOPCA=m + +# +# I2C Hardware Bus support +# + +# +# PC SMBus host controller drivers +# +# CONFIG_I2C_ALI1535 is not set +# CONFIG_I2C_ALI1563 is not set +# CONFIG_I2C_ALI15X3 is not set +# CONFIG_I2C_AMD756 is not set +# CONFIG_I2C_AMD8111 is not set +# CONFIG_I2C_I801 is not set +# CONFIG_I2C_ISCH is not set +# CONFIG_I2C_PIIX4 is not set +# CONFIG_I2C_NFORCE2 is not set +# CONFIG_I2C_SIS5595 is not set +# CONFIG_I2C_SIS630 is not set +# CONFIG_I2C_SIS96X is not set +# CONFIG_I2C_VIA is not set +# CONFIG_I2C_VIAPRO is not set + +# +# I2C system bus drivers (mostly embedded / system-on-chip) +# +# CONFIG_I2C_CBUS_GPIO is not set +# CONFIG_I2C_DESIGNWARE_PCI is not set +# CONFIG_I2C_EG20T is not set +CONFIG_I2C_GPIO=m +# CONFIG_I2C_INTEL_MID is not set +CONFIG_I2C_MPC=m +# 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 + +# +# External I2C/SMBus adapter drivers +# +# CONFIG_I2C_DIOLAN_U2C is not set +# CONFIG_I2C_PARPORT_LIGHT is not set +# CONFIG_I2C_TAOS_EVM is not set +CONFIG_I2C_TINY_USB=m + +# +# Other I2C/SMBus bus drivers +# +# 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 +CONFIG_SPI=y +# CONFIG_SPI_DEBUG is not set +CONFIG_SPI_MASTER=y + +# +# SPI Master Controller Drivers +# +# CONFIG_SPI_ALTERA is not set +CONFIG_SPI_BITBANG=m +CONFIG_SPI_GPIO=m +CONFIG_SPI_GPIO_OLD=m +CONFIG_SPI_FSL_LIB=y +# CONFIG_SPI_FSL_SPI is not set +CONFIG_SPI_FSL_ESPI=y +# CONFIG_SPI_OC_TINY is not set +# 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=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=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 +# + +# +# PTP clock support +# +CONFIG_PTP_1588_CLOCK=m +CONFIG_PTP_1588_CLOCK_GIANFAR=m + +# +# 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_ARCH_REQUIRE_GPIOLIB=y +CONFIG_GPIO_DEVRES=y +CONFIG_GPIOLIB=y +CONFIG_OF_GPIO=y +# CONFIG_DEBUG_GPIO is not set +CONFIG_GPIO_SYSFS=y + +# +# Memory mapped GPIO drivers: +# +# CONFIG_GPIO_GENERIC_PLATFORM is not set +CONFIG_GPIO_MPC8XXX=y +# CONFIG_GPIO_TS5500 is not set +# CONFIG_GPIO_XILINX is not set +# CONFIG_GPIO_VX855 is not set +# CONFIG_GPIO_GRGPIO is not set + +# +# I2C GPIO expanders: +# +# CONFIG_GPIO_MAX7300 is not set +# CONFIG_GPIO_MAX732X is not set +CONFIG_GPIO_PCA953X=m +CONFIG_GPIO_PCF857X=m +# CONFIG_GPIO_ADP5588 is not set +# CONFIG_GPIO_ADNP is not set + +# +# 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 + +# +# SPI GPIO expanders: +# +# CONFIG_GPIO_MAX7301 is not set +CONFIG_GPIO_MCP23S08=m +# CONFIG_GPIO_MC33880 is not set +# CONFIG_GPIO_74X164 is not set + +# +# AC97 GPIO expanders: +# + +# +# MODULbus GPIO expanders: +# + +# +# USB GPIO expanders: +# +CONFIG_W1=m + +# +# 1-wire Bus Masters +# +# CONFIG_W1_MASTER_MATROX is not set +CONFIG_W1_MASTER_DS2490=m +CONFIG_W1_MASTER_DS2482=m +# CONFIG_W1_MASTER_DS1WM is not set +CONFIG_W1_MASTER_GPIO=m + +# +# 1-wire Slaves +# +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 + +# +# Native drivers +# +# CONFIG_SENSORS_AD7314 is not set +# CONFIG_SENSORS_AD7414 is not set +# CONFIG_SENSORS_AD7418 is not set +# CONFIG_SENSORS_ADCXX is not set +# CONFIG_SENSORS_ADM1021 is not set +# CONFIG_SENSORS_ADM1025 is not set +# CONFIG_SENSORS_ADM1026 is not set +# 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 +CONFIG_SENSORS_ADT7475=m +# CONFIG_SENSORS_ASC7621 is not set +# CONFIG_SENSORS_ATXP1 is not set +# CONFIG_SENSORS_DS620 is not set +# CONFIG_SENSORS_DS1621 is not set +# CONFIG_SENSORS_I5K_AMB is not set +# CONFIG_SENSORS_F75375S is not set +# CONFIG_SENSORS_G760A is not set +# CONFIG_SENSORS_GL518SM is not set +# CONFIG_SENSORS_GL520SM 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_JC42 is not set +# CONFIG_SENSORS_LINEAGE is not set +CONFIG_SENSORS_LM63=m +# CONFIG_SENSORS_LM70 is not set +# CONFIG_SENSORS_LM73 is not set +CONFIG_SENSORS_LM75=m +CONFIG_SENSORS_LM77=m +# CONFIG_SENSORS_LM78 is not set +# CONFIG_SENSORS_LM80 is not set +# CONFIG_SENSORS_LM83 is not set +CONFIG_SENSORS_LM85=m +# CONFIG_SENSORS_LM87 is not set +CONFIG_SENSORS_LM90=m +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_NTC_THERMISTOR is not set +# CONFIG_SENSORS_PCF8591 is not set +# CONFIG_PMBUS is not set +# CONFIG_SENSORS_SHT15 is not set +CONFIG_SENSORS_SHT21=m +# CONFIG_SENSORS_SIS5595 is not set +# CONFIG_SENSORS_SMM665 is not set +# CONFIG_SENSORS_EMC1403 is not set +# CONFIG_SENSORS_EMC2103 is not set +# CONFIG_SENSORS_EMC6W201 is not set +# CONFIG_SENSORS_SMSC47M192 is not set +# CONFIG_SENSORS_SCH56XX_COMMON is not set +# CONFIG_SENSORS_ADS1015 is not set +# 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=m +# CONFIG_SENSORS_VIA686A is not set +# CONFIG_SENSORS_VT8231 is not set +# CONFIG_SENSORS_W83781D is not set +# CONFIG_SENSORS_W83791D is not set +# CONFIG_SENSORS_W83792D is not set +# CONFIG_SENSORS_W83793 is not set +# CONFIG_SENSORS_W83795 is not set +# CONFIG_SENSORS_W83L785TS is not set +# CONFIG_SENSORS_W83L786NG is not set +# CONFIG_THERMAL is not set +CONFIG_WATCHDOG=y +CONFIG_WATCHDOG_CORE=y +# CONFIG_WATCHDOG_NOWAYOUT is not set + +# +# Watchdog Device Drivers +# +CONFIG_SOFT_WATCHDOG=m +# CONFIG_ALIM7101_WDT is not set +# CONFIG_I6300ESB_WDT is not set +# CONFIG_GPIO_WDT is not set +CONFIG_BOOKE_WDT=m +CONFIG_BOOKE_WDT_DEFAULT_TIMEOUT=3 + +# +# PCI-based Watchdog Cards +# +# CONFIG_PCIPCWATCHDOG is not set +# CONFIG_WDTPCI is not set + +# +# USB-based Watchdog Cards +# +# CONFIG_USBPCWATCHDOG is not set +CONFIG_SSB_POSSIBLE=y + +# +# Sonics Silicon Backplane +# +CONFIG_SSB=m +CONFIG_SSB_SPROM=y +CONFIG_SSB_BLOCKIO=y +CONFIG_SSB_PCIHOST_POSSIBLE=y +CONFIG_SSB_PCIHOST=y +CONFIG_SSB_B43_PCI_BRIDGE=y +CONFIG_SSB_SDIOHOST_POSSIBLE=y +# CONFIG_SSB_SDIOHOST is not set +CONFIG_SSB_SILENT=y +CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y +CONFIG_SSB_DRIVER_PCICORE=y +# CONFIG_SSB_DRIVER_GPIO is not set +CONFIG_BCMA_POSSIBLE=y + +# +# Broadcom specific AMBA +# +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_DRIVER_GPIO is not set +# CONFIG_BCMA_DEBUG is not set + +# +# Multifunction device drivers +# +# CONFIG_MFD_CORE is not set +# CONFIG_MFD_CROS_EC is not set +# CONFIG_MFD_DA9052_SPI 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_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_SI476X_CORE is not set +# CONFIG_MFD_SM501 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_TPS6105X is not set +# CONFIG_TPS65010 is not set +# CONFIG_TPS6507X is not set +# CONFIG_MFD_TPS65217 is not set +# CONFIG_MFD_TPS65912 is not set +# CONFIG_MFD_TPS65912_SPI is not set +# CONFIG_MFD_WL1273_CORE is not set +# CONFIG_MFD_LM3533 is not set +# CONFIG_MFD_TIMBERDALE 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_WM831X_SPI 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=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_V4L2_INT_DEVICE is not set +# CONFIG_TTPCI_EEPROM is not set + +# +# Media drivers +# +CONFIG_MEDIA_USB_SUPPORT=y + +# +# Webcam devices +# +CONFIG_USB_VIDEO_CLASS=m +CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y +CONFIG_USB_GSPCA=m +CONFIG_USB_M5602=m +CONFIG_USB_STV06XX=m +CONFIG_USB_GL860=m +# CONFIG_USB_GSPCA_BENQ is not set +CONFIG_USB_GSPCA_CONEX=m +# CONFIG_USB_GSPCA_CPIA1 is not set +CONFIG_USB_GSPCA_ETOMS=m +CONFIG_USB_GSPCA_FINEPIX=m +CONFIG_USB_GSPCA_JEILINJ=m +# CONFIG_USB_GSPCA_JL2005BCD is not set +# CONFIG_USB_GSPCA_KINECT is not set +CONFIG_USB_GSPCA_KONICA=m +CONFIG_USB_GSPCA_MARS=m +CONFIG_USB_GSPCA_MR97310A=m +# CONFIG_USB_GSPCA_NW80X is not set +CONFIG_USB_GSPCA_OV519=m +CONFIG_USB_GSPCA_OV534=m +CONFIG_USB_GSPCA_OV534_9=m +CONFIG_USB_GSPCA_PAC207=m +# CONFIG_USB_GSPCA_PAC7302 is not set +CONFIG_USB_GSPCA_PAC7311=m +CONFIG_USB_GSPCA_SE401=m +# CONFIG_USB_GSPCA_SN9C2028 is not set +CONFIG_USB_GSPCA_SN9C20X=m +CONFIG_USB_GSPCA_SONIXB=m +CONFIG_USB_GSPCA_SONIXJ=m +CONFIG_USB_GSPCA_SPCA500=m +CONFIG_USB_GSPCA_SPCA501=m +CONFIG_USB_GSPCA_SPCA505=m +CONFIG_USB_GSPCA_SPCA506=m +CONFIG_USB_GSPCA_SPCA508=m +CONFIG_USB_GSPCA_SPCA561=m +# CONFIG_USB_GSPCA_SPCA1528 is not set +CONFIG_USB_GSPCA_SQ905=m +CONFIG_USB_GSPCA_SQ905C=m +# CONFIG_USB_GSPCA_SQ930X is not set +CONFIG_USB_GSPCA_STK014=m +# CONFIG_USB_GSPCA_STV0680 is not set +CONFIG_USB_GSPCA_SUNPLUS=m +CONFIG_USB_GSPCA_T613=m +# CONFIG_USB_GSPCA_TOPRO is not set +CONFIG_USB_GSPCA_TV8532=m +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_USB_PWC=m +# CONFIG_USB_PWC_DEBUG is not set +# CONFIG_USB_PWC_INPUT_EVDEV is not set +CONFIG_VIDEO_CPIA2=m +# CONFIG_USB_ZR364XX is not set +# CONFIG_USB_STKWEBCAM is not set +# CONFIG_USB_S2255 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_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_AGP is not set +# CONFIG_VGA_ARB is not set +# CONFIG_DRM 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 +CONFIG_SOUND_OSS_CORE_PRECLAIM=y +CONFIG_SND=m +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 +CONFIG_SND_OSSEMUL=y +CONFIG_SND_MIXER_OSS=m +CONFIG_SND_PCM_OSS=m +CONFIG_SND_PCM_OSS_PLUGINS=y +CONFIG_SND_SEQUENCER_OSS=y +# CONFIG_SND_HRTIMER is not set +# CONFIG_SND_DYNAMIC_MINORS is not set +# CONFIG_SND_SUPPORT_OLD_API is not set +CONFIG_SND_VERBOSE_PROCFS=y +# CONFIG_SND_VERBOSE_PRINTK is not set +# CONFIG_SND_DEBUG is not set +CONFIG_SND_VMASTER=y +CONFIG_SND_RAWMIDI_SEQ=m +# CONFIG_SND_OPL3_LIB_SEQ is not set +# CONFIG_SND_OPL4_LIB_SEQ is not set +# CONFIG_SND_SBAWE_SEQ is not set +# CONFIG_SND_EMU10K1_SEQ is not set +CONFIG_SND_AC97_CODEC=m +CONFIG_SND_DRIVERS=y +# CONFIG_SND_DUMMY is not set +# CONFIG_SND_ALOOP is not set +CONFIG_SND_VIRMIDI=m +# CONFIG_SND_MTPAV is not set +# CONFIG_SND_SERIAL_U16550 is not set +# CONFIG_SND_MPU401 is not set +# CONFIG_SND_AC97_POWER_SAVE is not set +CONFIG_SND_PCI=y +# CONFIG_SND_AD1889 is not set +# CONFIG_SND_ALS300 is not set +# CONFIG_SND_ALS4000 is not set +# CONFIG_SND_ALI5451 is not set +# CONFIG_SND_ATIIXP is not set +# CONFIG_SND_ATIIXP_MODEM is not set +# CONFIG_SND_AU8810 is not set +# CONFIG_SND_AU8820 is not set +# CONFIG_SND_AU8830 is not set +# CONFIG_SND_AW2 is not set +# CONFIG_SND_AZT3328 is not set +# CONFIG_SND_BT87X is not set +# CONFIG_SND_CA0106 is not set +# CONFIG_SND_CMIPCI is not set +# CONFIG_SND_OXYGEN is not set +# CONFIG_SND_CS4281 is not set +# CONFIG_SND_CS46XX is not set +# CONFIG_SND_CS5530 is not set +CONFIG_SND_CS5535AUDIO=m +# CONFIG_SND_CTXFI is not set +# CONFIG_SND_DARLA20 is not set +# CONFIG_SND_GINA20 is not set +# CONFIG_SND_LAYLA20 is not set +# CONFIG_SND_DARLA24 is not set +# CONFIG_SND_GINA24 is not set +# CONFIG_SND_LAYLA24 is not set +# CONFIG_SND_MONA is not set +# CONFIG_SND_MIA is not set +# CONFIG_SND_ECHO3G is not set +# CONFIG_SND_INDIGO is not set +# CONFIG_SND_INDIGOIO is not set +# CONFIG_SND_INDIGODJ is not set +# CONFIG_SND_INDIGOIOX is not set +# CONFIG_SND_INDIGODJX is not set +# CONFIG_SND_EMU10K1 is not set +# CONFIG_SND_EMU10K1X is not set +# CONFIG_SND_ENS1370 is not set +# CONFIG_SND_ENS1371 is not set +# CONFIG_SND_ES1938 is not set +# CONFIG_SND_ES1968 is not set +# CONFIG_SND_FM801 is not set +# CONFIG_SND_HDA_INTEL is not set +# CONFIG_SND_HDSP is not set +# CONFIG_SND_HDSPM is not set +# CONFIG_SND_ICE1712 is not set +# CONFIG_SND_ICE1724 is not set +CONFIG_SND_INTEL8X0=m +# CONFIG_SND_INTEL8X0M is not set +# CONFIG_SND_KORG1212 is not set +# CONFIG_SND_LOLA is not set +# CONFIG_SND_LX6464ES is not set +# CONFIG_SND_MAESTRO3 is not set +# CONFIG_SND_MIXART is not set +# CONFIG_SND_NM256 is not set +# CONFIG_SND_PCXHR is not set +# CONFIG_SND_RIPTIDE is not set +# CONFIG_SND_RME32 is not set +# CONFIG_SND_RME96 is not set +# CONFIG_SND_RME9652 is not set +# CONFIG_SND_SONICVIBES is not set +# CONFIG_SND_TRIDENT is not set +# CONFIG_SND_VIA82XX is not set +# CONFIG_SND_VIA82XX_MODEM is not set +# CONFIG_SND_VIRTUOSO is not set +# CONFIG_SND_VX222 is not set +# CONFIG_SND_YMFPCI is not set +# CONFIG_SND_PPC is not set +# CONFIG_SND_SPI is not set +CONFIG_SND_USB=y +CONFIG_SND_USB_AUDIO=m +# CONFIG_SND_USB_UA101 is not set +# CONFIG_SND_USB_USX2Y is not set +# CONFIG_SND_USB_CAIAQ is not set +# 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_POWERPC_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 + +# +# HID support +# +CONFIG_HID=m +CONFIG_HIDRAW=y +# CONFIG_UHID is not set +CONFIG_HID_GENERIC=m + +# +# Special HID drivers +# +# 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 +# CONFIG_HID_PRODIKEYS is not set +# CONFIG_HID_CYPRESS is not set +# CONFIG_HID_DRAGONRISE is not set +# CONFIG_HID_EMS_FF is not set +# CONFIG_HID_ELECOM is not set +# CONFIG_HID_EZKEY is not set +# CONFIG_HID_HOLTEK is not set +# CONFIG_HID_KEYTOUCH is not set +# CONFIG_HID_KYE is not set +# 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 +# CONFIG_HID_MONTEREY is not set +# CONFIG_HID_MULTITOUCH is not set +# CONFIG_HID_NTRIG is not set +# CONFIG_HID_ORTEK is not set +# CONFIG_HID_PANTHERLORD is not set +# 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_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 + +# +# Miscellaneous USB options +# +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=m +# CONFIG_USB_WUSB_CBAF is not set + +# +# USB Host Controller Drivers +# +# CONFIG_USB_C67X00_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_FSL_MPH_DR_OF=m +CONFIG_USB_EHCI_PCI=m +# CONFIG_XPS_USB_HCD_XILINX is not set +CONFIG_USB_EHCI_FSL=y +# CONFIG_USB_EHCI_HCD_PPC_OF is not set +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 +# CONFIG_USB_ISP1362_HCD is not set +CONFIG_USB_OHCI_HCD=m +# CONFIG_USB_OHCI_HCD_PPC_OF_BE is not set +# CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set +# CONFIG_USB_OHCI_HCD_PPC_OF is not set +# CONFIG_USB_OHCI_HCD_SSB is not set +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=m +# CONFIG_USB_FHCI_HCD is not set +# 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=m +# CONFIG_USB_TMC is not set + +# +# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may +# + +# +# also be needed; see USB_STORAGE Help for more info +# +CONFIG_USB_STORAGE=m +# CONFIG_USB_STORAGE_DEBUG is not set +# CONFIG_USB_STORAGE_REALTEK is not set +CONFIG_USB_STORAGE_DATAFAB=m +CONFIG_USB_STORAGE_FREECOM=m +CONFIG_USB_STORAGE_ISD200=m +CONFIG_USB_STORAGE_USBAT=m +CONFIG_USB_STORAGE_SDDR09=m +CONFIG_USB_STORAGE_SDDR55=m +CONFIG_USB_STORAGE_JUMPSHOT=m +CONFIG_USB_STORAGE_ALAUDA=m +# CONFIG_USB_STORAGE_ONETOUCH is not set +CONFIG_USB_STORAGE_KARMA=m +CONFIG_USB_STORAGE_CYPRESS_ATACB=m +# CONFIG_USB_STORAGE_ENE_UB6250 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_SERIAL_GENERIC=y +# CONFIG_USB_SERIAL_AIRCABLE is not set +CONFIG_USB_SERIAL_ARK3116=m +CONFIG_USB_SERIAL_BELKIN=m +CONFIG_USB_SERIAL_CH341=m +# CONFIG_USB_SERIAL_WHITEHEAT is not set +# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set +CONFIG_USB_SERIAL_CP210X=m +CONFIG_USB_SERIAL_CYPRESS_M8=m +# CONFIG_USB_SERIAL_EMPEG is not set +CONFIG_USB_SERIAL_FTDI_SIO=m +# CONFIG_USB_SERIAL_FUNSOFT is not set +CONFIG_USB_SERIAL_VISOR=m +# CONFIG_USB_SERIAL_IPAQ is not set +# 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 +# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set +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 +# CONFIG_USB_SERIAL_NAVMAN is not set +CONFIG_USB_SERIAL_PL2303=m +CONFIG_USB_SERIAL_OTI6858=m +# CONFIG_USB_SERIAL_QCAUX is not set +CONFIG_USB_SERIAL_QUALCOMM=m +# CONFIG_USB_SERIAL_SPCP8X5 is not set +# CONFIG_USB_SERIAL_HP4X is not set +# CONFIG_USB_SERIAL_SAFE is not set +# CONFIG_USB_SERIAL_SIEMENS_MPI is not set +CONFIG_USB_SERIAL_SIERRAWIRELESS=m +# CONFIG_USB_SERIAL_SYMBOL is not set +CONFIG_USB_SERIAL_TI=m +# CONFIG_USB_SERIAL_CYBERJACK is not set +# CONFIG_USB_SERIAL_XIRCOM is not set +CONFIG_USB_SERIAL_WWAN=m +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 + +# +# USB Miscellaneous drivers +# +# CONFIG_USB_EMI62 is not set +# CONFIG_USB_EMI26 is not set +# CONFIG_USB_ADUTUX is not set +# CONFIG_USB_SEVSEG is not set +# CONFIG_USB_RIO500 is not set +# CONFIG_USB_LEGOTOWER is not set +# CONFIG_USB_LCD is not set +# CONFIG_USB_LED is not set +# CONFIG_USB_CYPRESS_CY7C63 is not set +# CONFIG_USB_CYTHERM is not set +# CONFIG_USB_IDMOUSE is not set +# CONFIG_USB_FTDI_ELAN is not set +# CONFIG_USB_APPLEDISPLAY is not set +# CONFIG_USB_SISUSBVGA is not set +# CONFIG_USB_LD is not set +# CONFIG_USB_TRANCEVIBRATOR is not set +# CONFIG_USB_IOWARRIOR is not set +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 +# CONFIG_UWB is not set +CONFIG_MMC=m +# CONFIG_MMC_DEBUG is not set +# CONFIG_MMC_UNSAFE_RESUME is not set +# CONFIG_MMC_CLKGATE is not set + +# +# MMC/SD/SDIO Card Drivers +# +CONFIG_MMC_BLOCK=m +CONFIG_MMC_BLOCK_MINORS=8 +CONFIG_MMC_BLOCK_BOUNCE=y +# CONFIG_SDIO_UART is not set +# CONFIG_MMC_TEST is not set + +# +# MMC/SD/SDIO Host Controller Drivers +# +CONFIG_MMC_SDHCI=m +# CONFIG_MMC_SDHCI_PCI is not set +CONFIG_MMC_SDHCI_PLTFM=m +# CONFIG_MMC_SDHCI_OF_ESDHC is not set +# CONFIG_MMC_SDHCI_OF_HLWD is not set +# CONFIG_MMC_WBSD is not set +# CONFIG_MMC_TIFM_SD is not set +CONFIG_MMC_SPI=m +CONFIG_GPIOMMC=m +CONFIG_GPIOMMC_CONFIGFS=y +# CONFIG_MMC_CB710 is not set +# CONFIG_MMC_VIA_SDMMC is not set +# CONFIG_MMC_VUB300 is not set +# CONFIG_MMC_USHC is not set +# CONFIG_MEMSTICK is not set +CONFIG_NEW_LEDS=y +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_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_TCA6507 is not set +# CONFIG_LEDS_LM355x is not set +# CONFIG_LEDS_OT200 is not set +# 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_GPIO=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=y +CONFIG_LEDS_TRIGGER_USBDEV=m +# CONFIG_ACCESSIBILITY is not set +# CONFIG_INFINIBAND is not set +# CONFIG_EDAC is not set +# CONFIG_RTC_CLASS 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_MMIO is not set + +# +# Microsoft Hyper-V guest support +# +CONFIG_STAGING=y +CONFIG_ET131X=m +CONFIG_USBIP_CORE=m +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_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_VT6655 is not set +# CONFIG_VT6656 is not set +# CONFIG_DX_SEP 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 +# CONFIG_FT1000 is not set + +# +# Speakup console speech +# +# CONFIG_TOUCHSCREEN_CLEARPAD_TM1217 is not set +# CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4 is not set +# CONFIG_STAGING_MEDIA is not set + +# +# 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 + +# +# 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_EXYNOS_ADC 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_IRQCHIP=y +# CONFIG_IPACK_BUS is not set +# CONFIG_RESET_CONTROLLER is not set + +# +# File systems +# +# CONFIG_EXT2_FS is not set +# CONFIG_EXT3_FS is not set +CONFIG_EXT4_FS=m +CONFIG_EXT4_USE_FOR_EXT23=y +# CONFIG_EXT4_FS_POSIX_ACL is not set +# CONFIG_EXT4_FS_SECURITY is not set +# CONFIG_EXT4_DEBUG is not set +CONFIG_JBD2=m +# CONFIG_JBD2_DEBUG is not set +CONFIG_FS_MBCACHE=m +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=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 +# CONFIG_FANOTIFY is not set +# CONFIG_QUOTA is not set +# CONFIG_QUOTACTL is not set +CONFIG_AUTOFS4_FS=m +CONFIG_FUSE_FS=m +# CONFIG_CUSE is not set +CONFIG_OVERLAYFS_FS=y + +# +# Caches +# +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 is not set +CONFIG_UDF_FS=m +CONFIG_UDF_NLS=y + +# +# DOS/FAT/NT Filesystems +# +CONFIG_FAT_FS=m +CONFIG_MSDOS_FS=m +CONFIG_VFAT_FS=m +CONFIG_FAT_DEFAULT_CODEPAGE=437 +CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" +CONFIG_NTFS_FS=m +# CONFIG_NTFS_DEBUG is not set +# CONFIG_NTFS_RW is not set + +# +# Pseudo filesystems +# +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=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 +# CONFIG_BFS_FS is not set +# CONFIG_EFS_FS is not set +CONFIG_JFFS2_FS=y +CONFIG_JFFS2_FS_DEBUG=0 +CONFIG_JFFS2_FS_WRITEBUFFER=y +# CONFIG_JFFS2_FS_WBUF_VERIFY is not set +CONFIG_JFFS2_SUMMARY=y +CONFIG_JFFS2_FS_XATTR=y +# CONFIG_JFFS2_FS_POSIX_ACL is not set +# CONFIG_JFFS2_FS_SECURITY is not set +CONFIG_JFFS2_COMPRESSION_OPTIONS=y +# CONFIG_JFFS2_ZLIB is not set +# CONFIG_JFFS2_LZO is not set +CONFIG_JFFS2_LZMA=y +CONFIG_JFFS2_RTIME=y +# CONFIG_JFFS2_RUBIN is not set +# CONFIG_JFFS2_CMODE_NONE is not set +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=m +CONFIG_SQUASHFS=y +# CONFIG_SQUASHFS_XATTR is not set +# CONFIG_SQUASHFS_ZLIB is not set +# CONFIG_SQUASHFS_LZO is not set +CONFIG_SQUASHFS_XZ=y +# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set +# CONFIG_SQUASHFS_EMBEDDED is not set +CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 +# CONFIG_VXFS_FS is not set +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_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 +# CONFIG_NFSD_V4 is not set +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_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=m +# CONFIG_AFS_DEBUG is not set +CONFIG_AFS_FSCACHE=y +CONFIG_NLS=m +CONFIG_NLS_DEFAULT="iso8859-1" +CONFIG_NLS_CODEPAGE_437=m +# CONFIG_NLS_CODEPAGE_737 is not set +CONFIG_NLS_CODEPAGE_775=m +CONFIG_NLS_CODEPAGE_850=m +CONFIG_NLS_CODEPAGE_852=m +# CONFIG_NLS_CODEPAGE_855 is not set +# 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=m +# CONFIG_NLS_CODEPAGE_863 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=m +# CONFIG_NLS_CODEPAGE_949 is not set +# CONFIG_NLS_CODEPAGE_874 is not set +CONFIG_NLS_ISO8859_8=m +CONFIG_NLS_CODEPAGE_1250=m +CONFIG_NLS_CODEPAGE_1251=m +# CONFIG_NLS_ASCII is not set +CONFIG_NLS_ISO8859_1=m +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=m +# CONFIG_NLS_ISO8859_7 is not set +# CONFIG_NLS_ISO8859_9 is not set +CONFIG_NLS_ISO8859_13=m +# CONFIG_NLS_ISO8859_14 is not set +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 +CONFIG_UCC_FAST=y +CONFIG_UCC=y +# CONFIG_BINARY_PRINTF is not set + +# +# Library routines +# +CONFIG_RAID6_PQ=m +CONFIG_BITREVERSE=y +CONFIG_GENERIC_STRNCPY_FROM_USER=y +CONFIG_GENERIC_STRNLEN_USER=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=m +CONFIG_LZO_DECOMPRESS=m +CONFIG_XZ_DEC=y +# CONFIG_XZ_DEC_X86 is not set +CONFIG_XZ_DEC_POWERPC=y +# 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=y +# CONFIG_XZ_DEC_TEST is not set +CONFIG_LZMA_COMPRESS=y +CONFIG_LZMA_DECOMPRESS=y +CONFIG_TEXTSEARCH=y +CONFIG_TEXTSEARCH_KMP=m +CONFIG_TEXTSEARCH_BM=m +CONFIG_TEXTSEARCH_FSM=m +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT=y +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 + +# +# Kernel hacking +# +CONFIG_PRINTK_TIME=y +CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4 +CONFIG_ENABLE_WARN_DEPRECATED=y +CONFIG_ENABLE_MUST_CHECK=y +CONFIG_FRAME_WARN=1024 +CONFIG_MAGIC_SYSRQ=y +# CONFIG_STRIP_ASM_SYMS is not set +# CONFIG_READABLE_ASM is not set +# CONFIG_UNUSED_SYMBOLS is not set +CONFIG_DEBUG_FS=y +# CONFIG_HEADERS_CHECK is not set +# CONFIG_DEBUG_SECTION_MISMATCH is not set +CONFIG_DEBUG_KERNEL=y +# CONFIG_DEBUG_SHIRQ is not set +# CONFIG_LOCKUP_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 +# CONFIG_DEBUG_SPINLOCK is not set +# CONFIG_DEBUG_MUTEXES is not set +# CONFIG_DEBUG_LOCK_ALLOC is not set +# CONFIG_PROVE_LOCKING is not set +# CONFIG_LOCK_STAT is not set +# CONFIG_DEBUG_ATOMIC_SLEEP is not set +# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set +# CONFIG_DEBUG_STACK_USAGE is not set +# CONFIG_DEBUG_KOBJECT is not set +CONFIG_DEBUG_BUGVERBOSE=y +CONFIG_DEBUG_INFO=y +CONFIG_DEBUG_INFO_REDUCED=y +# CONFIG_DEBUG_VM is not set +# CONFIG_DEBUG_WRITECOUNT is not set +# CONFIG_DEBUG_MEMORY_INIT is not set +# CONFIG_DEBUG_LIST is not set +# CONFIG_TEST_LIST_SORT is not set +# CONFIG_DEBUG_SG is not set +# CONFIG_DEBUG_NOTIFIERS is not set +# CONFIG_DEBUG_CREDENTIALS 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_DEBUG_PAGEALLOC is not set +CONFIG_HAVE_FUNCTION_TRACER=y +CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y +CONFIG_HAVE_DYNAMIC_FTRACE=y +CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y +CONFIG_HAVE_SYSCALL_TRACEPOINTS=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 +# CONFIG_ATOMIC64_SELFTEST is not set +# CONFIG_ASYNC_RAID6_TEST is not set +# 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_PPC_DISABLE_WERROR is not set +CONFIG_PPC_WERROR=y +CONFIG_PRINT_STACK_DEPTH=64 +# CONFIG_DEBUG_STACKOVERFLOW is not set +# CONFIG_PPC_EMULATED_STATS is not set +# CONFIG_CODE_PATCHING_SELFTEST is not set +# CONFIG_FTR_FIXUP_SELFTEST is not set +# CONFIG_MSI_BITMAP_SELFTEST is not set +# CONFIG_XMON is not set +# CONFIG_BDI_SWITCH is not set +# CONFIG_PPC_EARLY_DEBUG is not set +# CONFIG_STRICT_DEVMEM is not set + +# +# Security options +# +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 +CONFIG_DEFAULT_SECURITY_DAC=y +CONFIG_DEFAULT_SECURITY="" +CONFIG_XOR_BLOCKS=m +CONFIG_ASYNC_CORE=m +CONFIG_ASYNC_MEMCPY=m +CONFIG_ASYNC_XOR=m +CONFIG_ASYNC_PQ=m +CONFIG_ASYNC_RAID6_RECOV=m +CONFIG_CRYPTO=y + +# +# Crypto core or helper +# +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_RNG is not set +CONFIG_CRYPTO_RNG2=m +CONFIG_CRYPTO_MANAGER=m +CONFIG_CRYPTO_MANAGER2=y +# CONFIG_CRYPTO_USER is not set +CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y +CONFIG_CRYPTO_GF128MUL=m +CONFIG_CRYPTO_NULL=m +CONFIG_CRYPTO_WORKQUEUE=m +# CONFIG_CRYPTO_CRYPTD is not set +CONFIG_CRYPTO_AUTHENC=m +CONFIG_CRYPTO_TEST=m + +# +# Authenticated Encryption with Associated Data +# +# CONFIG_CRYPTO_CCM is not set +# CONFIG_CRYPTO_GCM is not set +# CONFIG_CRYPTO_SEQIV is not set + +# +# Block modes +# +CONFIG_CRYPTO_CBC=m +# CONFIG_CRYPTO_CTR is not set +# CONFIG_CRYPTO_CTS is not set +CONFIG_CRYPTO_ECB=m +# CONFIG_CRYPTO_LRW 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 + +# +# 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 +CONFIG_CRYPTO_MICHAEL_MIC=m +# CONFIG_CRYPTO_RMD128 is not set +# CONFIG_CRYPTO_RMD160 is not set +# CONFIG_CRYPTO_RMD256 is not set +# CONFIG_CRYPTO_RMD320 is not set +CONFIG_CRYPTO_SHA1=m +# CONFIG_CRYPTO_SHA1_PPC is not set +CONFIG_CRYPTO_SHA256=m +CONFIG_CRYPTO_SHA512=m +CONFIG_CRYPTO_TGR192=m +CONFIG_CRYPTO_WP512=m + +# +# Ciphers +# +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 +CONFIG_CRYPTO_FCRYPT=m +CONFIG_CRYPTO_KHAZAD=m +# CONFIG_CRYPTO_SALSA20 is not set +# CONFIG_CRYPTO_SEED is not set +CONFIG_CRYPTO_SERPENT=m +CONFIG_CRYPTO_TEA=m +CONFIG_CRYPTO_TWOFISH=m +CONFIG_CRYPTO_TWOFISH_COMMON=m + +# +# Compression +# +CONFIG_CRYPTO_DEFLATE=m +# CONFIG_CRYPTO_ZLIB is not set +# CONFIG_CRYPTO_LZO is not set +# CONFIG_CRYPTO_XZ is not set + +# +# Random Number Generation +# +# CONFIG_CRYPTO_ANSI_CPRNG is not set +CONFIG_CRYPTO_USER_API=m +CONFIG_CRYPTO_USER_API_HASH=m +CONFIG_CRYPTO_USER_API_SKCIPHER=m +CONFIG_CRYPTO_HW=y +CONFIG_CRYPTO_DEV_HIFN_795X=m +CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y +# CONFIG_CRYPTO_DEV_FSL_CAAM is not set +CONFIG_CRYPTO_DEV_TALITOS=m +# CONFIG_ASYMMETRIC_KEY_TYPE is not set + +# +# OCF Configuration +# +CONFIG_OCF_OCF=m +CONFIG_OCF_RANDOMHARVEST=y +CONFIG_OCF_FIPS=y +CONFIG_OCF_CRYPTODEV=m +CONFIG_OCF_CRYPTOSOFT=m +# CONFIG_OCF_SAFE is not set +# CONFIG_OCF_IXP4XX is not set +CONFIG_OCF_HIFN=m +CONFIG_OCF_HIFNHIPP=m +# CONFIG_OCF_TALITOS is not set +# CONFIG_OCF_EP80579 is not set +# CONFIG_OCF_CRYPTOCTEON is not set +# CONFIG_OCF_KIRKWOOD is not set +# CONFIG_OCF_C7108 is not set +# CONFIG_OCF_UBSEC_SSB is not set +# CONFIG_OCF_OCFNULL is not set +# CONFIG_OCF_BENCH is not set +# CONFIG_PPC_CLOCK is not set +CONFIG_PPC_LIB_RHEAP=y +# CONFIG_VIRTUALIZATION is not set diff --git a/targets/mpc85xx-generic/kernel-vermagic b/targets/mpc85xx-generic/kernel-vermagic new file mode 100644 index 00000000..4f718abf --- /dev/null +++ b/targets/mpc85xx-generic/kernel-vermagic @@ -0,0 +1 @@ +9437e5393e90f8b42c3d721625895f7f diff --git a/targets/mpc85xx-generic/profiles.mk b/targets/mpc85xx-generic/profiles.mk new file mode 100644 index 00000000..a98d841f --- /dev/null +++ b/targets/mpc85xx-generic/profiles.mk @@ -0,0 +1,7 @@ +# List of hardware profiles + +## TP-Link + +# TL-WDR4900 v1 +$(eval $(call GluonProfile,TLWDR4900)) +$(eval $(call GluonModel,TLWDR4900,tl-wdr4900-v1-squashfs,tp-link-tl-wdr4900-v1)) diff --git a/targets/targets.mk b/targets/targets.mk index bd011072..3d49d1fd 100644 --- a/targets/targets.mk +++ b/targets/targets.mk @@ -2,4 +2,5 @@ $(eval $(call GluonTarget,ar71xx,generic)) ifneq ($(BROKEN),) $(eval $(call GluonTarget,x86,generic)) +$(eval $(call GluonTarget,mpc85xx,generic)) endif From c035ad0574025497ef96a2d98768a0f16de67aad Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Fri, 8 Aug 2014 20:17:30 +0200 Subject: [PATCH 024/100] Remove BROKEN for mpc85xx-generic target --- targets/targets.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/targets/targets.mk b/targets/targets.mk index 3d49d1fd..da100f28 100644 --- a/targets/targets.mk +++ b/targets/targets.mk @@ -1,6 +1,6 @@ $(eval $(call GluonTarget,ar71xx,generic)) +$(eval $(call GluonTarget,mpc85xx,generic)) ifneq ($(BROKEN),) $(eval $(call GluonTarget,x86,generic)) -$(eval $(call GluonTarget,mpc85xx,generic)) endif From 793e422c1049f86ac3c2ec10ecaa378eef440af1 Mon Sep 17 00:00:00 2001 From: Nils Schneider Date: Sat, 9 Aug 2014 09:59:38 +0200 Subject: [PATCH 025/100] luci: add label to fvalue --- ...-fvalue.html-add-label-that-can-be-styled.patch | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 patches/packages/luci/0005-fvalue.html-add-label-that-can-be-styled.patch diff --git a/patches/packages/luci/0005-fvalue.html-add-label-that-can-be-styled.patch b/patches/packages/luci/0005-fvalue.html-add-label-that-can-be-styled.patch new file mode 100644 index 00000000..8a1e00a2 --- /dev/null +++ b/patches/packages/luci/0005-fvalue.html-add-label-that-can-be-styled.patch @@ -0,0 +1,14 @@ +From: Nils Schneider +Date: Sat, 9 Aug 2014 09:33:21 +0200 +Subject: fvalue.html: add label that can be styled + +diff --git a/modules/base/luasrc/view/cbi/fvalue.htm b/modules/base/luasrc/view/cbi/fvalue.htm +index a1e0808..a324ab2 100644 +--- a/modules/base/luasrc/view/cbi/fvalue.htm ++++ b/modules/base/luasrc/view/cbi/fvalue.htm +@@ -6,4 +6,5 @@ + attr("id", cbid) .. attr("name", cbid) .. attr("value", self.enabled or 1) .. + ifattr((self:cfgvalue(section) or self.default) == self.enabled, "checked", "checked") + %> /> ++ > + <%+cbi/valuefooter%> From e6dee34ff2e019ce6dca19963bfacb2ca5e05310 Mon Sep 17 00:00:00 2001 From: Nils Schneider Date: Wed, 13 Aug 2014 13:53:51 +0200 Subject: [PATCH 026/100] Update gluon packages --- modules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules b/modules index 71f931c3..f9e1f90a 100644 --- a/modules +++ b/modules @@ -8,7 +8,7 @@ PACKAGES_OPENWRT_COMMIT=a5944176bc761a3fd233c59bad1af96165e5b60f PACKAGES_OPENWRT_BRANCH=for-14.07 PACKAGES_GLUON_REPO=git://github.com/freifunk-gluon/packages.git -PACKAGES_GLUON_COMMIT=5afa7ae59d4bed7007e350aa63782136ced5a48a +PACKAGES_GLUON_COMMIT=28e332ae1164d27ae47b020ef683ce2b119aeb2f PACKAGES_ROUTING_REPO=git://github.com/openwrt-routing/packages.git PACKAGES_ROUTING_COMMIT=9d3c311fdd7dc15fd5e333b55c259fc2cf661ea2 From d4b0ca54346ba13afe807a03511d7ab5866256c2 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Thu, 14 Aug 2014 18:55:26 +0200 Subject: [PATCH 027/100] TL-WR703N: Remove BROKEN flag --- targets/ar71xx-generic/profiles.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/targets/ar71xx-generic/profiles.mk b/targets/ar71xx-generic/profiles.mk index a7f87d86..70db9ff6 100644 --- a/targets/ar71xx-generic/profiles.mk +++ b/targets/ar71xx-generic/profiles.mk @@ -3,10 +3,8 @@ ## TP-Link # TL-WR703N v1 -ifeq ($(BROKEN),1) $(eval $(call GluonProfile,TLWR703)) $(eval $(call GluonModel,TLWR703,tl-wr703n-v1-squashfs,tp-link-tl-wr703n-v1)) -endif # TL-WR740N v1, v3, v4 $(eval $(call GluonProfile,TLWR740)) From 6d1fa648e728141186a756cb3a144387b93aed8f Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Thu, 14 Aug 2014 19:02:49 +0200 Subject: [PATCH 028/100] Add support for TL-WA801N/ND v2 (tested) --- targets/ar71xx-generic/profiles.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/targets/ar71xx-generic/profiles.mk b/targets/ar71xx-generic/profiles.mk index 70db9ff6..aae2bac4 100644 --- a/targets/ar71xx-generic/profiles.mk +++ b/targets/ar71xx-generic/profiles.mk @@ -18,6 +18,10 @@ $(eval $(call GluonModel,TLWR741,tl-wr741nd-v1-squashfs,tp-link-tl-wr741n-nd-v1) $(eval $(call GluonModel,TLWR741,tl-wr741nd-v2-squashfs,tp-link-tl-wr741n-nd-v2)) $(eval $(call GluonModel,TLWR741,tl-wr741nd-v4-squashfs,tp-link-tl-wr741n-nd-v4)) +# TL-WR801N/ND v2 +$(eval $(call GluonProfile,TLWA801)) +$(eval $(call GluonModel,TLWA801,tl-wa801nd-v2-squashfs,tp-link-tl-wa801n-nd-v2)) + # TL-WR841N/ND v3, v5, v7, v8, v9 $(eval $(call GluonProfile,TLWR841)) $(eval $(call GluonModel,TLWR841,tl-wr841nd-v3-squashfs,tp-link-tl-wr841n-nd-v3)) From 3a6f223a5e7bc5bdeb3b8394389645cdc313685d Mon Sep 17 00:00:00 2001 From: Nils Schneider Date: Fri, 15 Aug 2014 08:44:43 +0200 Subject: [PATCH 029/100] README: urge users to use a release --- README.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/README.md b/README.md index 9d8a1a5c..883f3274 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,15 @@ If you're new to Gluon and ready to get your feet wet, have a look at the **Gluon IRC channel: `#gluon` in [hackint](http://hackint.org/)** +## Use a release! + +Please refrain from using the master branch for anything else but development purposes! +Use the most recent release instead. You can list all relaseses by running `git branch -a` +and switch to one by running `git checkout v2014.3;make update`. + +If you're using the autoupdater, do not autoupdate nodes with anything but releases. +If you upgrade using random master commits the nodes *will break* eventually. + ## Mailinglist (mostly for announcements) I can handle administrative requests automatically. Please From 3fa2f2bf8a53ee622a4b4b61ff4644f101d2201f Mon Sep 17 00:00:00 2001 From: Nils Schneider Date: Fri, 15 Aug 2014 15:39:54 +0200 Subject: [PATCH 030/100] Update gluon packages --- modules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules b/modules index f9e1f90a..7a43f528 100644 --- a/modules +++ b/modules @@ -8,7 +8,7 @@ PACKAGES_OPENWRT_COMMIT=a5944176bc761a3fd233c59bad1af96165e5b60f PACKAGES_OPENWRT_BRANCH=for-14.07 PACKAGES_GLUON_REPO=git://github.com/freifunk-gluon/packages.git -PACKAGES_GLUON_COMMIT=28e332ae1164d27ae47b020ef683ce2b119aeb2f +PACKAGES_GLUON_COMMIT=6467e7422486cce53c7fdef8760343a2f6b86bd6 PACKAGES_ROUTING_REPO=git://github.com/openwrt-routing/packages.git PACKAGES_ROUTING_COMMIT=9d3c311fdd7dc15fd5e333b55c259fc2cf661ea2 From 956de7112235214356b11002469a539116d22212 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Sat, 16 Aug 2014 15:18:52 +0200 Subject: [PATCH 031/100] Update gluon packages --- modules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules b/modules index 7a43f528..c92499ad 100644 --- a/modules +++ b/modules @@ -8,7 +8,7 @@ PACKAGES_OPENWRT_COMMIT=a5944176bc761a3fd233c59bad1af96165e5b60f PACKAGES_OPENWRT_BRANCH=for-14.07 PACKAGES_GLUON_REPO=git://github.com/freifunk-gluon/packages.git -PACKAGES_GLUON_COMMIT=6467e7422486cce53c7fdef8760343a2f6b86bd6 +PACKAGES_GLUON_COMMIT=e7dfba0d03aa18f7b0f521702cb8d9172bf0d1c6 PACKAGES_ROUTING_REPO=git://github.com/openwrt-routing/packages.git PACKAGES_ROUTING_COMMIT=9d3c311fdd7dc15fd5e333b55c259fc2cf661ea2 From c504c5e118fbdc245359dc4cc26629f5ce791f36 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Sat, 16 Aug 2014 17:59:32 +0200 Subject: [PATCH 032/100] ar71xx: correctly detect hardware revision on TP-Link Archer C5 and C7 --- ...revision-on-TP-Link-Archer-C5-and-C7.patch | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 patches/openwrt/0004-ar71xx-correctly-detect-hardware-revision-on-TP-Link-Archer-C5-and-C7.patch diff --git a/patches/openwrt/0004-ar71xx-correctly-detect-hardware-revision-on-TP-Link-Archer-C5-and-C7.patch b/patches/openwrt/0004-ar71xx-correctly-detect-hardware-revision-on-TP-Link-Archer-C5-and-C7.patch new file mode 100644 index 00000000..84b2b69e --- /dev/null +++ b/patches/openwrt/0004-ar71xx-correctly-detect-hardware-revision-on-TP-Link-Archer-C5-and-C7.patch @@ -0,0 +1,31 @@ +From: Matthias Schiffer +Date: Sat, 16 Aug 2014 17:52:34 +0200 +Subject: ar71xx: correctly detect hardware revision on TP-Link Archer C5 and C7 + +diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh +index a067604..8654d6a 100755 +--- a/target/linux/ar71xx/base-files/lib/ar71xx.sh ++++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh +@@ -211,6 +211,13 @@ tplink_board_detect() { + "453000"*) + model="MERCURY MW4530R" + ;; ++ "c50000"*) ++ model="TP-Link Archer C5" ++ ;; ++ "750000"*|\ ++ "c70000"*) ++ model="TP-Link Archer C7" ++ ;; + *) + hwver="" + ;; +@@ -736,7 +743,7 @@ ar71xx_board_detect() { + esac + + case "$machine" in +- *TL-WR* | *TL-WA* | *TL-MR* | *TL-WD*) ++ *TL-WR* | *TL-WA* | *TL-MR* | *TL-WD* | *Archer*) + tplink_board_detect "$machine" + ;; + esac From 70e72db07466562f2a94eb033a612333e5f1938b Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Sat, 16 Aug 2014 18:31:55 +0200 Subject: [PATCH 033/100] Add experimental support for the TP-Link Archer C7 v2 --- targets/ar71xx-generic/profiles.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/targets/ar71xx-generic/profiles.mk b/targets/ar71xx-generic/profiles.mk index aae2bac4..89e435ef 100644 --- a/targets/ar71xx-generic/profiles.mk +++ b/targets/ar71xx-generic/profiles.mk @@ -73,6 +73,11 @@ $(eval $(call GluonProfile,TLMR3420)) $(eval $(call GluonModel,TLMR3420,tl-mr3420-v1-squashfs,tp-link-tl-mr3420-v1)) $(eval $(call GluonModel,TLMR3420,tl-mr3420-v2-squashfs,tp-link-tl-mr3420-v2)) +ifeq ($(BROKEN),1) +# Archer C7 v2 +$(eval $(call GluonProfile,ARCHERC7,kmod-ath10k)) +$(eval $(call GluonModel,ARCHERC7,archer-c7-v2-squashfs,tp-link-archer-c7-v2)) +endif ## Ubiquiti (everything) $(eval $(call GluonProfile,UBNT)) From 54f577e9313d6cc7bfb5f749a14a42e85ccc1fe2 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Sun, 17 Aug 2014 19:55:45 +0200 Subject: [PATCH 034/100] Add experimental support for the Ubiquiti UniFi AP Pro --- targets/ar71xx-generic/profiles.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/targets/ar71xx-generic/profiles.mk b/targets/ar71xx-generic/profiles.mk index 89e435ef..ce57a4c2 100644 --- a/targets/ar71xx-generic/profiles.mk +++ b/targets/ar71xx-generic/profiles.mk @@ -85,6 +85,9 @@ $(eval $(call GluonModel,UBNT,ubnt-bullet-m-squashfs,ubiquiti-bullet-m)) $(eval $(call GluonModel,UBNT,ubnt-nano-m-squashfs,ubiquiti-nanostation-m)) $(eval $(call GluonModel,UBNT,ubnt-unifi-squashfs,ubiquiti-unifi)) $(eval $(call GluonModel,UBNT,ubnt-unifi-outdoor-squashfs,ubiquiti-unifiap-outdoor)) +ifeq ($(BROKEN),1) +$(eval $(call GluonModel,UBNT,ubnt-uap-pro-squashfs,ubiquiti-unifi-ap-pro)) +endif ## D-Link From 9baa9ec4d09c0d0460c6baa103e47d4967bff6ff Mon Sep 17 00:00:00 2001 From: eriu Date: Mon, 18 Aug 2014 12:47:47 +0200 Subject: [PATCH 035/100] fix typo the command autoupdate not work, so a fix smal fix necessary --- docs/features/autoupdater.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/features/autoupdater.rst b/docs/features/autoupdater.rst index 740cd232..acd1adf4 100644 --- a/docs/features/autoupdater.rst +++ b/docs/features/autoupdater.rst @@ -69,7 +69,7 @@ These commands can be used on a node. :: # Update with some probability - autoupdate + autoupdater :: From 5a2065514f82ce4ef9275cef6f71a0652f84f0e3 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Mon, 18 Aug 2014 20:11:12 +0200 Subject: [PATCH 036/100] Update upstream repositories --- modules | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules b/modules index c92499ad..b99238c7 100644 --- a/modules +++ b/modules @@ -1,17 +1,17 @@ GLUON_FEEDS='openwrt gluon routing luci' OPENWRT_REPO=git://git.openwrt.org/14.07/openwrt.git -OPENWRT_COMMIT=79465bfe7633bb92e7ea3468e9cec8bf5d4c0190 +OPENWRT_COMMIT=394af9ce72f20095fd637eed45d0e84869917f20 PACKAGES_OPENWRT_REPO=git://github.com/openwrt/packages.git -PACKAGES_OPENWRT_COMMIT=a5944176bc761a3fd233c59bad1af96165e5b60f +PACKAGES_OPENWRT_COMMIT=7c3d7ca550c950193d9700d44ec32413f8a27ead PACKAGES_OPENWRT_BRANCH=for-14.07 PACKAGES_GLUON_REPO=git://github.com/freifunk-gluon/packages.git PACKAGES_GLUON_COMMIT=e7dfba0d03aa18f7b0f521702cb8d9172bf0d1c6 PACKAGES_ROUTING_REPO=git://github.com/openwrt-routing/packages.git -PACKAGES_ROUTING_COMMIT=9d3c311fdd7dc15fd5e333b55c259fc2cf661ea2 +PACKAGES_ROUTING_COMMIT=11ed2e86132f0516402a2cc4edbd26a8e097cefe PACKAGES_ROUTING_BRANCH=for-14.07 PACKAGES_LUCI_REPO=git://git.openwrt.org/project/luci.git From 35bb4963dfde0ce2a0105d4a7050b0c8f5c76769 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Mon, 18 Aug 2014 20:26:35 +0200 Subject: [PATCH 037/100] Update kernel configs to 14.07-rc3 --- include/gluon.mk | 2 +- targets/ar71xx-generic/kernel-config | 5 +++-- targets/ar71xx-generic/kernel-vermagic | 2 +- targets/mpc85xx-generic/kernel-config | 5 +++-- targets/mpc85xx-generic/kernel-vermagic | 2 +- targets/x86-generic/kernel-config | 5 +++-- targets/x86-generic/kernel-vermagic | 2 +- 7 files changed, 13 insertions(+), 10 deletions(-) diff --git a/include/gluon.mk b/include/gluon.mk index 178c6241..84da5449 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/barrier_breaker/14.07-rc2/%S/packages) +CONFIG_VERSION_REPO := $(shell $(GLUONDIR)/scripts/site.sh opkg_repo || echo http://downloads.openwrt.org/barrier_breaker/14.07-rc3/%S/packages) export CONFIG_VERSION_REPO GLUON_SITE_CODE := $(shell $(GLUONDIR)/scripts/site.sh site_code) diff --git a/targets/ar71xx-generic/kernel-config b/targets/ar71xx-generic/kernel-config index 551d0054..1f5a4c29 100644 --- a/targets/ar71xx-generic/kernel-config +++ b/targets/ar71xx-generic/kernel-config @@ -652,8 +652,8 @@ CONFIG_NETFILTER_XT_TARGET_LED=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_NFLOG=m +CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m CONFIG_NETFILTER_XT_TARGET_NOTRACK=m # CONFIG_NETFILTER_XT_TARGET_RATEEST is not set CONFIG_NETFILTER_XT_TARGET_REDIRECT=m @@ -684,6 +684,7 @@ CONFIG_NETFILTER_XT_MATCH_ESP=m CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m CONFIG_NETFILTER_XT_MATCH_HELPER=m CONFIG_NETFILTER_XT_MATCH_HL=m +CONFIG_NETFILTER_XT_MATCH_ID=m CONFIG_NETFILTER_XT_MATCH_IPRANGE=m CONFIG_NETFILTER_XT_MATCH_LENGTH=m CONFIG_NETFILTER_XT_MATCH_LIMIT=m diff --git a/targets/ar71xx-generic/kernel-vermagic b/targets/ar71xx-generic/kernel-vermagic index e28ee2ac..26b1c0c9 100644 --- a/targets/ar71xx-generic/kernel-vermagic +++ b/targets/ar71xx-generic/kernel-vermagic @@ -1 +1 @@ -f2469bbdb9dd44754c52e799dc02ee7f +94831e5bcf361d1c03e87a15e152b0e8 diff --git a/targets/mpc85xx-generic/kernel-config b/targets/mpc85xx-generic/kernel-config index 86c84db4..1e623dc1 100644 --- a/targets/mpc85xx-generic/kernel-config +++ b/targets/mpc85xx-generic/kernel-config @@ -608,8 +608,8 @@ CONFIG_NETFILTER_XT_TARGET_LED=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_NFLOG=m +CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m CONFIG_NETFILTER_XT_TARGET_NOTRACK=m # CONFIG_NETFILTER_XT_TARGET_RATEEST is not set CONFIG_NETFILTER_XT_TARGET_REDIRECT=m @@ -640,6 +640,7 @@ CONFIG_NETFILTER_XT_MATCH_ESP=m CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m CONFIG_NETFILTER_XT_MATCH_HELPER=m CONFIG_NETFILTER_XT_MATCH_HL=m +CONFIG_NETFILTER_XT_MATCH_ID=m CONFIG_NETFILTER_XT_MATCH_IPRANGE=m CONFIG_NETFILTER_XT_MATCH_LENGTH=m CONFIG_NETFILTER_XT_MATCH_LIMIT=m diff --git a/targets/mpc85xx-generic/kernel-vermagic b/targets/mpc85xx-generic/kernel-vermagic index 4f718abf..bf824cec 100644 --- a/targets/mpc85xx-generic/kernel-vermagic +++ b/targets/mpc85xx-generic/kernel-vermagic @@ -1 +1 @@ -9437e5393e90f8b42c3d721625895f7f +c1a44dd429e530bed2958b8e6cb54a52 diff --git a/targets/x86-generic/kernel-config b/targets/x86-generic/kernel-config index 1b37d3a8..e81021fa 100644 --- a/targets/x86-generic/kernel-config +++ b/targets/x86-generic/kernel-config @@ -727,8 +727,8 @@ CONFIG_NETFILTER_XT_TARGET_LED=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_NFLOG=m +CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m CONFIG_NETFILTER_XT_TARGET_NOTRACK=m # CONFIG_NETFILTER_XT_TARGET_RATEEST is not set CONFIG_NETFILTER_XT_TARGET_REDIRECT=m @@ -759,6 +759,7 @@ CONFIG_NETFILTER_XT_MATCH_ESP=m CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m CONFIG_NETFILTER_XT_MATCH_HELPER=m CONFIG_NETFILTER_XT_MATCH_HL=m +CONFIG_NETFILTER_XT_MATCH_ID=m CONFIG_NETFILTER_XT_MATCH_IPRANGE=m CONFIG_NETFILTER_XT_MATCH_LENGTH=m CONFIG_NETFILTER_XT_MATCH_LIMIT=m diff --git a/targets/x86-generic/kernel-vermagic b/targets/x86-generic/kernel-vermagic index a36aaf8f..f3bb33e2 100644 --- a/targets/x86-generic/kernel-vermagic +++ b/targets/x86-generic/kernel-vermagic @@ -1 +1 @@ -142143844bfcd7ade9ea7e57dd843e69 +3051dee8f07064b727e9d57fbfeb05ec From 33a1f2c78efb3729f05312f40f4b9699c2a447da Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Tue, 19 Aug 2014 21:15:54 +0200 Subject: [PATCH 038/100] Add support for TP-Link TL-MR3040 v2 --- targets/ar71xx-generic/profiles.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/targets/ar71xx-generic/profiles.mk b/targets/ar71xx-generic/profiles.mk index ce57a4c2..813e355c 100644 --- a/targets/ar71xx-generic/profiles.mk +++ b/targets/ar71xx-generic/profiles.mk @@ -60,9 +60,10 @@ $(eval $(call GluonModel,TLWA901,tl-wa901nd-v2-squashfs,tp-link-tl-wa901n-nd-v2) $(eval $(call GluonProfile,TLMR3020)) $(eval $(call GluonModel,TLMR3020,tl-mr3020-v1-squashfs,tp-link-tl-mr3020-v1)) -# TL-MR3040 v1 +# TL-MR3040 v1, v2 $(eval $(call GluonProfile,TLMR3040)) $(eval $(call GluonModel,TLMR3040,tl-mr3040-v1-squashfs,tp-link-tl-mr3040-v1)) +$(eval $(call GluonModel,TLMR3040,tl-mr3040-v2-squashfs,tp-link-tl-mr3040-v2)) # TL-MR3220 v1 $(eval $(call GluonProfile,TLMR3220)) From 0efe5e81fdd163072401c76a217361caaaed1d56 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Fri, 22 Aug 2014 13:53:48 +0200 Subject: [PATCH 039/100] Update OpenWrt patch --- ...start-directly-after-initial-setup-and-disable-tests.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/patches/packages/openwrt/0001-haveged-start-directly-after-initial-setup-and-disable-tests.patch b/patches/packages/openwrt/0001-haveged-start-directly-after-initial-setup-and-disable-tests.patch index 915dfff0..985b7c69 100644 --- a/patches/packages/openwrt/0001-haveged-start-directly-after-initial-setup-and-disable-tests.patch +++ b/patches/packages/openwrt/0001-haveged-start-directly-after-initial-setup-and-disable-tests.patch @@ -3,10 +3,10 @@ Date: Sat, 26 Jul 2014 18:06:07 +0200 Subject: haveged: start directly after initial setup and disable tests diff --git a/utils/haveged/Makefile b/utils/haveged/Makefile -index 12a6237..e9ff3f1 100644 +index aff998d..94c8c34 100644 --- a/utils/haveged/Makefile +++ b/utils/haveged/Makefile -@@ -41,8 +41,9 @@ define Package/libhavege +@@ -42,8 +42,9 @@ define Package/libhavege endef CONFIGURE_ARGS+= \ From 80fd91d2b1679c8040c6feef4a7a1f456aba6e0f Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Fri, 22 Aug 2014 13:54:10 +0200 Subject: [PATCH 040/100] Re-introduce 'no_rebroadcast' option for batman-adv compat 15 --- ...-adv-introduce-no_rebroadcast-option.patch | 195 ++++++++++++++++++ 1 file changed, 195 insertions(+) create mode 100644 patches/packages/routing/0002-batman-adv-introduce-no_rebroadcast-option.patch diff --git a/patches/packages/routing/0002-batman-adv-introduce-no_rebroadcast-option.patch b/patches/packages/routing/0002-batman-adv-introduce-no_rebroadcast-option.patch new file mode 100644 index 00000000..8b861ab1 --- /dev/null +++ b/patches/packages/routing/0002-batman-adv-introduce-no_rebroadcast-option.patch @@ -0,0 +1,195 @@ +From: Matthias Schiffer +Date: Fri, 22 Aug 2014 13:52:42 +0200 +Subject: batman-adv: introduce 'no_rebroadcast' option + +diff --git a/batman-adv/patches/0001-batman-adv-introduce-no_rebroadcast-option.patch b/batman-adv/patches/0001-batman-adv-introduce-no_rebroadcast-option.patch +new file mode 100644 +index 0000000..4f2da9a +--- /dev/null ++++ b/batman-adv/patches/0001-batman-adv-introduce-no_rebroadcast-option.patch +@@ -0,0 +1,185 @@ ++From 382460a7114b734581970076d4dfe3011381e339 Mon Sep 17 00:00:00 2001 ++Message-Id: <382460a7114b734581970076d4dfe3011381e339.1408708010.git.mschiffer@universe-factory.net> ++From: =?UTF-8?q?Linus=20L=C3=BCssing?= ++Date: Tue, 24 Sep 2013 04:36:27 +0200 ++Subject: [PATCH] batman-adv: introduce 'no_rebroadcast' option ++MIME-Version: 1.0 ++Content-Type: text/plain; charset=UTF-8 ++Content-Transfer-Encoding: 8bit ++ ++This patch introduces a new sysfs option named "no_rebroadcast" on ++a per hard interface basis. It allows manually enabling a split-horizon ++like behaviour for the layer 2 multicast payload frames, in that ++incoming multicast payload frames on such a hard interface are only ++being rebroadcasted on all interfaces except the incoming one instead ++of being rebroadcasted on all interfaces. ++ ++Such an option should only be enabled if you are certain that these ++rebroadcasts are unnecessary. This is usually the case for instance ++for point-to-point wifi longshots or wired links. ++ ++This option can especially safe a significant amount of upload overhead ++if the neighbourhood on a link is rather large, for instance in some ++transitive, symmetric VPN configurations. ++ ++Using this option wrongly will break your mesh network, use this option ++wisely and at your own risk! ++ ++Signed-off-by: Linus Lüssing ++--- ++ hard-interface.c | 2 ++ ++ send.c | 4 ++++ ++ sysfs-class-net-batman-adv | 10 ++++++++ ++ sysfs.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++ ++ types.h | 1 + ++ 5 files changed, 76 insertions(+) ++ ++diff --git a/hard-interface.c b/hard-interface.c ++index b851cc5..b222d82 100644 ++--- a/hard-interface.c +++++ b/hard-interface.c ++@@ -591,6 +591,8 @@ batadv_hardif_add_interface(struct net_device *net_dev) ++ /* extra reference for return */ ++ atomic_set(&hard_iface->refcount, 2); ++ +++ atomic_set(&hard_iface->no_rebroadcast, 0); +++ ++ batadv_check_known_mac_addr(hard_iface->net_dev); ++ list_add_tail_rcu(&hard_iface->list, &batadv_hardif_list); ++ ++diff --git a/send.c b/send.c ++index d27161e..4383a66 100644 ++--- a/send.c +++++ b/send.c ++@@ -513,6 +513,10 @@ static void batadv_send_outstanding_bcast_packet(struct work_struct *work) ++ if (forw_packet->num_packets >= hard_iface->num_bcasts) ++ continue; ++ +++ if (atomic_read(&hard_iface->no_rebroadcast) && +++ forw_packet->skb->dev == hard_iface->net_dev) +++ continue; +++ ++ /* send a copy of the saved skb */ ++ skb1 = skb_clone(forw_packet->skb, GFP_ATOMIC); ++ if (skb1) ++diff --git a/sysfs-class-net-batman-adv b/sysfs-class-net-batman-adv ++index 7f34a95..cf7fe00 100644 ++--- a/sysfs-class-net-batman-adv +++++ b/sysfs-class-net-batman-adv ++@@ -13,3 +13,13 @@ Description: ++ displays the batman mesh interface this ++ currently is associated with. ++ +++What: /sys/class/net//batman-adv/no_rebroadcast +++Date: Sep 2013 +++Contact: Linus Lüssing +++Description: +++ With this option set incoming multicast payload frames on +++ are not being rebroadcasted on again. This +++ option should be set on links which are known to be transitive +++ and symmetric only, for instance point-to-point wifi longshots +++ or wired links. Using this option wrongly is going to +++ break your mesh network, use at your own risk! ++diff --git a/sysfs.c b/sysfs.c ++index 1ebb0d9..780c52e 100644 ++--- a/sysfs.c +++++ b/sysfs.c ++@@ -108,6 +108,17 @@ struct batadv_attribute batadv_attr_vlan_##_name = { \ ++ .store = _store, \ ++ }; ++ +++/* Use this, if you have customized show and store functions +++ * for hard interface attrs +++ */ +++#define BATADV_ATTR_HIF(_name, _mode, _show, _store) \ +++struct batadv_attribute batadv_attr_hif_##_name = { \ +++ .attr = {.name = __stringify(_name), \ +++ .mode = _mode }, \ +++ .show = _show, \ +++ .store = _store, \ +++}; +++ ++ /* Use this, if you have customized show and store functions */ ++ #define BATADV_ATTR(_name, _mode, _show, _store) \ ++ struct batadv_attribute batadv_attr_##_name = { \ ++@@ -213,6 +224,52 @@ ssize_t batadv_show_vlan_##_name(struct kobject *kobj, \ ++ static BATADV_ATTR_VLAN(_name, _mode, batadv_show_vlan_##_name, \ ++ batadv_store_vlan_##_name) ++ +++#define BATADV_ATTR_HIF_STORE_BOOL(_name, _post_func) \ +++ssize_t batadv_store_hif_##_name(struct kobject *kobj, \ +++ struct attribute *attr, char *buff, \ +++ size_t count) \ +++{ \ +++ struct net_device *net_dev = batadv_kobj_to_netdev(kobj); \ +++ struct batadv_hard_iface *hard_iface; \ +++ size_t res; \ +++ \ +++ hard_iface = batadv_hardif_get_by_netdev(net_dev); \ +++ if (!hard_iface) \ +++ return 0; \ +++ \ +++ res = __batadv_store_bool_attr(buff, count, _post_func, \ +++ attr, &hard_iface->_name, \ +++ hard_iface->soft_iface); \ +++ batadv_hardif_free_ref(hard_iface); \ +++ return res; \ +++} +++ +++#define BATADV_ATTR_HIF_SHOW_BOOL(_name) \ +++ssize_t batadv_show_hif_##_name(struct kobject *kobj, \ +++ struct attribute *attr, char *buff) \ +++{ \ +++ struct net_device *net_dev = batadv_kobj_to_netdev(kobj); \ +++ struct batadv_hard_iface *hard_iface; \ +++ size_t res; \ +++ \ +++ hard_iface = batadv_hardif_get_by_netdev(net_dev); \ +++ if (!hard_iface) \ +++ return 0; \ +++ \ +++ res = sprintf(buff, "%s\n", \ +++ atomic_read(&hard_iface->_name) == 0 ? \ +++ "disabled" : "enabled"); \ +++ batadv_hardif_free_ref(hard_iface); \ +++ return res; \ +++} +++ +++/* Use this, if you are going to turn a [name] in the vlan struct on or off */ +++#define BATADV_ATTR_HIF_BOOL(_name, _mode, _post_func) \ +++ static BATADV_ATTR_HIF_STORE_BOOL(_name, _post_func) \ +++ static BATADV_ATTR_HIF_SHOW_BOOL(_name) \ +++ static BATADV_ATTR_HIF(_name, _mode, batadv_show_hif_##_name, \ +++ batadv_store_hif_##_name) +++ ++ static int batadv_store_bool_attr(char *buff, size_t count, ++ struct net_device *net_dev, ++ const char *attr_name, atomic_t *attr) ++@@ -834,10 +891,12 @@ static ssize_t batadv_show_iface_status(struct kobject *kobj, ++ static BATADV_ATTR(mesh_iface, S_IRUGO | S_IWUSR, batadv_show_mesh_iface, ++ batadv_store_mesh_iface); ++ static BATADV_ATTR(iface_status, S_IRUGO, batadv_show_iface_status, NULL); +++BATADV_ATTR_HIF_BOOL(no_rebroadcast, S_IRUGO | S_IWUSR, NULL); ++ ++ static struct batadv_attribute *batadv_batman_attrs[] = { ++ &batadv_attr_mesh_iface, ++ &batadv_attr_iface_status, +++ &batadv_attr_hif_no_rebroadcast, ++ NULL, ++ }; ++ ++diff --git a/types.h b/types.h ++index 8854c05..39619fb 100644 ++--- a/types.h +++++ b/types.h ++@@ -101,6 +101,7 @@ struct batadv_hard_iface { ++ struct batadv_hard_iface_bat_iv bat_iv; ++ struct work_struct cleanup_work; ++ struct dentry *debug_dir; +++ atomic_t no_rebroadcast; ++ }; ++ ++ /** ++-- ++2.1.0 ++ From 80b0abb941e449d42c9856fca6e85e199db790ce Mon Sep 17 00:00:00 2001 From: Nils Schneider Date: Mon, 25 Aug 2014 21:57:32 +0200 Subject: [PATCH 041/100] Update gluon packages --- modules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules b/modules index b99238c7..8a88105a 100644 --- a/modules +++ b/modules @@ -8,7 +8,7 @@ PACKAGES_OPENWRT_COMMIT=7c3d7ca550c950193d9700d44ec32413f8a27ead PACKAGES_OPENWRT_BRANCH=for-14.07 PACKAGES_GLUON_REPO=git://github.com/freifunk-gluon/packages.git -PACKAGES_GLUON_COMMIT=e7dfba0d03aa18f7b0f521702cb8d9172bf0d1c6 +PACKAGES_GLUON_COMMIT=8a71c02ce6620c242f8818f84f6b30baee8f92bc PACKAGES_ROUTING_REPO=git://github.com/openwrt-routing/packages.git PACKAGES_ROUTING_COMMIT=11ed2e86132f0516402a2cc4edbd26a8e097cefe From d3aecbfc6c1005be271b30e6f515f3ca3e647b01 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Thu, 28 Aug 2014 21:11:18 +0200 Subject: [PATCH 042/100] Add support for the TL-WR710N v1 (untested) --- targets/ar71xx-generic/profiles.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/targets/ar71xx-generic/profiles.mk b/targets/ar71xx-generic/profiles.mk index 813e355c..87b98afd 100644 --- a/targets/ar71xx-generic/profiles.mk +++ b/targets/ar71xx-generic/profiles.mk @@ -6,6 +6,12 @@ $(eval $(call GluonProfile,TLWR703)) $(eval $(call GluonModel,TLWR703,tl-wr703n-v1-squashfs,tp-link-tl-wr703n-v1)) +ifeq ($(BROKEN),1) +# TL-WR710N v1 +$(eval $(call GluonProfile,TLWR710)) +$(eval $(call GluonModel,TLWR710,tl-wr710n-v1-squashfs,tp-link-tl-wr710n-v1)) +endif + # TL-WR740N v1, v3, v4 $(eval $(call GluonProfile,TLWR740)) $(eval $(call GluonModel,TLWR740,tl-wr740n-v1-squashfs,tp-link-tl-wr740n-nd-v1)) From 31a3bfc18f2e9aa2b6c370692a14dc366591d0c5 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Sat, 30 Aug 2014 19:41:19 +0200 Subject: [PATCH 043/100] Update gluon packages --- modules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules b/modules index 8a88105a..af6af295 100644 --- a/modules +++ b/modules @@ -8,7 +8,7 @@ PACKAGES_OPENWRT_COMMIT=7c3d7ca550c950193d9700d44ec32413f8a27ead PACKAGES_OPENWRT_BRANCH=for-14.07 PACKAGES_GLUON_REPO=git://github.com/freifunk-gluon/packages.git -PACKAGES_GLUON_COMMIT=8a71c02ce6620c242f8818f84f6b30baee8f92bc +PACKAGES_GLUON_COMMIT=e4fc1955cc6d198f9817559a9bad78660915ced7 PACKAGES_ROUTING_REPO=git://github.com/openwrt-routing/packages.git PACKAGES_ROUTING_COMMIT=11ed2e86132f0516402a2cc4edbd26a8e097cefe From 62268d4ab015b5ed9526d7136ab577492cc54cbb Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Sat, 30 Aug 2014 19:49:13 +0200 Subject: [PATCH 044/100] Update OpenWrt and packages This significantly improves fastd performance, to the level it was before Barrier Breaker. --- modules | 4 ++-- ...ls-Makefile-fix-host-tools-build-dependencies.patch | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/modules b/modules index af6af295..c4e26f79 100644 --- a/modules +++ b/modules @@ -1,10 +1,10 @@ GLUON_FEEDS='openwrt gluon routing luci' OPENWRT_REPO=git://git.openwrt.org/14.07/openwrt.git -OPENWRT_COMMIT=394af9ce72f20095fd637eed45d0e84869917f20 +OPENWRT_COMMIT=32d501a8daa57b58a961ed81e3fd85f92b20c7dd PACKAGES_OPENWRT_REPO=git://github.com/openwrt/packages.git -PACKAGES_OPENWRT_COMMIT=7c3d7ca550c950193d9700d44ec32413f8a27ead +PACKAGES_OPENWRT_COMMIT=eaa3e00d345a52c6dc67f8b9b0b2d4a2971425d5 PACKAGES_OPENWRT_BRANCH=for-14.07 PACKAGES_GLUON_REPO=git://github.com/freifunk-gluon/packages.git 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 cf01ba60..c8ae9cd3 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 @@ -3,10 +3,10 @@ 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 75d2b0d..ff1d299 100644 +index 9595d62..b8eef3f 100644 --- a/tools/Makefile +++ b/tools/Makefile -@@ -95,10 +95,16 @@ define PrepareStaging +@@ -96,10 +96,16 @@ define PrepareStaging endef # preparatory work @@ -23,7 +23,7 @@ index 75d2b0d..ff1d299 100644 $(STAGING_DIR_HOST)/.prepared: $(TMP_DIR)/.build $(call PrepareStaging,$(STAGING_DIR_HOST)) -@@ -110,7 +116,7 @@ $(STAGING_DIR_HOST)/.prepared: $(TMP_DIR)/.build +@@ -111,7 +117,7 @@ $(STAGING_DIR_HOST)/.prepared: $(TMP_DIR)/.build define PrepareCommand @@ -32,7 +32,7 @@ index 75d2b0d..ff1d299 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; \ -@@ -119,7 +125,7 @@ $(STAGING_DIR_HOST)/bin/$(1): $(STAGING_DIR)/.prepared +@@ -120,7 +126,7 @@ $(STAGING_DIR_HOST)/bin/$(1): $(STAGING_DIR)/.prepared endef endif @@ -41,7 +41,7 @@ index 75d2b0d..ff1d299 100644 @rm -f $@ @if stat --version > /dev/null 2>&1; then \ ln -s `which stat` $@; \ -@@ -143,8 +149,8 @@ $(eval $(call PrepareCommand,tar,gtar tar)) +@@ -144,8 +150,8 @@ $(eval $(call PrepareCommand,tar,gtar tar)) $(eval $(call PrepareCommand,diff,gdiff diff)) $(curdir)/cmddeps = $(patsubst %,$(STAGING_DIR_HOST)/bin/%,md5sum cp stat seq python awk getopt grep tar diff) From 4947eaff985f1f8c58631d4d200547efa260c363 Mon Sep 17 00:00:00 2001 From: Philip Berndroth Date: Sat, 30 Aug 2014 19:55:17 +0200 Subject: [PATCH 045/100] Update getting_started.rst add information about the environment variables. --- docs/user/getting_started.rst | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/docs/user/getting_started.rst b/docs/user/getting_started.rst index 62e26d1e..606e650c 100644 --- a/docs/user/getting_started.rst +++ b/docs/user/getting_started.rst @@ -42,6 +42,22 @@ will ensure all packages are rebuilt; this is what you normally want to do after will clean the entire tree, so the toolchain will be rebuilt as well, which is not necessary in most cases, and will take a while. + +Environment variables +--------------------- + +Gluon's build process can be controlled by various environment variables. + +GLUON_SITEDIR + Path to the site configuration. Defaults to ``site/``. + +GLUON_IMAGEDIR + Path where images will be stored. Defaults to ``images/``. + +GLUON_BUILDDIR + Working directory during build. Defaults to ``build/``. + + So all in all, to update and rebuild a Gluon build tree, the following commands should be used: :: @@ -51,5 +67,3 @@ So all in all, to update and rebuild a Gluon build tree, the following commands make update make clean make - - From db9376ed4a20e945fb9654071aa08c9e49114518 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Sat, 30 Aug 2014 19:57:59 +0200 Subject: [PATCH 046/100] Update batman-adv (15) to v2014.3 --- .../0002-Update-batman-adv-to-v2014.3.patch | 36 +++++++++++++++++++ ...adv-introduce-no_rebroadcast-option.patch} | 0 2 files changed, 36 insertions(+) create mode 100644 patches/packages/routing/0002-Update-batman-adv-to-v2014.3.patch rename patches/packages/routing/{0002-batman-adv-introduce-no_rebroadcast-option.patch => 0003-batman-adv-introduce-no_rebroadcast-option.patch} (100%) diff --git a/patches/packages/routing/0002-Update-batman-adv-to-v2014.3.patch b/patches/packages/routing/0002-Update-batman-adv-to-v2014.3.patch new file mode 100644 index 00000000..50d4299c --- /dev/null +++ b/patches/packages/routing/0002-Update-batman-adv-to-v2014.3.patch @@ -0,0 +1,36 @@ +From: Matthias Schiffer +Date: Sat, 30 Aug 2014 19:46:55 +0200 +Subject: Update batman-adv to v2014.3 + +diff --git a/batctl/Makefile b/batctl/Makefile +index ae22286..43c9098 100644 +--- a/batctl/Makefile ++++ b/batctl/Makefile +@@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk + + PKG_NAME:=batctl + +-PKG_VERSION:=2014.2.0 ++PKG_VERSION:=2014.3.0 + PKG_RELEASE:=1 +-PKG_MD5SUM:=c196cf95b7324d9123b701a56b06b31d ++PKG_MD5SUM:=7d2b8c129424c014d020c4b1a2add31b + + PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz + PKG_SOURCE_URL:=http://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION) +diff --git a/batman-adv/Makefile b/batman-adv/Makefile +index 889dea7..6103cd2 100644 +--- a/batman-adv/Makefile ++++ b/batman-adv/Makefile +@@ -10,9 +10,9 @@ include $(TOPDIR)/rules.mk + + PKG_NAME:=batman-adv + +-PKG_VERSION:=2014.2.0 ++PKG_VERSION:=2014.3.0 + PKG_RELEASE:=1 +-PKG_MD5SUM:=1243029b3a3e2f4fa721d1a59c2faaf5 ++PKG_MD5SUM:=e9ee1d42ff4b0254699c779668054bed + + PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz + PKG_SOURCE_URL:=http://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION) diff --git a/patches/packages/routing/0002-batman-adv-introduce-no_rebroadcast-option.patch b/patches/packages/routing/0003-batman-adv-introduce-no_rebroadcast-option.patch similarity index 100% rename from patches/packages/routing/0002-batman-adv-introduce-no_rebroadcast-option.patch rename to patches/packages/routing/0003-batman-adv-introduce-no_rebroadcast-option.patch From e496c17cc8e973cfceee2cff8d14d9340adae4af Mon Sep 17 00:00:00 2001 From: Philip Berndroth Date: Sat, 30 Aug 2014 20:00:43 +0200 Subject: [PATCH 047/100] Delete builds.rst This chapter is no longer needed (duplicate content). The content is alrady in http://gluon.readthedocs.org/en/latest/user/getting_started.html#getting-started . --- docs/user/builds.rst | 63 -------------------------------------------- 1 file changed, 63 deletions(-) delete mode 100644 docs/user/builds.rst diff --git a/docs/user/builds.rst b/docs/user/builds.rst deleted file mode 100644 index 0cdc2467..00000000 --- a/docs/user/builds.rst +++ /dev/null @@ -1,63 +0,0 @@ -Builds -====== - -For the build reserve 6GB of disk space. The building requires packages -for ``subversion``, ncurses headers (``libncurses-dev``) and zlib headers -(``libz-dev``). - -Building Gluon --------------- - -To build Gluon, after checking out the repository change to the source root directory to perform the following commands: - -:: - - git clone git://github.com/freifunk-gluon/site-ffhl.git site # Get the Freifunk Lübeck site repository - or use your own! - make update # Get other repositories used by Gluon - make # Build Gluon - -When calling ``make``, the OpenWRT build environment is prepared and updated. To rebuild -the images only, just use: - -:: - - make images - -The built images can be found in the directory ``images``. - -Cleaning up ------------ - -There are three levels of ``make clean``: - -:: - - make clean - -will only clean the Gluon-specific files; - -:: - - make cleanall - -will also call ``make clean`` on the OpenWRT tree, and - -:: - - make dirclean - -will do all this, and call ``make dirclean`` on the OpenWRT tree. - -Environment variables ---------------------- - -Gluon's build process can be controlled by various environment variables. - -GLUON_SITEDIR - Path to the site configuration. Defaults to ``site/``. - -GLUON_IMAGEDIR - Path where images will be stored. Defaults to ``images/``. - -GLUON_BUILDDIR - Working directory during build. Defaults to ``build/``. From b739881fe45afeddb716ef5404719416a6294a91 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Mon, 1 Sep 2014 15:54:43 +0200 Subject: [PATCH 048/100] Update OpenWrt --- modules | 2 +- ...R1043N-ND-v2-Fix-MAC-address-of-WMAC.patch | 32 ------------------- ...evision-on-TP-Link-Archer-C5-and-C7.patch} | 10 +++--- 3 files changed, 6 insertions(+), 38 deletions(-) delete mode 100644 patches/openwrt/0003-ar71xx-TL-WR1043N-ND-v2-Fix-MAC-address-of-WMAC.patch rename patches/openwrt/{0004-ar71xx-correctly-detect-hardware-revision-on-TP-Link-Archer-C5-and-C7.patch => 0003-ar71xx-correctly-detect-hardware-revision-on-TP-Link-Archer-C5-and-C7.patch} (81%) diff --git a/modules b/modules index c4e26f79..7a25b765 100644 --- a/modules +++ b/modules @@ -1,7 +1,7 @@ GLUON_FEEDS='openwrt gluon routing luci' OPENWRT_REPO=git://git.openwrt.org/14.07/openwrt.git -OPENWRT_COMMIT=32d501a8daa57b58a961ed81e3fd85f92b20c7dd +OPENWRT_COMMIT=088b1cbba7c9b114b6b0bc9171561d20b86bfecf PACKAGES_OPENWRT_REPO=git://github.com/openwrt/packages.git PACKAGES_OPENWRT_COMMIT=eaa3e00d345a52c6dc67f8b9b0b2d4a2971425d5 diff --git a/patches/openwrt/0003-ar71xx-TL-WR1043N-ND-v2-Fix-MAC-address-of-WMAC.patch b/patches/openwrt/0003-ar71xx-TL-WR1043N-ND-v2-Fix-MAC-address-of-WMAC.patch deleted file mode 100644 index dd40c598..00000000 --- a/patches/openwrt/0003-ar71xx-TL-WR1043N-ND-v2-Fix-MAC-address-of-WMAC.patch +++ /dev/null @@ -1,32 +0,0 @@ -From: Matthias Schiffer -Date: Thu, 7 Aug 2014 15:07:15 +0200 -Subject: ar71xx: TL-WR1043N/ND v2: Fix MAC address of WMAC - -This sets the MAC address of the WLAN interface to the "official" primary MAC -address (the one on the label under the devices, and the one used with the stock -firmware). The MAC address used so far (primary-1) isn't even used at all with -the stock firmware, which sets (primary) on LAN and WLAN and (primary+1) on the -WAN interface (like OpenWrt does with this patch). - -diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr1043nd-v2.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr1043nd-v2.c -index 4f873e2..3e79ee1 100644 ---- a/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr1043nd-v2.c -+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr1043nd-v2.c -@@ -168,7 +168,6 @@ static void __init tl_wr1043nd_v2_setup(void) - { - u8 *mac = (u8 *) KSEG1ADDR(0x1f01fc00); - u8 *art = (u8 *) KSEG1ADDR(0x1fff0000); -- u8 tmpmac[ETH_ALEN]; - - ath79_register_m25p80(&wr1043nd_v2_flash_data); - -@@ -178,8 +177,7 @@ static void __init tl_wr1043nd_v2_setup(void) - ARRAY_SIZE(tl_wr1043_v2_gpio_keys), - tl_wr1043_v2_gpio_keys); - -- ath79_init_mac(tmpmac, mac, -1); -- ath79_register_wmac(art + TL_WR1043_V2_WMAC_CALDATA_OFFSET, tmpmac); -+ ath79_register_wmac(art + TL_WR1043_V2_WMAC_CALDATA_OFFSET, mac); - - mdiobus_register_board_info(wr1043nd_v2_mdio0_info, - ARRAY_SIZE(wr1043nd_v2_mdio0_info)); diff --git a/patches/openwrt/0004-ar71xx-correctly-detect-hardware-revision-on-TP-Link-Archer-C5-and-C7.patch b/patches/openwrt/0003-ar71xx-correctly-detect-hardware-revision-on-TP-Link-Archer-C5-and-C7.patch similarity index 81% rename from patches/openwrt/0004-ar71xx-correctly-detect-hardware-revision-on-TP-Link-Archer-C5-and-C7.patch rename to patches/openwrt/0003-ar71xx-correctly-detect-hardware-revision-on-TP-Link-Archer-C5-and-C7.patch index 84b2b69e..e6371420 100644 --- a/patches/openwrt/0004-ar71xx-correctly-detect-hardware-revision-on-TP-Link-Archer-C5-and-C7.patch +++ b/patches/openwrt/0003-ar71xx-correctly-detect-hardware-revision-on-TP-Link-Archer-C5-and-C7.patch @@ -3,12 +3,12 @@ Date: Sat, 16 Aug 2014 17:52:34 +0200 Subject: ar71xx: correctly detect hardware revision on TP-Link Archer C5 and C7 diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh -index a067604..8654d6a 100755 +index 1e96b6d..5aceaee 100755 --- a/target/linux/ar71xx/base-files/lib/ar71xx.sh +++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh -@@ -211,6 +211,13 @@ tplink_board_detect() { - "453000"*) - model="MERCURY MW4530R" +@@ -214,6 +214,13 @@ tplink_board_detect() { + "934100"*) + model="NC-LINK SMART-300" ;; + "c50000"*) + model="TP-Link Archer C5" @@ -20,7 +20,7 @@ index a067604..8654d6a 100755 *) hwver="" ;; -@@ -736,7 +743,7 @@ ar71xx_board_detect() { +@@ -745,7 +752,7 @@ ar71xx_board_detect() { esac case "$machine" in From 2d9a25a06cc8fefae38d59d309b0bb7f603040be Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Mon, 1 Sep 2014 17:43:39 +0200 Subject: [PATCH 049/100] Fix build by disabling per-feed repos again Updating OpenWrt accidentally enabled this option. --- include/config | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/config b/include/config index dd5ac283..893ea812 100644 --- a/include/config +++ b/include/config @@ -1,3 +1,6 @@ +CONFIG_IMAGEOPT=y +# CONFIG_PER_FEED_REPO is not set + CONFIG_BUSYBOX_CUSTOM=y CONFIG_BUSYBOX_CONFIG_SHA512SUM=y # CONFIG_BUSYBOX_CONFIG_FEATURE_PREFER_IPV4_ADDRESS is not set From 83f62c159e91387cffbddb0d89f4737abe73d99e Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Mon, 1 Sep 2014 18:45:04 +0200 Subject: [PATCH 050/100] TL-WR710N v1: remove BROKEN --- targets/ar71xx-generic/profiles.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/targets/ar71xx-generic/profiles.mk b/targets/ar71xx-generic/profiles.mk index 87b98afd..0149cd2a 100644 --- a/targets/ar71xx-generic/profiles.mk +++ b/targets/ar71xx-generic/profiles.mk @@ -6,11 +6,9 @@ $(eval $(call GluonProfile,TLWR703)) $(eval $(call GluonModel,TLWR703,tl-wr703n-v1-squashfs,tp-link-tl-wr703n-v1)) -ifeq ($(BROKEN),1) # TL-WR710N v1 $(eval $(call GluonProfile,TLWR710)) $(eval $(call GluonModel,TLWR710,tl-wr710n-v1-squashfs,tp-link-tl-wr710n-v1)) -endif # TL-WR740N v1, v3, v4 $(eval $(call GluonProfile,TLWR740)) From 6543833f068d91851b57cdfd347ded7805f9f263 Mon Sep 17 00:00:00 2001 From: Philip Berndroth Date: Sat, 30 Aug 2014 20:00:43 +0200 Subject: [PATCH 051/100] Delete builds.rst This chapter is no longer needed (duplicate content). The content is alrady in http://gluon.readthedocs.org/en/latest/user/getting_started.html#getting-started . --- docs/index.rst | 1 - docs/user/builds.rst | 63 -------------------------------------------- 2 files changed, 64 deletions(-) delete mode 100644 docs/user/builds.rst diff --git a/docs/index.rst b/docs/index.rst index 7d0a80b6..53e1a97a 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -13,7 +13,6 @@ User Documentation user/getting_started user/site - user/builds user/faq Features diff --git a/docs/user/builds.rst b/docs/user/builds.rst deleted file mode 100644 index 0cdc2467..00000000 --- a/docs/user/builds.rst +++ /dev/null @@ -1,63 +0,0 @@ -Builds -====== - -For the build reserve 6GB of disk space. The building requires packages -for ``subversion``, ncurses headers (``libncurses-dev``) and zlib headers -(``libz-dev``). - -Building Gluon --------------- - -To build Gluon, after checking out the repository change to the source root directory to perform the following commands: - -:: - - git clone git://github.com/freifunk-gluon/site-ffhl.git site # Get the Freifunk Lübeck site repository - or use your own! - make update # Get other repositories used by Gluon - make # Build Gluon - -When calling ``make``, the OpenWRT build environment is prepared and updated. To rebuild -the images only, just use: - -:: - - make images - -The built images can be found in the directory ``images``. - -Cleaning up ------------ - -There are three levels of ``make clean``: - -:: - - make clean - -will only clean the Gluon-specific files; - -:: - - make cleanall - -will also call ``make clean`` on the OpenWRT tree, and - -:: - - make dirclean - -will do all this, and call ``make dirclean`` on the OpenWRT tree. - -Environment variables ---------------------- - -Gluon's build process can be controlled by various environment variables. - -GLUON_SITEDIR - Path to the site configuration. Defaults to ``site/``. - -GLUON_IMAGEDIR - Path where images will be stored. Defaults to ``images/``. - -GLUON_BUILDDIR - Working directory during build. Defaults to ``build/``. From 674f47ffd2c82d0de383154b550d6dd907ac9094 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Tue, 9 Sep 2014 15:33:32 +0200 Subject: [PATCH 052/100] Update Gluon packages --- modules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules b/modules index 7a25b765..ce94ad08 100644 --- a/modules +++ b/modules @@ -8,7 +8,7 @@ PACKAGES_OPENWRT_COMMIT=eaa3e00d345a52c6dc67f8b9b0b2d4a2971425d5 PACKAGES_OPENWRT_BRANCH=for-14.07 PACKAGES_GLUON_REPO=git://github.com/freifunk-gluon/packages.git -PACKAGES_GLUON_COMMIT=e4fc1955cc6d198f9817559a9bad78660915ced7 +PACKAGES_GLUON_COMMIT=f36a58e77d43dbc1165a5cfa8c890f9d2eb55de0 PACKAGES_ROUTING_REPO=git://github.com/openwrt-routing/packages.git PACKAGES_ROUTING_COMMIT=11ed2e86132f0516402a2cc4edbd26a8e097cefe From c388946e82f5713df5509b8a1a4e054e5782f505 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Tue, 9 Sep 2014 15:35:32 +0200 Subject: [PATCH 053/100] Update upstream repos --- modules | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules b/modules index ce94ad08..04cac4ca 100644 --- a/modules +++ b/modules @@ -1,17 +1,17 @@ GLUON_FEEDS='openwrt gluon routing luci' OPENWRT_REPO=git://git.openwrt.org/14.07/openwrt.git -OPENWRT_COMMIT=088b1cbba7c9b114b6b0bc9171561d20b86bfecf +OPENWRT_COMMIT=9d90bc20d4f823644b4b30dbe0e469e0e4369d35 PACKAGES_OPENWRT_REPO=git://github.com/openwrt/packages.git -PACKAGES_OPENWRT_COMMIT=eaa3e00d345a52c6dc67f8b9b0b2d4a2971425d5 +PACKAGES_OPENWRT_COMMIT=fe13c18ebfa8ccb5a6b0bada424fb591f0f765f0 PACKAGES_OPENWRT_BRANCH=for-14.07 PACKAGES_GLUON_REPO=git://github.com/freifunk-gluon/packages.git PACKAGES_GLUON_COMMIT=f36a58e77d43dbc1165a5cfa8c890f9d2eb55de0 PACKAGES_ROUTING_REPO=git://github.com/openwrt-routing/packages.git -PACKAGES_ROUTING_COMMIT=11ed2e86132f0516402a2cc4edbd26a8e097cefe +PACKAGES_ROUTING_COMMIT=1a999ad02b49a5ca1315d7f21555039372a6e4d5 PACKAGES_ROUTING_BRANCH=for-14.07 PACKAGES_LUCI_REPO=git://git.openwrt.org/project/luci.git From ebec39f468e4b5529cc517639785e206d4d6e52d Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Tue, 9 Sep 2014 17:08:46 +0200 Subject: [PATCH 054/100] docs: add documentation about addings new hardware support --- docs/dev/hardware.rst | 102 ++++++++++++++++++++++++++++++++++++++++++ docs/index.rst | 1 + 2 files changed, 103 insertions(+) create mode 100644 docs/dev/hardware.rst diff --git a/docs/dev/hardware.rst b/docs/dev/hardware.rst new file mode 100644 index 00000000..751c94e0 --- /dev/null +++ b/docs/dev/hardware.rst @@ -0,0 +1,102 @@ +Adding support for new hardware +=============================== +This page will give a short overview on how to add support +for new hardware to Gluon. + +Hardware requirements +--------------------- +Having an ath9k (or ath10k) based WLAN adapter is highly recommended, +although other chipsets may also work. VAP (multiple SSID) support +is a requirement. At the moment, Gluon's scripts can't handle devices +without WLAN adapters (although such environments may also be interesting, +e.g. for automated testing in virtual machines). + +.. _hardware-adding-profiles: + +Adding profiles +--------------- +The vast majority of devices with ath9k WLAN uses the ar71xx target of OpenWrt. +If the hardware you want to add support for is also ar71xx, adding a new profile +is enough. + +Profiles are defined in ``targets/-/profiles.mk``. There are two macros +used to define which images are generated: ``GluonProfile`` and ``GluonModel``. The following examples +are taken from ``profiles.mk`` of the ``ar71xx-generic`` target:: + + $(eval $(call GluonProfile,TLWR1043)) + $(eval $(call GluonModel,TLWR1043,tl-wr1043nd-v1-squashfs,tp-link-tl-wr1043n-nd-v1)) + $(eval $(call GluonModel,TLWR1043,tl-wr1043nd-v2-squashfs,tp-link-tl-wr1043n-nd-v2)) + +The ``GluonProfile`` macro takes at least one parameter, the profile name as it is +defined in the Makefiles of OpenWrt (``openwrt/target/linux///profiles/*`` +and ``openwrt/target/linux//image/Makefile``). If the target you are on doesn't define +profiles (e.g. on x86), just add a single profile called ``Generic`` or similar. + +It may optionally take a second parameter which defines additional packages to include for the profile +(e.g. ath10k). The additional packages defined in ``openwrt/target/linux///profiles/*`` +aren't used. + +The ``GluonModel`` macro takes three parameters: The profile name, the suffix of the image file +generated by OpenWrt (without the file extension), and the final image name of the Gluon image. +The final image name must be the same that is returned by the following command. + +:: + + lua -e 'print(require("platform_info").get_image_name())' + + +This is so the autoupdater can work. On targets with aren't supported by the autoupdater, +``require("platform_info").get_image_name()`` will just return ``nil`` and the final image name +may be defined arbitrarily. + +On devices with multiple WLAN adapters, care must also be taken that the primary MAC address is +configured correctly. ``/lib/gluon/core/sysconfig/primary_mac`` should contain the MAC address which +can be found on a label on most hardware; if it does not, ``/lib/gluon/upgrade/core/initial/001-sysconfig`` +in ``gluon-core`` might need a fix. (There have also been cases in which the address was incorrect +even on devices with only one WLAN adapter, in these cases an OpenWrt bug was the cause). + +Adding support for new hardware targets +--------------------------------------- +Adding a new target is much more complex than adding a new profile. There are two basic steps +required for adding a new target: + +Adjust packages +''''''''''''''' +One package that definitely needs adjustments for every new target added is ``lua-platform-info``. Just +start with a copy of an existing platform info script, adjust it for the new target, and add the new target +to the list of supported targets in the package Makefile. + +On many targets, Gluon's network setup scripts (mainly in the packages ``gluon-core`` and ``gluon-mesh-batman-adv-core``) +won't run correctly without some adjustments, so better double check that everything is fine there (and the files +``primary_mac``, ``lan_ifname`` and ``wan_ifname`` in ``/lib/gluon/core/sysconfig/`` contain sensible values). + +Add support to the build system +''''''''''''''''''''''''''''''' +A directory for the new target must be created under ``targets``, and it must be added +to ``targets/targets.mk``. In the new target directory, four files must be created: + +* config +* kernel-config +* kernel-vermagic +* profiles.mk + +The file ``config`` can be used to add additional, target-specific options to the OpenWrt config. If such options +aren't necessary, it can be left empty. For ``profiles.mk``, see :ref:`hardware-adding-profiles`. + +The files ``kernel-config`` and ``kernel-vermagic`` must have the correct content so kernel modules from the upstream repositories +can be easily installed. The OpenWrt version a Gluon release is based on is defined by the upstream package repo URL in ``include/gluon.mk`` +(in the variable ``CONFIG_VERSION_REPO``); at the time this documentation was written, this was ``barrier_breaker/14.07-rc3``; whenever +the package repo is updated, all ``kernel-config`` and ``kernel-vermagic`` files must be updated as well. + +The file ``kernel-vermagic`` just contains a hash which is part of the version number of the kernel package. So in the case of ``ar71xx-generic`` on +``barrier_breaker/14.07-rc3``, we look in the directory ``https://downloads.openwrt.org/barrier_breaker/14.07-rc3/ar71xx/generic/packages/`` and +find that the kernel package is called ``kernel_3.10.49-1-94831e5bcf361d1c03e87a15e152b0e8_ar71xx.ipk``. This makes the ``kernel-vermagic`` the +string ``94831e5bcf361d1c03e87a15e152b0e8``. + +For ``kernel-config``, the OpenWrt image builder must be downloaded. Again, for ``ar71xx-generic`` on +``barrier_breaker/14.07-rc3``, we download ``OpenWrt-SDK-ar71xx-for-linux-x86_64-gcc-4.8-linaro_uClibc-0.9.33.2.tar.bz2`` +from ``https://downloads.openwrt.org/barrier_breaker/14.07-rc3/ar71xx/generic/``. After unpacking it, we use the file +``OpenWrt-ImageBuilder-ar71xx_generic-for-linux-x86_64/build_dir/target-mips_34kc_uClibc-0.9.33.2/linux-ar71xx_generic/linux-3.10.49/.config`` +as our ``kernel-config``. + +After this, is should be sufficient to call ``make GLUON_TARGET=-`` to build the images for the new target. diff --git a/docs/index.rst b/docs/index.rst index 53e1a97a..1e616a1b 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -34,6 +34,7 @@ Developer Documentation :maxdepth: 2 dev/basics + dev/hardware Supported Devices ----------------- From bb6d0f1179e74391764a274f2e8581f3fa50b0c6 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Tue, 9 Sep 2014 19:49:44 +0200 Subject: [PATCH 055/100] Update LuCI --- modules | 2 +- ...e.html-add-label-that-can-be-styled.patch} | 0 ...-field-mmap-to-the-more-generic-data.patch | 106 ------------- ...range-static-on-variable-declaration.patch | 17 --- ...ing-templates-to-the-template-parser.patch | 142 ------------------ ...ng-templates-to-luci.template-module.patch | 67 --------- 6 files changed, 1 insertion(+), 333 deletions(-) rename patches/packages/luci/{0005-fvalue.html-add-label-that-can-be-styled.patch => 0001-fvalue.html-add-label-that-can-be-styled.patch} (100%) delete mode 100644 patches/packages/luci/0001-libs-web-rename-template_parser-field-mmap-to-the-more-generic-data.patch delete mode 100644 patches/packages/luci/0002-libs-web-remove-strange-static-on-variable-declaration.patch delete mode 100644 patches/packages/luci/0003-libs-web-add-support-for-string-templates-to-the-template-parser.patch delete mode 100644 patches/packages/luci/0004-libs-web-add-support-for-string-templates-to-luci.template-module.patch diff --git a/modules b/modules index 04cac4ca..24370910 100644 --- a/modules +++ b/modules @@ -15,4 +15,4 @@ PACKAGES_ROUTING_COMMIT=1a999ad02b49a5ca1315d7f21555039372a6e4d5 PACKAGES_ROUTING_BRANCH=for-14.07 PACKAGES_LUCI_REPO=git://git.openwrt.org/project/luci.git -PACKAGES_LUCI_COMMIT=834961d9f34f5282f98a480196924a42541d1474 +PACKAGES_LUCI_COMMIT=108a146a38f3facc9bdfe1542e6144dc49a67317 diff --git a/patches/packages/luci/0005-fvalue.html-add-label-that-can-be-styled.patch b/patches/packages/luci/0001-fvalue.html-add-label-that-can-be-styled.patch similarity index 100% rename from patches/packages/luci/0005-fvalue.html-add-label-that-can-be-styled.patch rename to patches/packages/luci/0001-fvalue.html-add-label-that-can-be-styled.patch diff --git a/patches/packages/luci/0001-libs-web-rename-template_parser-field-mmap-to-the-more-generic-data.patch b/patches/packages/luci/0001-libs-web-rename-template_parser-field-mmap-to-the-more-generic-data.patch deleted file mode 100644 index dad16cfd..00000000 --- a/patches/packages/luci/0001-libs-web-rename-template_parser-field-mmap-to-the-more-generic-data.patch +++ /dev/null @@ -1,106 +0,0 @@ -From: Matthias Schiffer -Date: Fri, 16 May 2014 10:57:26 +0200 -Subject: libs/web: rename template_parser field "mmap" to the more generic "data" - -diff --git a/modules/base/src/template_parser.c b/modules/base/src/template_parser.c -index 6054451..fc8607b 100644 ---- a/modules/base/src/template_parser.c -+++ b/modules/base/src/template_parser.c -@@ -82,15 +82,15 @@ struct template_parser * template_open(const char *file) - goto err; - - parser->size = s.st_size; -- parser->mmap = mmap(NULL, parser->size, PROT_READ, MAP_PRIVATE, -+ parser->data = mmap(NULL, parser->size, PROT_READ, MAP_PRIVATE, - parser->fd, 0); - -- if (parser->mmap != MAP_FAILED) -+ if (parser->data != MAP_FAILED) - { -- parser->off = parser->mmap; -+ parser->off = parser->data; - parser->cur_chunk.type = T_TYPE_INIT; -- parser->cur_chunk.s = parser->mmap; -- parser->cur_chunk.e = parser->mmap; -+ parser->cur_chunk.s = parser->data; -+ parser->cur_chunk.e = parser->data; - - return parser; - } -@@ -108,8 +108,8 @@ void template_close(struct template_parser *parser) - if (parser->gc != NULL) - free(parser->gc); - -- if ((parser->mmap != NULL) && (parser->mmap != MAP_FAILED)) -- munmap(parser->mmap, parser->size); -+ if ((parser->data != NULL) && (parser->data != MAP_FAILED)) -+ munmap(parser->data, parser->size); - - if (parser->fd >= 0) - close(parser->fd); -@@ -121,7 +121,7 @@ void template_text(struct template_parser *parser, const char *e) - { - const char *s = parser->off; - -- if (s < (parser->mmap + parser->size)) -+ if (s < (parser->data + parser->size)) - { - if (parser->strip_after) - { -@@ -291,7 +291,7 @@ template_format_chunk(struct template_parser *parser, size_t *sz) - const char *template_reader(lua_State *L, void *ud, size_t *sz) - { - struct template_parser *parser = ud; -- int rem = parser->size - (parser->off - parser->mmap); -+ int rem = parser->size - (parser->off - parser->data); - char *tag; - - parser->prv_chunk = parser->cur_chunk; -@@ -314,8 +314,8 @@ const char *template_reader(lua_State *L, void *ud, size_t *sz) - } - else - { -- template_text(parser, parser->mmap + parser->size); -- parser->off = parser->mmap + parser->size; -+ template_text(parser, parser->data + parser->size); -+ parser->off = parser->data + parser->size; - } - } - -@@ -331,7 +331,7 @@ const char *template_reader(lua_State *L, void *ud, size_t *sz) - else - { - /* unexpected EOF */ -- template_code(parser, parser->mmap + parser->size); -+ template_code(parser, parser->data + parser->size); - - *sz = 1; - return "\033"; -@@ -366,12 +366,12 @@ int template_error(lua_State *L, struct template_parser *parser) - - if (strfind((char *)err, strlen(err), "'char(27)'", 10) != NULL) - { -- off = parser->mmap + parser->size; -+ off = parser->data + parser->size; - err = "'%>' expected before end of file"; - chunkline = 0; - } - -- for (ptr = parser->mmap; ptr < off; ptr++) -+ for (ptr = parser->data; ptr < off; ptr++) - if (*ptr == '\n') - line++; - -diff --git a/modules/base/src/template_parser.h b/modules/base/src/template_parser.h -index d1c6062..ad03cbc 100644 ---- a/modules/base/src/template_parser.h -+++ b/modules/base/src/template_parser.h -@@ -58,7 +58,7 @@ struct template_chunk { - struct template_parser { - int fd; - uint32_t size; -- char *mmap; -+ char *data; - char *off; - char *gc; - int line; diff --git a/patches/packages/luci/0002-libs-web-remove-strange-static-on-variable-declaration.patch b/patches/packages/luci/0002-libs-web-remove-strange-static-on-variable-declaration.patch deleted file mode 100644 index 8b9808c2..00000000 --- a/patches/packages/luci/0002-libs-web-remove-strange-static-on-variable-declaration.patch +++ /dev/null @@ -1,17 +0,0 @@ -From: Matthias Schiffer -Date: Fri, 16 May 2014 11:29:22 +0200 -Subject: libs/web: remove strange 'static' on variable declaration - -diff --git a/modules/base/src/template_parser.c b/modules/base/src/template_parser.c -index fc8607b..1aa5131 100644 ---- a/modules/base/src/template_parser.c -+++ b/modules/base/src/template_parser.c -@@ -66,7 +66,7 @@ static char *strfind(char *haystack, int hslen, const char *needle, int ndlen) - struct template_parser * template_open(const char *file) - { - struct stat s; -- static struct template_parser *parser; -+ struct template_parser *parser; - - if (!(parser = malloc(sizeof(*parser)))) - goto err; diff --git a/patches/packages/luci/0003-libs-web-add-support-for-string-templates-to-the-template-parser.patch b/patches/packages/luci/0003-libs-web-add-support-for-string-templates-to-the-template-parser.patch deleted file mode 100644 index 2770645a..00000000 --- a/patches/packages/luci/0003-libs-web-add-support-for-string-templates-to-the-template-parser.patch +++ /dev/null @@ -1,142 +0,0 @@ -From: Matthias Schiffer -Date: Fri, 16 May 2014 11:37:21 +0200 -Subject: libs/web: add support for string templates to the template parser - -diff --git a/modules/base/src/template_lualib.c b/modules/base/src/template_lualib.c -index 0d43641..1035611 100644 ---- a/modules/base/src/template_lualib.c -+++ b/modules/base/src/template_lualib.c -@@ -18,10 +18,8 @@ - - #include "template_lualib.h" - --int template_L_parse(lua_State *L) -+static int template_L_do_parse(lua_State *L, struct template_parser *parser, const char *chunkname) - { -- const char *file = luaL_checkstring(L, 1); -- struct template_parser *parser = template_open(file); - int lua_status, rv; - - if (!parser) -@@ -32,7 +30,7 @@ int template_L_parse(lua_State *L) - return 3; - } - -- lua_status = lua_load(L, template_reader, parser, file); -+ lua_status = lua_load(L, template_reader, parser, chunkname); - - if (lua_status == 0) - rv = 1; -@@ -44,6 +42,23 @@ int template_L_parse(lua_State *L) - return rv; - } - -+int template_L_parse(lua_State *L) -+{ -+ const char *file = luaL_checkstring(L, 1); -+ struct template_parser *parser = template_open(file); -+ -+ return template_L_do_parse(L, parser, file); -+} -+ -+int template_L_parse_string(lua_State *L) -+{ -+ size_t len; -+ const char *str = luaL_checklstring(L, 1, &len); -+ struct template_parser *parser = template_string(str, len); -+ -+ return template_L_do_parse(L, parser, "[string]"); -+} -+ - int template_L_utf8(lua_State *L) - { - size_t len = 0; -@@ -146,6 +161,7 @@ static int template_L_hash(lua_State *L) { - /* module table */ - static const luaL_reg R[] = { - { "parse", template_L_parse }, -+ { "parse_string", template_L_parse_string }, - { "utf8", template_L_utf8 }, - { "pcdata", template_L_pcdata }, - { "striptags", template_L_striptags }, -diff --git a/modules/base/src/template_parser.c b/modules/base/src/template_parser.c -index 1aa5131..c263fbf 100644 ---- a/modules/base/src/template_parser.c -+++ b/modules/base/src/template_parser.c -@@ -100,6 +100,36 @@ err: - return NULL; - } - -+struct template_parser * template_string(const char *str, uint32_t len) -+{ -+ struct template_parser *parser; -+ -+ if (!str) { -+ errno = EINVAL; -+ goto err; -+ } -+ -+ if (!(parser = malloc(sizeof(*parser)))) -+ goto err; -+ -+ memset(parser, 0, sizeof(*parser)); -+ parser->fd = -1; -+ -+ parser->size = len; -+ parser->data = (char*)str; -+ -+ parser->off = parser->data; -+ parser->cur_chunk.type = T_TYPE_INIT; -+ parser->cur_chunk.s = parser->data; -+ parser->cur_chunk.e = parser->data; -+ -+ return parser; -+ -+err: -+ template_close(parser); -+ return NULL; -+} -+ - void template_close(struct template_parser *parser) - { - if (!parser) -@@ -108,11 +138,14 @@ void template_close(struct template_parser *parser) - if (parser->gc != NULL) - free(parser->gc); - -- if ((parser->data != NULL) && (parser->data != MAP_FAILED)) -- munmap(parser->data, parser->size); -+ /* if file is not set, we were parsing a string */ -+ if (parser->file) { -+ if ((parser->data != NULL) && (parser->data != MAP_FAILED)) -+ munmap(parser->data, parser->size); - -- if (parser->fd >= 0) -- close(parser->fd); -+ if (parser->fd >= 0) -+ close(parser->fd); -+ } - - free(parser); - } -@@ -376,7 +409,7 @@ int template_error(lua_State *L, struct template_parser *parser) - line++; - - snprintf(msg, sizeof(msg), "Syntax error in %s:%d: %s", -- parser->file, line + chunkline, err ? err : "(unknown error)"); -+ parser->file ? parser->file : "[string]", line + chunkline, err ? err : "(unknown error)"); - - lua_pushnil(L); - lua_pushinteger(L, line + chunkline); -diff --git a/modules/base/src/template_parser.h b/modules/base/src/template_parser.h -index ad03cbc..a3200a2 100644 ---- a/modules/base/src/template_parser.h -+++ b/modules/base/src/template_parser.h -@@ -71,6 +71,7 @@ struct template_parser { - }; - - struct template_parser * template_open(const char *file); -+struct template_parser * template_string(const char *str, uint32_t len); - void template_close(struct template_parser *parser); - - const char *template_reader(lua_State *L, void *ud, size_t *sz); diff --git a/patches/packages/luci/0004-libs-web-add-support-for-string-templates-to-luci.template-module.patch b/patches/packages/luci/0004-libs-web-add-support-for-string-templates-to-luci.template-module.patch deleted file mode 100644 index 49504881..00000000 --- a/patches/packages/luci/0004-libs-web-add-support-for-string-templates-to-luci.template-module.patch +++ /dev/null @@ -1,67 +0,0 @@ -From: Matthias Schiffer -Date: Fri, 16 May 2014 11:48:42 +0200 -Subject: libs/web: add support for string templates to luci.template module - -diff --git a/modules/base/luasrc/template.lua b/modules/base/luasrc/template.lua -index 72127d1..ea01d3c 100644 ---- a/modules/base/luasrc/template.lua -+++ b/modules/base/luasrc/template.lua -@@ -50,6 +50,13 @@ function render(name, scope) - return Template(name):render(scope or getfenv(2)) - end - -+--- Render a template from a string. -+-- @param template Template string -+-- @param scope Scope to assign to template (optional) -+function render_string(template, scope) -+ return Template(nil, template):render(scope or getfenv(2)) -+end -+ - - -- Template class - Template = util.class() -@@ -59,11 +66,14 @@ Template.cache = setmetatable({}, {__mode = "v"}) - - - -- Constructor - Reads and compiles the template on-demand --function Template.__init__(self, name) -+function Template.__init__(self, name, template) -+ if name then -+ self.template = self.cache[name] -+ self.name = name -+ else -+ self.name = "[string]" -+ end - -- self.template = self.cache[name] -- self.name = name -- - -- Create a new namespace for this template - self.viewns = context.viewns - -@@ -72,16 +82,22 @@ function Template.__init__(self, name) - - -- Compile template - local err -- local sourcefile = viewdir .. "/" .. name .. ".htm" -+ local sourcefile - -- self.template, _, err = tparser.parse(sourcefile) -+ if name then -+ sourcefile = viewdir .. "/" .. name .. ".htm" -+ self.template, _, err = tparser.parse(sourcefile) -+ else -+ sourcefile = "[string]" -+ self.template, _, err = tparser.parse_string(template) -+ end - - -- If we have no valid template throw error, otherwise cache the template - if not self.template then - error("Failed to load template '" .. name .. "'.\n" .. - "Error while parsing template '" .. sourcefile .. "':\n" .. - (err or "Unknown syntax error")) -- else -+ elseif name then - self.cache[name] = self.template - end - end From bb7e6a69bd4e3771c4692b4ab7b856ab74b9e3b7 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Mon, 15 Sep 2014 16:40:14 +0200 Subject: [PATCH 056/100] Update Gluon modules --- modules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules b/modules index 24370910..6ea93c59 100644 --- a/modules +++ b/modules @@ -8,7 +8,7 @@ PACKAGES_OPENWRT_COMMIT=fe13c18ebfa8ccb5a6b0bada424fb591f0f765f0 PACKAGES_OPENWRT_BRANCH=for-14.07 PACKAGES_GLUON_REPO=git://github.com/freifunk-gluon/packages.git -PACKAGES_GLUON_COMMIT=f36a58e77d43dbc1165a5cfa8c890f9d2eb55de0 +PACKAGES_GLUON_COMMIT=b42c6a65febbd307017bf55ffe94aabd8661ad6e PACKAGES_ROUTING_REPO=git://github.com/openwrt-routing/packages.git PACKAGES_ROUTING_COMMIT=1a999ad02b49a5ca1315d7f21555039372a6e4d5 From a0fb847d555a4f0d263aa87f5e1bdbfb6ceb518c Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Mon, 15 Sep 2014 16:42:01 +0200 Subject: [PATCH 057/100] Update OpenWrt and packages --- modules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules b/modules index 6ea93c59..429c1683 100644 --- a/modules +++ b/modules @@ -1,10 +1,10 @@ GLUON_FEEDS='openwrt gluon routing luci' OPENWRT_REPO=git://git.openwrt.org/14.07/openwrt.git -OPENWRT_COMMIT=9d90bc20d4f823644b4b30dbe0e469e0e4369d35 +OPENWRT_COMMIT=509e1684180e155530ff4ed89fe0d44d3c639b0f PACKAGES_OPENWRT_REPO=git://github.com/openwrt/packages.git -PACKAGES_OPENWRT_COMMIT=fe13c18ebfa8ccb5a6b0bada424fb591f0f765f0 +PACKAGES_OPENWRT_COMMIT=dc260093e1409b89f4bf23386dac2f25c086f3a1 PACKAGES_OPENWRT_BRANCH=for-14.07 PACKAGES_GLUON_REPO=git://github.com/freifunk-gluon/packages.git From 3b0e596e089b870cc4dd36a998c0f43fc660820c Mon Sep 17 00:00:00 2001 From: Nils Schneider Date: Mon, 15 Sep 2014 19:26:30 +0200 Subject: [PATCH 058/100] docs: authorized-keys --- docs/features/authorized-keys.rst | 15 +++++++++++++++ docs/index.rst | 1 + 2 files changed, 16 insertions(+) create mode 100644 docs/features/authorized-keys.rst diff --git a/docs/features/authorized-keys.rst b/docs/features/authorized-keys.rst new file mode 100644 index 00000000..1ecb42df --- /dev/null +++ b/docs/features/authorized-keys.rst @@ -0,0 +1,15 @@ +Adding SSH public keys +====================== + +By using the package ``gluon-authorized-keys`` it is possible to add +SSH public keys to an image to permit root login. + +If you select this package, add a list of authorized keys to ``site.conf`` like this::: + + { + authorized_keys: { 'ssh-rsa AAA.... user1@host', + 'ssh-rsa AAA.... user2@host } + hostname_prefix: ... + ... + +Existing keys in ``/etc/dropbear/authorized_keys`` will be preserved. diff --git a/docs/index.rst b/docs/index.rst index 1e616a1b..f7a4e8b3 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -26,6 +26,7 @@ Features features/private-wlan features/mesh-on-wan features/announce + features/authorized-keys Developer Documentation ----------------------- From 0d3a429a517ae95b22001bf7ac9e2c85b6193fb6 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Mon, 15 Sep 2014 20:07:49 +0200 Subject: [PATCH 059/100] Update Gluon packages --- modules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules b/modules index 429c1683..7e853ac5 100644 --- a/modules +++ b/modules @@ -8,7 +8,7 @@ PACKAGES_OPENWRT_COMMIT=dc260093e1409b89f4bf23386dac2f25c086f3a1 PACKAGES_OPENWRT_BRANCH=for-14.07 PACKAGES_GLUON_REPO=git://github.com/freifunk-gluon/packages.git -PACKAGES_GLUON_COMMIT=b42c6a65febbd307017bf55ffe94aabd8661ad6e +PACKAGES_GLUON_COMMIT=10ea4ecd558435aa6249aa29c41d0d960f4cb03e PACKAGES_ROUTING_REPO=git://github.com/openwrt-routing/packages.git PACKAGES_ROUTING_COMMIT=1a999ad02b49a5ca1315d7f21555039372a6e4d5 From d61c063f7dc301ec0a2a5f45745a4f7ca5477c5a Mon Sep 17 00:00:00 2001 From: poldy79 Date: Wed, 24 Sep 2014 23:08:04 +0200 Subject: [PATCH 060/100] Just corrected a typo --- docs/dev/hardware.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/dev/hardware.rst b/docs/dev/hardware.rst index 751c94e0..694a8cd9 100644 --- a/docs/dev/hardware.rst +++ b/docs/dev/hardware.rst @@ -45,7 +45,7 @@ The final image name must be the same that is returned by the following command. lua -e 'print(require("platform_info").get_image_name())' -This is so the autoupdater can work. On targets with aren't supported by the autoupdater, +This is so the autoupdater can work. On targets which aren't supported by the autoupdater, ``require("platform_info").get_image_name()`` will just return ``nil`` and the final image name may be defined arbitrarily. From 68a2599f6e4cc05a42161fc084361171ad377eea Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Fri, 3 Oct 2014 00:13:04 +0200 Subject: [PATCH 061/100] Update upstream repos --- modules | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules b/modules index 7e853ac5..a57b40d8 100644 --- a/modules +++ b/modules @@ -1,17 +1,17 @@ GLUON_FEEDS='openwrt gluon routing luci' OPENWRT_REPO=git://git.openwrt.org/14.07/openwrt.git -OPENWRT_COMMIT=509e1684180e155530ff4ed89fe0d44d3c639b0f +OPENWRT_COMMIT=d26726dbc72127ee4d32c50a07da6e9e1ea6930b PACKAGES_OPENWRT_REPO=git://github.com/openwrt/packages.git -PACKAGES_OPENWRT_COMMIT=dc260093e1409b89f4bf23386dac2f25c086f3a1 +PACKAGES_OPENWRT_COMMIT=04e21e66e2cb75c2d3beed20d4ddaba59b7558f0 PACKAGES_OPENWRT_BRANCH=for-14.07 PACKAGES_GLUON_REPO=git://github.com/freifunk-gluon/packages.git PACKAGES_GLUON_COMMIT=10ea4ecd558435aa6249aa29c41d0d960f4cb03e PACKAGES_ROUTING_REPO=git://github.com/openwrt-routing/packages.git -PACKAGES_ROUTING_COMMIT=1a999ad02b49a5ca1315d7f21555039372a6e4d5 +PACKAGES_ROUTING_COMMIT=c08fe48bcd3a38d47387eb6dd8474770847e3b66 PACKAGES_ROUTING_BRANCH=for-14.07 PACKAGES_LUCI_REPO=git://git.openwrt.org/project/luci.git From 17cefcdae13f4fd741c20a2e8039adc1f7e5b1ab Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Fri, 3 Oct 2014 00:49:24 +0200 Subject: [PATCH 062/100] Update gluon packages --- modules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules b/modules index a57b40d8..b1dbc865 100644 --- a/modules +++ b/modules @@ -8,7 +8,7 @@ PACKAGES_OPENWRT_COMMIT=04e21e66e2cb75c2d3beed20d4ddaba59b7558f0 PACKAGES_OPENWRT_BRANCH=for-14.07 PACKAGES_GLUON_REPO=git://github.com/freifunk-gluon/packages.git -PACKAGES_GLUON_COMMIT=10ea4ecd558435aa6249aa29c41d0d960f4cb03e +PACKAGES_GLUON_COMMIT=567b8133f3e02324cbfe4f1e73115e802eab21c9 PACKAGES_ROUTING_REPO=git://github.com/openwrt-routing/packages.git PACKAGES_ROUTING_COMMIT=c08fe48bcd3a38d47387eb6dd8474770847e3b66 From 371e9e6abbd441e4d2746ceec37ddc66bd5dbb1f Mon Sep 17 00:00:00 2001 From: permanentmedia Date: Fri, 3 Oct 2014 23:29:51 +0200 Subject: [PATCH 063/100] Update site.rst Added Braunschweig to site-repos in the wild --- docs/user/site.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/user/site.rst b/docs/user/site.rst index b85a3919..b7cbd6bf 100644 --- a/docs/user/site.rst +++ b/docs/user/site.rst @@ -211,6 +211,7 @@ site-repos in the wild This is a non-exhaustive list of site-repos from various communities: +* `site-ffbs `_ (Braunschweig) * `site-ffhb `_ (Bremen) * `site-ffhh `_ (Hamburg) * `site-ffhgw `_ (Greifswald) From 54404ae9b2a56546671576f9766776fc03113478 Mon Sep 17 00:00:00 2001 From: Patrick Uven Date: Sat, 4 Oct 2014 09:24:20 +0200 Subject: [PATCH 064/100] Update site.rst The community has been renamed from Oldenburg (ffol) to Nordwest (ffnw) to include other cities. Also the git url has changed. --- docs/user/site.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/user/site.rst b/docs/user/site.rst index b7cbd6bf..4983a5cd 100644 --- a/docs/user/site.rst +++ b/docs/user/site.rst @@ -219,6 +219,6 @@ This is a non-exhaustive list of site-repos from various communities: * `site-ffmd `_ (Magdeburg) * `site-ffmz `_ (Mainz & Wiesbaden) * `site-ffm `_ (München) -* `siteconf-ffol `_ (Oldenburg) +* `site-ffnw `_ (Nordwest) * `site-ffpb `_ (Paderborn) * `site-ffka `_ (Karlsruhe) From 721b31b4c5705a2fba35fb794a6589a3d733a4c7 Mon Sep 17 00:00:00 2001 From: Kokel Date: Sat, 4 Oct 2014 11:10:51 +0200 Subject: [PATCH 065/100] url and community name changed --- docs/user/site.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/user/site.rst b/docs/user/site.rst index b7cbd6bf..fd444bbd 100644 --- a/docs/user/site.rst +++ b/docs/user/site.rst @@ -217,7 +217,7 @@ This is a non-exhaustive list of site-repos from various communities: * `site-ffhgw `_ (Greifswald) * `site-ffhl `_ (Lübeck) * `site-ffmd `_ (Magdeburg) -* `site-ffmz `_ (Mainz & Wiesbaden) +* `site-ffmz `_ (Mainz, Wiesbaden & Umgebung) * `site-ffm `_ (München) * `siteconf-ffol `_ (Oldenburg) * `site-ffpb `_ (Paderborn) From 24a41deea1ff22f6bd1bc771e941c5c916f2e809 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Sun, 5 Oct 2014 15:30:54 +0200 Subject: [PATCH 066/100] Update gluon packages --- modules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules b/modules index b1dbc865..95197d83 100644 --- a/modules +++ b/modules @@ -8,7 +8,7 @@ PACKAGES_OPENWRT_COMMIT=04e21e66e2cb75c2d3beed20d4ddaba59b7558f0 PACKAGES_OPENWRT_BRANCH=for-14.07 PACKAGES_GLUON_REPO=git://github.com/freifunk-gluon/packages.git -PACKAGES_GLUON_COMMIT=567b8133f3e02324cbfe4f1e73115e802eab21c9 +PACKAGES_GLUON_COMMIT=a4a75281db96e975ca2fa13f7ea248ba3b382156 PACKAGES_ROUTING_REPO=git://github.com/openwrt-routing/packages.git PACKAGES_ROUTING_COMMIT=c08fe48bcd3a38d47387eb6dd8474770847e3b66 From abc189b3379f0319fd802e107508241cf7e8f2d2 Mon Sep 17 00:00:00 2001 From: Kokel Date: Sun, 5 Oct 2014 16:06:13 +0200 Subject: [PATCH 067/100] add support for Buffalo WZR-HP-AG300H --- targets/ar71xx-generic/profiles.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/targets/ar71xx-generic/profiles.mk b/targets/ar71xx-generic/profiles.mk index 0149cd2a..7d91fc0b 100644 --- a/targets/ar71xx-generic/profiles.mk +++ b/targets/ar71xx-generic/profiles.mk @@ -117,3 +117,7 @@ $(eval $(call GluonModel,WRT160NL,wrt160nl-squashfs,linksys-wrt160nl)) # WZR-HP-G450H $(eval $(call GluonProfile,WZRHPG450H)) $(eval $(call GluonModel,WZRHPG450H,wzr-hp-g450h-squashfs,buffalo-wzr-hp-g450h)) + +# WZR-HP-AG300H +$(eval $(call GluonProfile,WZRHPAG300H)) +$(eval $(call GluonModel,WZRHPAG300H,wzr-hp-ag300h-squashfs,buffalo-wzr-hp-ag300h)) From a8b16a3723d172dd8e7d136af3ecd07689ccb81e Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Tue, 7 Oct 2014 18:23:17 +0200 Subject: [PATCH 068/100] Update OpenWrt and packages --- modules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules b/modules index 95197d83..f7afcc44 100644 --- a/modules +++ b/modules @@ -1,10 +1,10 @@ GLUON_FEEDS='openwrt gluon routing luci' OPENWRT_REPO=git://git.openwrt.org/14.07/openwrt.git -OPENWRT_COMMIT=d26726dbc72127ee4d32c50a07da6e9e1ea6930b +OPENWRT_COMMIT=bdfd3533fc9020419cde427afa2cba51402bf20d PACKAGES_OPENWRT_REPO=git://github.com/openwrt/packages.git -PACKAGES_OPENWRT_COMMIT=04e21e66e2cb75c2d3beed20d4ddaba59b7558f0 +PACKAGES_OPENWRT_COMMIT=e6ea22ec3c2e3f6a7a22291a5af499b639543e2e PACKAGES_OPENWRT_BRANCH=for-14.07 PACKAGES_GLUON_REPO=git://github.com/freifunk-gluon/packages.git From 72f6b853931b8b6327355cd27d91486ca48e44db Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Tue, 7 Oct 2014 19:35:23 +0200 Subject: [PATCH 069/100] Update kernel configs and references to Barrier Breaker final mpc85xx and x86 are unchanged since rc3. --- include/gluon.mk | 2 +- targets/ar71xx-generic/kernel-config | 1 + targets/ar71xx-generic/kernel-vermagic | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/gluon.mk b/include/gluon.mk index 84da5449..53afa831 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/barrier_breaker/14.07-rc3/%S/packages) +CONFIG_VERSION_REPO := $(shell $(GLUONDIR)/scripts/site.sh opkg_repo || echo http://downloads.openwrt.org/barrier_breaker/14.07/%S/packages) export CONFIG_VERSION_REPO GLUON_SITE_CODE := $(shell $(GLUONDIR)/scripts/site.sh site_code) diff --git a/targets/ar71xx-generic/kernel-config b/targets/ar71xx-generic/kernel-config index 1f5a4c29..b216d158 100644 --- a/targets/ar71xx-generic/kernel-config +++ b/targets/ar71xx-generic/kernel-config @@ -107,6 +107,7 @@ CONFIG_ATH79_MACH_WRT400N=y # CONFIG_ATH79_MACH_RB95X is not set # CONFIG_ATH79_MACH_RB2011 is not set # CONFIG_ATH79_MACH_RBSXTLITE is not set +CONFIG_ATH79_MACH_SMART_300=y CONFIG_ATH79_MACH_WNDAP360=y CONFIG_ATH79_MACH_WNDR3700=y CONFIG_ATH79_MACH_WNDR4300=y diff --git a/targets/ar71xx-generic/kernel-vermagic b/targets/ar71xx-generic/kernel-vermagic index 26b1c0c9..7a493135 100644 --- a/targets/ar71xx-generic/kernel-vermagic +++ b/targets/ar71xx-generic/kernel-vermagic @@ -1 +1 @@ -94831e5bcf361d1c03e87a15e152b0e8 +0114c71ed85677c9c1e4911437af4743 From 853f716a90ff9b59a55349980b721c6eee87c6bf Mon Sep 17 00:00:00 2001 From: s72785 Date: Wed, 8 Oct 2014 23:38:58 +0200 Subject: [PATCH 070/100] Update getting_started.rst noob-proofing a bit --- docs/user/getting_started.rst | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/docs/user/getting_started.rst b/docs/user/getting_started.rst index 606e650c..11d15f0a 100644 --- a/docs/user/getting_started.rst +++ b/docs/user/getting_started.rst @@ -1,7 +1,18 @@ Getting Started =============== -To build Gluon, after checking out the repository change to the source root directory +To build Gluon, first check out the repository: + +:: + + git clone git://github.com/freifunk-gluon gluon # Get the gluon repo + +after that change to the source root directory: + +:: + + cd gluon # go to the recently created directory + to perform the following commands: :: @@ -10,8 +21,9 @@ to perform the following commands: make update # Get other repositories used by Gluon make # Build Gluon -When calling make, the OpenWRT build environment is prepared/updated. To rebuild -the images only, just use: +When calling make, the OpenWRT build environment is prepared/updated. +In case of errors read the messages carefully and try to fix the stated issues (e.g. install tools not available yet). +To rebuild the images only, just use: :: From d8bb316a5786f29a7daf62e1a61435b72ba3d0d2 Mon Sep 17 00:00:00 2001 From: Patrick Uven Date: Sun, 12 Oct 2014 12:17:02 +0200 Subject: [PATCH 071/100] Added informations about gluon versions to getting started --- docs/user/getting_started.rst | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/docs/user/getting_started.rst b/docs/user/getting_started.rst index 606e650c..d62f7dd7 100644 --- a/docs/user/getting_started.rst +++ b/docs/user/getting_started.rst @@ -1,6 +1,22 @@ Getting Started =============== +Selecting the right version +--------------------------- + +The versions of gluon are managed with tags and branches. Every tag is a stable release (like v2014.2 or v2014.3.1), every branch is a development branch, where 2014.3.x is a branch for 2014.3 bugfix releases and master is the unstable branch for the upcoming release. Branches should be used for development purposes, while tags can be used for productive releases. To check out a branch do: + +:: + + git clone https://github.com/freifunk-gluon/gluon.git gluon + cd gluon + git checkout v2014.3 + +Please keep in mind that you need the appropriate site configuration for that gluon version. + +Building the image +------------------ + To build Gluon, after checking out the repository change to the source root directory to perform the following commands: From b21e3b0c95f0420214783933c9fe81386606018a Mon Sep 17 00:00:00 2001 From: Patrick Uven Date: Sun, 12 Oct 2014 12:19:58 +0200 Subject: [PATCH 072/100] Some small correction to getting started --- docs/user/getting_started.rst | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/docs/user/getting_started.rst b/docs/user/getting_started.rst index d62f7dd7..306eeb36 100644 --- a/docs/user/getting_started.rst +++ b/docs/user/getting_started.rst @@ -4,7 +4,7 @@ Getting Started Selecting the right version --------------------------- -The versions of gluon are managed with tags and branches. Every tag is a stable release (like v2014.2 or v2014.3.1), every branch is a development branch, where 2014.3.x is a branch for 2014.3 bugfix releases and master is the unstable branch for the upcoming release. Branches should be used for development purposes, while tags can be used for productive releases. To check out a branch do: +The versions of gluon are managed with tags and branches. Every tag is a stable release (like v2014.2 or v2014.3.1), every branch is a development branch, where 2014.3.x is a branch for 2014.3 bugfix releases and master is the unstable branch for the upcoming release. Branches should be used for development purposes, while tags can be used for productive releases. To check out a tag do: :: @@ -17,8 +17,7 @@ Please keep in mind that you need the appropriate site configuration for that gl Building the image ------------------ -To build Gluon, after checking out the repository change to the source root directory -to perform the following commands: +To build Gluon, after checking out the repository change to the source root directory as shown above and perform the following commands: :: From 18a20df703533e7d25399fe0e3bac8821518e41e Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Sun, 12 Oct 2014 16:51:33 +0200 Subject: [PATCH 073/100] Fix Buffalo WZR-HP-AG300H/WZR-600DHP image name --- targets/ar71xx-generic/profiles.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/targets/ar71xx-generic/profiles.mk b/targets/ar71xx-generic/profiles.mk index 7d91fc0b..9755dced 100644 --- a/targets/ar71xx-generic/profiles.mk +++ b/targets/ar71xx-generic/profiles.mk @@ -118,6 +118,6 @@ $(eval $(call GluonModel,WRT160NL,wrt160nl-squashfs,linksys-wrt160nl)) $(eval $(call GluonProfile,WZRHPG450H)) $(eval $(call GluonModel,WZRHPG450H,wzr-hp-g450h-squashfs,buffalo-wzr-hp-g450h)) -# WZR-HP-AG300H +# WZR-HP-AG300H/WZR-600DHP $(eval $(call GluonProfile,WZRHPAG300H)) -$(eval $(call GluonModel,WZRHPAG300H,wzr-hp-ag300h-squashfs,buffalo-wzr-hp-ag300h)) +$(eval $(call GluonModel,WZRHPAG300H,wzr-hp-ag300h-squashfs,buffalo-wzr-hp-ag300h-wzr-600dhp)) From 9277648302cf9af430e3c0974519419b7fc7b946 Mon Sep 17 00:00:00 2001 From: Jan-Philipp Litza Date: Sun, 12 Oct 2014 23:06:48 +0200 Subject: [PATCH 074/100] Simplify git commands in Getting Started --- docs/user/getting_started.rst | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/user/getting_started.rst b/docs/user/getting_started.rst index 306eeb36..d7e6b8d3 100644 --- a/docs/user/getting_started.rst +++ b/docs/user/getting_started.rst @@ -8,9 +8,8 @@ The versions of gluon are managed with tags and branches. Every tag is a stable :: - git clone https://github.com/freifunk-gluon/gluon.git gluon + git clone -b v2014.3 https://github.com/freifunk-gluon/gluon.git gluon cd gluon - git checkout v2014.3 Please keep in mind that you need the appropriate site configuration for that gluon version. From d0a113dc160ac6de7a31d8c34f33c1eddb8b81b3 Mon Sep 17 00:00:00 2001 From: poldy79 Date: Sun, 12 Oct 2014 23:53:11 +0200 Subject: [PATCH 075/100] Adding support for TL-WA750RE I have this little gadget. I've build gluon for this target and it seems that everything works well. Using this thing in the Stuttgart community (currently testing gluon). --- targets/ar71xx-generic/profiles.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/targets/ar71xx-generic/profiles.mk b/targets/ar71xx-generic/profiles.mk index 9755dced..0ba47b59 100644 --- a/targets/ar71xx-generic/profiles.mk +++ b/targets/ar71xx-generic/profiles.mk @@ -56,6 +56,10 @@ $(eval $(call GluonModel,TLWDR4300,tl-wdr3500-v1-squashfs,tp-link-tl-wdr3500-v1) $(eval $(call GluonModel,TLWDR4300,tl-wdr3600-v1-squashfs,tp-link-tl-wdr3600-v1)) $(eval $(call GluonModel,TLWDR4300,tl-wdr4300-v1-squashfs,tp-link-tl-wdr4300-v1)) +# TL-WA750RE v1 +$(eval $(call GluonProfile,TLWA750)) +$(eval $(call GluonModel,TLWA750,tl-wa750re-v1-squashfs,tp-link-tl-wa750re-v1)) + # TL-WA901N/ND v2 $(eval $(call GluonProfile,TLWA901)) $(eval $(call GluonModel,TLWA901,tl-wa901nd-v2-squashfs,tp-link-tl-wa901n-nd-v2)) From b9501362adf73e253122ff85efabdb0a8891dbf2 Mon Sep 17 00:00:00 2001 From: Nils Schneider Date: Mon, 13 Oct 2014 12:29:24 +0200 Subject: [PATCH 076/100] docs: advise user to checkout a specific release --- docs/user/getting_started.rst | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/user/getting_started.rst b/docs/user/getting_started.rst index e7a7712a..3b3bf234 100644 --- a/docs/user/getting_started.rst +++ b/docs/user/getting_started.rst @@ -28,11 +28,12 @@ Building the image .. _Git identity: http://git-scm.com/book/en/Getting-Started-First-Time-Git-Setup#Your-Identity -To build Gluon, first check out the repository: +To build Gluon, first check out the repository. Replace *RELEASE* with the +version you'd like to checkout, e.g. *v2014.3*. :: - git clone https://github.com/freifunk-gluon/gluon.git gluon -b v2014.3 + git clone https://github.com/freifunk-gluon/gluon.git gluon -b RELEASE This command will create a directory named *gluon/*. It might also tell a scary message about being in a *detached state*. From 90c9ebde43c28e39b68d94dcc09ad8e105ee00c7 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Thu, 16 Oct 2014 20:50:00 +0200 Subject: [PATCH 077/100] Overwrite opkg.conf to work with the upstream repositories --- Makefile | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/Makefile b/Makefile index e9d770c0..ac52fb00 100644 --- a/Makefile +++ b/Makefile @@ -314,12 +314,25 @@ package_install: FORCE rm -f $(TARGET_DIR)/usr/lib/opkg/lists/* $(TARGET_DIR)/tmp/opkg.lock +ifeq ($(GLUON_OPKG_CONFIG),1) +include $(INCLUDE_DIR)/version.mk +endif + +opkg_config: FORCE + cp $(GLUON_OPENWRTDIR)/package/system/opkg/files/opkg.conf $(TARGET_DIR)/etc/opkg.conf + for d in base luci packages routing telephony management oldpackages; do \ + echo "src/gz %n_$$d %U/$$d" >> $(TARGET_DIR)/etc/opkg.conf; \ + done + $(VERSION_SED) $(TARGET_DIR)/etc/opkg.conf + + image: FORCE rm -rf $(TARGET_DIR) $(BIN_DIR) $(TMP_DIR) $(PROFILE_KDIR) mkdir -p $(TARGET_DIR) $(BIN_DIR) $(TMP_DIR) $(TARGET_DIR)/tmp $(GLUON_IMAGEDIR)/factory $(GLUON_IMAGEDIR)/sysupgrade cp -r $(BOARD_KDIR) $(PROFILE_KDIR) +$(GLUONMAKE) package_install + +$(GLUONMAKE) opkg_config GLUON_OPKG_CONFIG=1 $(call Image/mkfs/prepare) $(_SINGLE)$(NO_TRACE_MAKE) -C $(TOPDIR)/target/linux/$(BOARD)/image install TARGET_BUILD=1 IB=1 IMG_PREFIX=gluon \ From cfd4b8cb92afd3f342a60849e705578f3354a154 Mon Sep 17 00:00:00 2001 From: Nils Schneider Date: Fri, 17 Oct 2014 14:31:12 +0200 Subject: [PATCH 078/100] release notes for 2014.3.1 --- docs/index.rst | 1 + docs/releases/v2014.3.1.rst | 27 +++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 docs/releases/v2014.3.1.rst diff --git a/docs/index.rst b/docs/index.rst index f7a4e8b3..7a1d5c74 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -81,6 +81,7 @@ Releases :maxdepth: 1 releases/v2014.4 + releases/v2014.3.1 releases/v2014.3 diff --git a/docs/releases/v2014.3.1.rst b/docs/releases/v2014.3.1.rst new file mode 100644 index 00000000..d08b4009 --- /dev/null +++ b/docs/releases/v2014.3.1.rst @@ -0,0 +1,27 @@ +Gluon 2014.3.1 +============== + +This is a bugfix release. + +Bug fixes +~~~~~~~~~ + +* a bug (zombie processes) in gluon-announced has been fixed +* fastd peers removed from site.conf will be removed from fastd's config +* mesh-vpn-fastd can now be enabled by default from site.conf +* expertmode: setting a password will not remove SSH keys anymore +* expertmode: WAN can be configured statically (instead of DHCP/RA) + +Minor Changes +~~~~~~~~~~~~~ + +* alfred has been updated to 2014.3.0 +* OpenWrt has been updated + +Site changes +~~~~~~~~~~~~ + +* ``site.conf`` + + - New option ``fastd_mesh_vpn.enabled`` (boolean, optional). + From 396f5ded659e4f530a5cfa7ad5d37471479afec6 Mon Sep 17 00:00:00 2001 From: poldy79 Date: Fri, 17 Oct 2014 22:03:34 +0200 Subject: [PATCH 079/100] Adding support for TL-WA850RE MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit basic wifi meshing with neighbouring nodes tested, with TL-WA750RE client WLAN (if applicable) works client lan on LAN ports (if applicable) n/a - only 1x Ethernet mesh-vpn on WAN port works mesh-on-wan Not tested re-entering configmode by pressing the button for >3 seconds works. entering failsafe mode works whether the MAC address seen by Gluon is the one printed on the device yes Und folgende Kommandos: tail /lib/gluon/core/sysconfig/* brctl show lua -e "print(require('platform_info').get_image_name())" root@XXX:~# tail /lib/gluon/core/sysconfig/* ==> /lib/gluon/core/sysconfig/primary_mac <== (macwieaufgerätaufgedruckt) ==> /lib/gluon/core/sysconfig/setup_ifname <== eth0 ==> /lib/gluon/core/sysconfig/wan_ifname <== eth0 root@XXX:~# brctl show bridge name bridge id STP enabled interfaces br-wan 7fff.(primarymac) no eth0 br-client 7fff.(primarymac) no bat0 wlan0-1 root@XXXX:~# lua -e "print(require('platform_info').get_image_name())" tp-link-tl-wa850re-v1 --- targets/ar71xx-generic/profiles.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/targets/ar71xx-generic/profiles.mk b/targets/ar71xx-generic/profiles.mk index 0ba47b59..de63e7cc 100644 --- a/targets/ar71xx-generic/profiles.mk +++ b/targets/ar71xx-generic/profiles.mk @@ -60,6 +60,10 @@ $(eval $(call GluonModel,TLWDR4300,tl-wdr4300-v1-squashfs,tp-link-tl-wdr4300-v1) $(eval $(call GluonProfile,TLWA750)) $(eval $(call GluonModel,TLWA750,tl-wa750re-v1-squashfs,tp-link-tl-wa750re-v1)) +# TL-WA850RE v1 +$(eval $(call GluonProfile,TLWA850)) +$(eval $(call GluonModel,TLWA850,tl-wa850re-v1-squashfs,tp-link-tl-wa850re-v1)) + # TL-WA901N/ND v2 $(eval $(call GluonProfile,TLWA901)) $(eval $(call GluonModel,TLWA901,tl-wa901nd-v2-squashfs,tp-link-tl-wa901n-nd-v2)) From d2d1ea36cc00a02796159d3bd3ce4f52bac743a9 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Sun, 19 Oct 2014 18:31:13 +0200 Subject: [PATCH 080/100] Extend v2014.3.1 release notes --- docs/releases/v2014.3.1.rst | 35 ++++++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/docs/releases/v2014.3.1.rst b/docs/releases/v2014.3.1.rst index d08b4009..4a662d91 100644 --- a/docs/releases/v2014.3.1.rst +++ b/docs/releases/v2014.3.1.rst @@ -3,25 +3,38 @@ Gluon 2014.3.1 This is a bugfix release. -Bug fixes -~~~~~~~~~ +Bugfixes +~~~~~~~~ -* a bug (zombie processes) in gluon-announced has been fixed -* fastd peers removed from site.conf will be removed from fastd's config -* mesh-vpn-fastd can now be enabled by default from site.conf -* expertmode: setting a password will not remove SSH keys anymore -* expertmode: WAN can be configured statically (instead of DHCP/RA) +* gluon-announced zombie process bug -Minor Changes -~~~~~~~~~~~~~ + gluon-announced was creating zombie processes when answering requests, causing issues + with the new status page which is currently in development. +* fastd peers removed from ``site.conf`` weren't removed correctly from the fastd configuration + on firmware upgrades +* Expert Mode: setting a password will not remove SSH keys anymore * alfred has been updated to 2014.3.0 -* OpenWrt has been updated + + We hope this solves the alfred stability issues noted by several people. + +* ``gluon-ebtables-filter-ra-dhcp`` and ``gluon-ebtables-filter-multicast`` have been fixed + to allow DHCPv6 to work + +* Another ath9k patch has been added, which might further improve WLAN stability and performance + +New features +~~~~~~~~~~~~ + +* Support for static WAN setups instead of (DHCP/Router Advertisement) has been added; + configuration is possible on the port config page of the Expert Mode. Site changes ~~~~~~~~~~~~ * ``site.conf`` - - New option ``fastd_mesh_vpn.enabled`` (boolean, optional). + - The new boolean option ``fastd_mesh_vpn.enabled`` allows + enabling the mesh VPN by default. This value is optional; + if it isn't specified, the mesh VPN will be disabled. From 5592c94b385ca34df6a4148393271c88b02c8fa0 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Sun, 19 Oct 2014 19:51:44 +0200 Subject: [PATCH 081/100] Update Gluon packages --- modules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules b/modules index f7afcc44..d78abff5 100644 --- a/modules +++ b/modules @@ -8,7 +8,7 @@ PACKAGES_OPENWRT_COMMIT=e6ea22ec3c2e3f6a7a22291a5af499b639543e2e PACKAGES_OPENWRT_BRANCH=for-14.07 PACKAGES_GLUON_REPO=git://github.com/freifunk-gluon/packages.git -PACKAGES_GLUON_COMMIT=a4a75281db96e975ca2fa13f7ea248ba3b382156 +PACKAGES_GLUON_COMMIT=8a349f41313b5b3b5e0f6738082c77e5d931459b PACKAGES_ROUTING_REPO=git://github.com/openwrt-routing/packages.git PACKAGES_ROUTING_COMMIT=c08fe48bcd3a38d47387eb6dd8474770847e3b66 From ec88043a583a851c8cf2adb45ba90efdd3c62ac1 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Sun, 19 Oct 2014 20:15:42 +0200 Subject: [PATCH 082/100] Update OpenWrt (and packages) --- modules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules b/modules index d78abff5..377ec359 100644 --- a/modules +++ b/modules @@ -1,10 +1,10 @@ GLUON_FEEDS='openwrt gluon routing luci' OPENWRT_REPO=git://git.openwrt.org/14.07/openwrt.git -OPENWRT_COMMIT=bdfd3533fc9020419cde427afa2cba51402bf20d +OPENWRT_COMMIT=22808d019dc6d2afd8946036740ea3caf84e5f5b PACKAGES_OPENWRT_REPO=git://github.com/openwrt/packages.git -PACKAGES_OPENWRT_COMMIT=e6ea22ec3c2e3f6a7a22291a5af499b639543e2e +PACKAGES_OPENWRT_COMMIT=d83d5f680683c9266be8302e27e49e649ad871d9 PACKAGES_OPENWRT_BRANCH=for-14.07 PACKAGES_GLUON_REPO=git://github.com/freifunk-gluon/packages.git From a8b7c39078aa70291cf5af022f520b624b8f58aa Mon Sep 17 00:00:00 2001 From: Nils Schneider Date: Thu, 6 Nov 2014 15:36:14 +0100 Subject: [PATCH 083/100] docs: fix syntax in gluon-authorized-keys --- docs/features/authorized-keys.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/features/authorized-keys.rst b/docs/features/authorized-keys.rst index 1ecb42df..b3b0aaf6 100644 --- a/docs/features/authorized-keys.rst +++ b/docs/features/authorized-keys.rst @@ -7,9 +7,9 @@ SSH public keys to an image to permit root login. If you select this package, add a list of authorized keys to ``site.conf`` like this::: { - authorized_keys: { 'ssh-rsa AAA.... user1@host', - 'ssh-rsa AAA.... user2@host } - hostname_prefix: ... + authorized_keys = { 'ssh-rsa AAA.... user1@host', + 'ssh-rsa AAA.... user2@host }, + hostname_prefix = ... ... Existing keys in ``/etc/dropbear/authorized_keys`` will be preserved. From 2a507f27d2ff0a05449079629af6453d58d1c4a3 Mon Sep 17 00:00:00 2001 From: FRNK-BK Date: Wed, 12 Nov 2014 20:22:59 +0100 Subject: [PATCH 084/100] Update hardware.rst More information on how to get correct image file naming. --- docs/dev/hardware.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/dev/hardware.rst b/docs/dev/hardware.rst index 694a8cd9..0ea71dc1 100644 --- a/docs/dev/hardware.rst +++ b/docs/dev/hardware.rst @@ -45,7 +45,7 @@ The final image name must be the same that is returned by the following command. lua -e 'print(require("platform_info").get_image_name())' -This is so the autoupdater can work. On targets which aren't supported by the autoupdater, +This is just for the autoupdater can work. The command has to be executed _on_ the target (eg. the hardware router with a flashed image). So you'll first have to build an image with a guessed name, and afterwards build a new, correctly named image. On targets which aren't supported by the autoupdater, ``require("platform_info").get_image_name()`` will just return ``nil`` and the final image name may be defined arbitrarily. From 3949cf367d0323970bb167aed1e4d14b8271ad9e Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Thu, 13 Nov 2014 00:07:48 +0100 Subject: [PATCH 085/100] Update OpenWrt core and packages --- modules | 4 ++-- ...ls-Makefile-fix-host-tools-build-dependencies.patch | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/modules b/modules index 377ec359..d966a655 100644 --- a/modules +++ b/modules @@ -1,10 +1,10 @@ GLUON_FEEDS='openwrt gluon routing luci' OPENWRT_REPO=git://git.openwrt.org/14.07/openwrt.git -OPENWRT_COMMIT=22808d019dc6d2afd8946036740ea3caf84e5f5b +OPENWRT_COMMIT=58e9eadd67bf5f83b9546395ed68698ca574c6e2 PACKAGES_OPENWRT_REPO=git://github.com/openwrt/packages.git -PACKAGES_OPENWRT_COMMIT=d83d5f680683c9266be8302e27e49e649ad871d9 +PACKAGES_OPENWRT_COMMIT=e27831d568f5689602abae58f5ae92f060421ada PACKAGES_OPENWRT_BRANCH=for-14.07 PACKAGES_GLUON_REPO=git://github.com/freifunk-gluon/packages.git 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 c8ae9cd3..1a39c7bd 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 @@ -3,10 +3,10 @@ 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 9595d62..b8eef3f 100644 +index 13bb028..137ad61 100644 --- a/tools/Makefile +++ b/tools/Makefile -@@ -96,10 +96,16 @@ define PrepareStaging +@@ -97,10 +97,16 @@ define PrepareStaging endef # preparatory work @@ -23,7 +23,7 @@ index 9595d62..b8eef3f 100644 $(STAGING_DIR_HOST)/.prepared: $(TMP_DIR)/.build $(call PrepareStaging,$(STAGING_DIR_HOST)) -@@ -111,7 +117,7 @@ $(STAGING_DIR_HOST)/.prepared: $(TMP_DIR)/.build +@@ -112,7 +118,7 @@ $(STAGING_DIR_HOST)/.prepared: $(TMP_DIR)/.build define PrepareCommand @@ -32,7 +32,7 @@ index 9595d62..b8eef3f 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; \ -@@ -120,7 +126,7 @@ $(STAGING_DIR_HOST)/bin/$(1): $(STAGING_DIR)/.prepared +@@ -121,7 +127,7 @@ $(STAGING_DIR_HOST)/bin/$(1): $(STAGING_DIR)/.prepared endef endif @@ -41,7 +41,7 @@ index 9595d62..b8eef3f 100644 @rm -f $@ @if stat --version > /dev/null 2>&1; then \ ln -s `which stat` $@; \ -@@ -144,8 +150,8 @@ $(eval $(call PrepareCommand,tar,gtar tar)) +@@ -145,8 +151,8 @@ $(eval $(call PrepareCommand,tar,gtar tar)) $(eval $(call PrepareCommand,diff,gdiff diff)) $(curdir)/cmddeps = $(patsubst %,$(STAGING_DIR_HOST)/bin/%,md5sum cp stat seq python awk getopt grep tar diff) From 26eca3fcd62a4a98a8670f2b070e80797def7919 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Thu, 13 Nov 2014 00:11:40 +0100 Subject: [PATCH 086/100] Switch to new LuCi feed --- modules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules b/modules index d966a655..007b5f12 100644 --- a/modules +++ b/modules @@ -14,5 +14,5 @@ PACKAGES_ROUTING_REPO=git://github.com/openwrt-routing/packages.git PACKAGES_ROUTING_COMMIT=c08fe48bcd3a38d47387eb6dd8474770847e3b66 PACKAGES_ROUTING_BRANCH=for-14.07 -PACKAGES_LUCI_REPO=git://git.openwrt.org/project/luci.git -PACKAGES_LUCI_COMMIT=108a146a38f3facc9bdfe1542e6144dc49a67317 +PACKAGES_LUCI_REPO=git://github.com/openwrt/luci.git +PACKAGES_LUCI_COMMIT=f16df257b8ba224661d3707f7f69b43b4d47e36b From d42b20e8b8fdbe1f75c9de21bea35404aecc8d1e Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Thu, 13 Nov 2014 01:18:16 +0100 Subject: [PATCH 087/100] odhcp6c: always accept RDNSS, independent of the default router lifetime --- ...ndent-of-the-default-router-lifetime.patch | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 patches/openwrt/0004-odhcp6c-always-accept-RDNSS-independent-of-the-default-router-lifetime.patch diff --git a/patches/openwrt/0004-odhcp6c-always-accept-RDNSS-independent-of-the-default-router-lifetime.patch b/patches/openwrt/0004-odhcp6c-always-accept-RDNSS-independent-of-the-default-router-lifetime.patch new file mode 100644 index 00000000..21c81918 --- /dev/null +++ b/patches/openwrt/0004-odhcp6c-always-accept-RDNSS-independent-of-the-default-router-lifetime.patch @@ -0,0 +1,26 @@ +From: Matthias Schiffer +Date: Thu, 13 Nov 2014 01:17:24 +0100 +Subject: odhcp6c: always accept RDNSS, independent of the default router lifetime + +diff --git a/package/network/ipv6/odhcp6c/patches/001-always_accept_rdnss.patch b/package/network/ipv6/odhcp6c/patches/001-always_accept_rdnss.patch +new file mode 100644 +index 0000000..ae4e18d +--- /dev/null ++++ b/package/network/ipv6/odhcp6c/patches/001-always_accept_rdnss.patch +@@ -0,0 +1,16 @@ ++--- a/src/ra.c +++++ b/src/ra.c ++@@ -409,13 +409,6 @@ bool ra_process(void) ++ } ++ } ++ } ++- ++- size_t ra_dns_len; ++- struct odhcp6c_entry *entry = odhcp6c_get_state(STATE_RA_DNS, &ra_dns_len); ++- for (size_t i = 0; i < ra_dns_len / sizeof(*entry); ++i) ++- if (IN6_ARE_ADDR_EQUAL(&entry[i].router, &from.sin6_addr) && ++- entry[i].valid > router_valid) ++- entry[i].valid = router_valid; ++ } ++ ++ if (found) From 948fcef5dbf33a841aafa74a28ae2fb190c26209 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Thu, 13 Nov 2014 01:50:17 +0100 Subject: [PATCH 088/100] Update Gluon packages --- modules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules b/modules index 007b5f12..a295f092 100644 --- a/modules +++ b/modules @@ -8,7 +8,7 @@ PACKAGES_OPENWRT_COMMIT=e27831d568f5689602abae58f5ae92f060421ada PACKAGES_OPENWRT_BRANCH=for-14.07 PACKAGES_GLUON_REPO=git://github.com/freifunk-gluon/packages.git -PACKAGES_GLUON_COMMIT=8a349f41313b5b3b5e0f6738082c77e5d931459b +PACKAGES_GLUON_COMMIT=3e5206d4f4005569c99c6f74dc11779b0e590241 PACKAGES_ROUTING_REPO=git://github.com/openwrt-routing/packages.git PACKAGES_ROUTING_COMMIT=c08fe48bcd3a38d47387eb6dd8474770847e3b66 From a889b1276db1301098ca1296721ef20306f7b425 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Sat, 15 Nov 2014 18:49:40 +0100 Subject: [PATCH 089/100] Update OpenWrt base and packages --- modules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules b/modules index a295f092..e2293c57 100644 --- a/modules +++ b/modules @@ -1,10 +1,10 @@ GLUON_FEEDS='openwrt gluon routing luci' OPENWRT_REPO=git://git.openwrt.org/14.07/openwrt.git -OPENWRT_COMMIT=58e9eadd67bf5f83b9546395ed68698ca574c6e2 +OPENWRT_COMMIT=fa74ff9964527b012866a8b856c5da60d4e01491 PACKAGES_OPENWRT_REPO=git://github.com/openwrt/packages.git -PACKAGES_OPENWRT_COMMIT=e27831d568f5689602abae58f5ae92f060421ada +PACKAGES_OPENWRT_COMMIT=ad7c25a87faa72eef0ea23f19615a4651e0f3cb1 PACKAGES_OPENWRT_BRANCH=for-14.07 PACKAGES_GLUON_REPO=git://github.com/freifunk-gluon/packages.git From 246f6751b72ede182089810c42f7d102b794d7ce Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Sat, 15 Nov 2014 18:51:02 +0100 Subject: [PATCH 090/100] fastd: update to v16 --- .../openwrt/0002-fastd-update-to-v16.patch | 100 ++++++++++++++++++ 1 file changed, 100 insertions(+) create mode 100644 patches/packages/openwrt/0002-fastd-update-to-v16.patch diff --git a/patches/packages/openwrt/0002-fastd-update-to-v16.patch b/patches/packages/openwrt/0002-fastd-update-to-v16.patch new file mode 100644 index 00000000..caaa5bd6 --- /dev/null +++ b/patches/packages/openwrt/0002-fastd-update-to-v16.patch @@ -0,0 +1,100 @@ +From: Matthias Schiffer +Date: Sat, 15 Nov 2014 18:50:34 +0100 +Subject: fastd: update to v16 + +diff --git a/net/fastd/Config.in b/net/fastd/Config.in +index ca4045c..8292245 100644 +--- a/net/fastd/Config.in ++++ b/net/fastd/Config.in +@@ -80,8 +80,14 @@ config FASTD_WITH_CMDLINE_COMMANDS + default n + + config FASTD_WITH_VERIFY +- bool "Include support for on-verify handlers" +- depends on PACKAGE_fastd +- default n ++ bool "Include support for on-verify handlers" ++ depends on PACKAGE_fastd ++ default n ++ ++config FASTD_WITH_STATUS_SOCKET ++ bool "Include support for status sockets" ++ depends on PACKAGE_fastd ++ default y ++ + + endmenu +diff --git a/net/fastd/Makefile b/net/fastd/Makefile +index 0629cd7..acf973b 100644 +--- a/net/fastd/Makefile ++++ b/net/fastd/Makefile +@@ -8,13 +8,16 @@ + include $(TOPDIR)/rules.mk + + PKG_NAME:=fastd +-PKG_VERSION:=14 ++PKG_VERSION:=16 + PKG_RELEASE:=1 + + PKG_MAINTAINER:=Matthias Schiffer + PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz +-PKG_SOURCE_URL:=https://projects.universe-factory.net/attachments/download/75 +-PKG_MD5SUM:=34f6bdebd0410a1fba7c8fd06fff7a05 ++PKG_SOURCE_URL:=https://projects.universe-factory.net/attachments/download/78 ++PKG_MD5SUM:=135b3083d2743e335738de3bd4bb0c3c ++ ++PKG_LICENSE:=BSD-2-Clause ++PKG_LICENSE_FILE:=COPYRIGHT + + PKG_CONFIG_DEPENDS:=\ + CONFIG_FASTD_ENABLE_METHOD_CIPHER_TEST \ +@@ -32,7 +35,8 @@ PKG_CONFIG_DEPENDS:=\ + CONFIG_FASTD_WITH_CMDLINE_LOGGING \ + CONFIG_FASTD_WITH_CMDLINE_OPERATION \ + CONFIG_FASTD_WITH_CMDLINE_COMMANDS \ +- CONFIG_FASTD_WITH_VERIFY ++ CONFIG_FASTD_WITH_VERIFY \ ++ CONFIG_FASTD_WITH_STATUS_SOCKET + + + PKG_BUILD_DEPENDS:=nacl libuecc +@@ -43,7 +47,7 @@ include $(INCLUDE_DIR)/cmake.mk + define Package/fastd + SECTION:=net + CATEGORY:=Network +- DEPENDS:=+kmod-tun +librt +libpthread ++ DEPENDS:=+kmod-tun +librt +libpthread +FASTD_WITH_STATUS_SOCKET:libjson-c + TITLE:=Fast and Secure Tunneling Daemon + URL:=https://projects.universe-factory.net/projects/fastd + SUBMENU:=VPN +@@ -74,6 +78,7 @@ CMAKE_OPTIONS += \ + -DWITH_CMDLINE_OPERATION:BOOL=FALSE \ + -DWITH_CMDLINE_COMMANDS:BOOL=FALSE \ + -DWITH_VERIFY:BOOL=FALSE \ ++ -DWITH_STATUS_SOCKET:BOOL=FALSE \ + -DWITH_CAPABILITIES:BOOL=FALSE \ + -DENABLE_SYSTEMD:BOOL=FALSE \ + -DENABLE_LIBSODIUM:BOOL=FALSE \ +@@ -147,6 +152,10 @@ ifeq ($(CONFIG_FASTD_WITH_VERIFY),y) + CMAKE_OPTIONS += -DWITH_VERIFY:BOOL=TRUE + endif + ++ifeq ($(CONFIG_FASTD_WITH_STATUS_SOCKET),y) ++CMAKE_OPTIONS += -DWITH_STATUS_SOCKET:BOOL=TRUE ++endif ++ + + define Package/fastd/description + Fast and secure tunneling daemon, which is optimized on small code size and few dependencies +@@ -161,9 +170,9 @@ define Package/fastd/install + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/fastd $(1)/usr/bin/ + + $(INSTALL_DIR) $(1)/etc/init.d/ +- $(INSTALL_BIN) files/fastd.init $(1)/etc/init.d/fastd ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/doc/examples/openwrt/fastd.init $(1)/etc/init.d/fastd + $(INSTALL_DIR) $(1)/etc/config +- $(INSTALL_CONF) files/fastd.config $(1)/etc/config/fastd ++ $(INSTALL_CONF) $(PKG_BUILD_DIR)/doc/examples/openwrt/fastd.config $(1)/etc/config/fastd + $(INSTALL_DIR) $(1)/etc/fastd + $(INSTALL_DIR) $(1)/lib/upgrade/keep.d + $(INSTALL_DATA) files/fastd.upgrade $(1)/lib/upgrade/keep.d/fastd From 08ecab23dec1e43b02fdca4caa86d2b7940b2f12 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Sat, 15 Nov 2014 22:06:19 +0100 Subject: [PATCH 091/100] Revert "Update OpenWrt base and packages" The ath9k update causes frequent panics, to revert it for now. This reverts commit a889b1276db1301098ca1296721ef20306f7b425. --- modules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules b/modules index e2293c57..a295f092 100644 --- a/modules +++ b/modules @@ -1,10 +1,10 @@ GLUON_FEEDS='openwrt gluon routing luci' OPENWRT_REPO=git://git.openwrt.org/14.07/openwrt.git -OPENWRT_COMMIT=fa74ff9964527b012866a8b856c5da60d4e01491 +OPENWRT_COMMIT=58e9eadd67bf5f83b9546395ed68698ca574c6e2 PACKAGES_OPENWRT_REPO=git://github.com/openwrt/packages.git -PACKAGES_OPENWRT_COMMIT=ad7c25a87faa72eef0ea23f19615a4651e0f3cb1 +PACKAGES_OPENWRT_COMMIT=e27831d568f5689602abae58f5ae92f060421ada PACKAGES_OPENWRT_BRANCH=for-14.07 PACKAGES_GLUON_REPO=git://github.com/freifunk-gluon/packages.git From 211f2c125951928157d03ce554477a176a0d7b9d Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Mon, 17 Nov 2014 03:29:16 +0100 Subject: [PATCH 092/100] Update gluon packages --- modules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules b/modules index a295f092..d50563d0 100644 --- a/modules +++ b/modules @@ -8,7 +8,7 @@ PACKAGES_OPENWRT_COMMIT=e27831d568f5689602abae58f5ae92f060421ada PACKAGES_OPENWRT_BRANCH=for-14.07 PACKAGES_GLUON_REPO=git://github.com/freifunk-gluon/packages.git -PACKAGES_GLUON_COMMIT=3e5206d4f4005569c99c6f74dc11779b0e590241 +PACKAGES_GLUON_COMMIT=62ca03a274a42b707e6b6e70606359d5140dbcec PACKAGES_ROUTING_REPO=git://github.com/openwrt-routing/packages.git PACKAGES_ROUTING_COMMIT=c08fe48bcd3a38d47387eb6dd8474770847e3b66 From 896c81ccd9ce964f9632566d2ffca0756e0344cf Mon Sep 17 00:00:00 2001 From: Nils Schneider Date: Mon, 17 Nov 2014 14:50:15 +0100 Subject: [PATCH 093/100] docs: document config-mode modules --- docs/dev/configmode.rst | 92 +++++++++++++++++++++++++++++++++++++++++ docs/index.rst | 1 + 2 files changed, 93 insertions(+) create mode 100644 docs/dev/configmode.rst diff --git a/docs/dev/configmode.rst b/docs/dev/configmode.rst new file mode 100644 index 00000000..9a174d4c --- /dev/null +++ b/docs/dev/configmode.rst @@ -0,0 +1,92 @@ +Config Mode +=========== + +As of 2014.4 `gluon-config-mode` consists of several modules. + +gluon-config-mode-core + This modules provides the core functionality for the config mode. + All modules must depend on it. + +gluon-config-mode-hostname + Provides a hostname field. + +gluon-config-mode-autoupdater + Informs whether the autoupdater is enabled. + +gluon-config-mode-mesh-vpn + Allows toggling of mesh-vpn-fastd and setting a bandwidth limit. + +gluon-config-mode-geo-location + Enables the user to set the geographical location of the node. + +gluon-config-mode-contact-info + Adds a field where the user can provide contact information. + +In order to get a config mode close to the one found in 2014.3.x you may add +these modules to your `site.mk`: +gluon-config-mode-hostname, +gluon-config-mode-autoupdater, +gluon-config-mode-mesh-vpn, +gluon-config-mode-geo-location, +gluon-config-mode-contact-info + +Writing Config Mode Modules +~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Config mode modules are located at `/lib/gluon/config-mode/wizard` and +`/lib/gluon/config-mode/reboot`. Modules are named like `0000-name.lua` and +are executed in lexical order. If you take the standard set of modules, the +order is, for wizard modules: + + - 0050-autoupdater-info + - 0100-hostname + - 0300-mesh-vpn + - 0400-geo-location + - 0500-contact-info + +While for reboot modules it is: + + - 0100-mesh-vpn + - 0900-msg-reboot + +Wizards +------- + +Wizard modules return a UCI section. A simple module capable of changing the +hostname might look like this:: + + local cbi = require "luci.cbi" + local uci = luci.model.uci.cursor() + + local M = {} + + function M.section(form) + local s = form:section(cbi.SimpleSection, nil, nil) + local o = s:option(cbi.Value, "_hostname", "Hostname") + o.value = uci:get_first("system", "system", "hostname") + o.rmempty = false + o.datatype = "hostname" + end + + function M.handle(data) + uci:set("system", uci:get_first("system", "system"), "hostname", data._hostname) + uci:save("system") + uci:commit("system") + end + + return M + +Reboot page +----------- + +Reboot modules return a function that will be called when the page is to be +rendered or nil (i.e. the module is skipped):: + + if no_hello_world_today then + return nil + else + return function () + luci.template.render_string("Hello World!") + end + end + diff --git a/docs/index.rst b/docs/index.rst index 7a1d5c74..409d7d59 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -36,6 +36,7 @@ Developer Documentation dev/basics dev/hardware + dev/configmode Supported Devices ----------------- From 8347527af4c611067eaea73243f7cf7f3c620cd3 Mon Sep 17 00:00:00 2001 From: Nils Schneider Date: Mon, 13 Oct 2014 14:02:28 +0200 Subject: [PATCH 094/100] docs: unclutter site-example --- docs/site-example/modules | 30 ++- docs/site-example/site.conf | 355 +++++++++++++++--------------------- 2 files changed, 156 insertions(+), 229 deletions(-) diff --git a/docs/site-example/modules b/docs/site-example/modules index 2bfc3731..05856ce4 100644 --- a/docs/site-example/modules +++ b/docs/site-example/modules @@ -1,28 +1,22 @@ -## gluon site modules example -# this file allows to define additional -# package feeds to be used. -# packages from this feeds can then be included -# via site.mk - +# This file allows specifying additional repositories to use +# when building gluon. +# +# In most cases, it is not required so don't add it. ## GLUON_SITE_FEEDS -# feeds to include, note that this is not called -# GLUON_FEEDS as in the Gluon modules file. -# -# for each feed name given, there have to be -# two variables given in the following. - -GLUON_SITE_FEEDS='ffhh_packages' - +# for each feed name given, add the corresponding PACKAGES_* lines +# documented below +#GLUON_SITE_FEEDS='my_own_packages' ## PACKAGES_$feedname_REPO # the git repository from where to clone the package feed - -PACKAGES_FFHH_PACKAGES_REPO=git://github.com/freifunkhamburg/ffhh-packages.git +#PACKAGES_MY_OWN_PACKAGES_REPO=https://github.com/.../my-own-packages.git ## PACKAGES_$feedname_COMMIT # the version/commit of the git repository to clone +#PACKAGES_MY_OWN_PACKAGES_COMMIT=123456789aabcda1a69b04278e4d38f2a3f57e49 -PACKAGES_FFHH_PACKAGES_COMMIT=0fc9d44e95000c61a69b04278e4d38f2a3f57e49 - +## PACKAGES_$feedname_BRANCH +# the branch to check out +#PACKAGES_MY_OWN_PACKAGES_BRANCH=my_branch diff --git a/docs/site-example/site.conf b/docs/site-example/site.conf index 12607a55..2ecd898d 100644 --- a/docs/site-example/site.conf +++ b/docs/site-example/site.conf @@ -1,236 +1,169 @@ ---[[ gluon site.conf example - - This file is loosely related to the original site.conf used in Lübeck. - There are comments added to most switches to explain the usage of gluon. - - This is lua code now, not perl anymore. - - Happy compiling! -]] - +-- This is an example site configuration for Gluon v2014.4 +-- +-- Take a look at the documentation located at +-- http://gluon.readthedocs.org/ for details. +-- +-- This configuration will not work as it. You're required to make +-- community specific changes to it! { - --[[ Community settings - hostname_prefix: Nodename prefix - freifunk-abcdef123456 (hex-part is generated from node's MAC address) - site_name: Name of your community - site_code: Shortcode of your community - ]] - hostname_prefix = 'freifunk', - site_name = 'Freifunk Lübeck', - site_code = 'ffhl', + -- Used for generated hostnames, e.g. freifunk-abcdef123456. + hostname_prefix = 'freifunk', + -- Name of the community. + site_name = 'Freifunk Lübeck', - --[[ General network settings - prefix4: IPv4 range of your community - prefix6: IPv6 range of your community - is also required for radvd - ]] - prefix4 = '10.130.0.0/20', - prefix6 = 'fdef:ffc0:3dd7::/64', + -- Shorthand of the community. + site_code = 'ffhl', + -- Prefixes used within the mesh. Both are required. + prefix4 = '10.130.0.0/20', + prefix6 = 'fdef:ffc0:3dd7::/64', - --[[ NTP settings - Synchronize the time of the nodes - timezone: Timezone of your community - http://wiki.openwrt.org/doc/uci/system#time.zones - ntp_servers: List of NTP-Servers to query. You can use any public and/or your private NTP-Servers of your community. - http://www.pool.ntp.org/zone/de - ]] - timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', - ntp_servers = {'1.ntp.services.ffhl'}, + -- Timezone of your community. + -- See http://wiki.openwrt.org/doc/uci/system#time.zones + timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', + -- List of NTP servers in your community. + -- Must be reachable using IPv6! + ntp_servers = {'1.ntp.services.ffhl'}, - --[[ Wireless settings - regdom: IEEE 802.11 Regulatory Domain - http://en.wikipedia.org/wiki/IEEE_802.11#Regulatory_domains_and_legal_compliance - wifi24: Wifi settings for 2.4 GHz frequency devices - wifi5: Wifi settings for 5 GHz frequency devices - sub - ssid: Wifi name shown to the user (We recommend %site_code%.freifunk.net) - channel: Wifi channel to use - htmode: Specifies the channel width in 802.11n and 802.11ac mode, possible values are: - HT20 (single 20MHz channel), - HT40- (2x 20MHz channels, primary/control channel is upper, secondary channel is below) - HT40+ (2x 20MHz channels, primary/control channel is lower, secondary channel is above). - VHT20 / VHT40 / VHT80 / VHT160 (channel width in 802.11ac, extra channels are picked according to the specification) - http://wiki.openwrt.org/doc/uci/wireless#common.options (-> htmode) - mesh_ssid: SSID of the mesh-interface, only used between nodes - mesh_bssid: BSSID of the mesh-interface - The supplied default of ff:ff:ff:ff:ff:ff will not work. - You'll need to replace it with randomly generated, non-broadcast BSSID! - mesh_mcast_rate: multicast rate of the mesh-interface - ]] - regdom = 'DE', + -- Wireless regulatory domain of your community. + regdom = 'DE', - wifi24 = { - ssid = 'luebeck.freifunk.net', - channel = 1, - htmode = 'HT40+', - mesh_ssid = 'ff:ff:ff:ff:ff:ff', - mesh_bssid = 'ff:ff:ff:ff:ff:ff', - mesh_mcast_rate = 12000, - }, + -- Wireless configuratoin for 2.4 GHz interfaces. + wifi24 = { + -- Wireless channel. + channel = 1, - wifi5 = { - ssid = 'luebeck.freifunk.net', - channel = 44, - htmode = 'HT40+', - mesh_ssid = 'ff:ff:ff:ff:ff:ff', - mesh_bssid = 'ff:ff:ff:ff:ff:ff', - mesh_mcast_rate = 12000, - }, + -- ESSID used for client network. + ssid = 'luebeck.freifunk.net', + -- Specifies the channel width in 802.11n and 802.11ac mode. + -- Possible values are: + -- HT20 (single 20MHz channel), + -- HT40- (2x 20MHz channels, secondary below) + -- HT40+ (2x 20MHz channels, secondary above) + htmode = 'HT20', - --[[ Next-Node - next_node: Howto reach the node you are currently connected to - The node will always be reachable at that address, and it's the same on all nodes. Because next_node packets are redirected within the node itself, there will be no conflicts. - sub - ip4: IPv4 Address to use - ip6: IPv6 Address to use - mac: MAC Address to use - (TODO: What is the purpose of this MAC-Address here?) - ]] - next_node = { - ip4 = '10.130.0.1', - ip6 = 'fdef:ffc0:3dd7::1', - mac = '16:41:95:40:f7:dc', - }, + -- Adjust these values! ff... will not work! + mesh_ssid = 'ff:ff:ff:ff:ff:ff', -- ESSID used for mesh + mesh_bssid = 'ff:ff:ff:ff:ff:ff', -- BSSID used for mesh + -- Bitrate used for multicast/broadcast packets. + mesh_mcast_rate = 12000, + }, - --[[ Gateway settings - fastd_mesh_vpn: fastd vpn settings - https://projects.universe-factory.net/projects/fastd/wiki/User_manual - sub - methods: encryption algorithms to use - https://projects.universe-factory.net/projects/fastd/wiki/Methods - When multiple method statements are given, the first one has the highest preference. - mtu: package size - backbone: fastd vpn gateways of your community - sub - limit: Number of gateways each node connects to - On startup, each node tries to connect to every gateway, and then chooses the number of 'limit' fastest gateways it could reach - peers: Gateways - sub sub - key: public fastd key of your gateway - https://github.com/tcatm/ecdsautils - remotes: List of fastd configuration strings to connect to your gateway server - ]] - fastd_mesh_vpn = { - methods = {'salsa2012+gmac'}, - mtu = 1426, - backbone = { - limit = 2, - peers = { - burgtor = { - key = '657af03e36ff1b8bbe5a5134982a4f110c8523a9a63293870caf548916a95a03', - remotes = {'ipv4 "burgtor.mesh.ffhl.chaotikum.org" port 10000'}, - }, - holstentor = { - key = '8c660f7511bf101ea1b599fe53af20e1146cd923c9e9d2a3a0d534ee75af9067', - remotes = {'ipv4 "holstentor.mesh.ffhl.chaotikum.org" port 10000'}, - }, - huextertor = { - key = 'a1b124f43eae4f5929850c09cda825ef35d659e3db4d7746e3d97627e9fa7238', - remotes = {'ipv4 "huextertor.mesh.ffhl.chaotikum.org" port 10000'}, - }, - muehlentor = { - key = 'bd4ec3cf87bb0042eed2fa121fbc402154d28fb1ae9dff9cdb71bb21892f401a', - remotes = {'ipv4 "muehlentor.mesh.ffhl.chaotikum.org" port 10000'}, - }, - }, - }, - }, + -- Wireless configuration for 5 GHz interfaces. + -- This should be equal to the 2.4 GHz variant, except + -- for channel and htmode. + wifi5 = { + ssid = 'luebeck.freifunk.net', + channel = 44, + htmode = 'HT20', + mesh_ssid = 'ff:ff:ff:ff:ff:ff', + mesh_bssid = 'ff:ff:ff:ff:ff:ff', + mesh_mcast_rate = 12000, + }, + -- The next node feature allows clients to always reach the node it is + -- connected to using a known IP address. + next_node = { + -- anycast IPs of all nodes + ip4 = '10.130.0.1', + ip6 = 'fdef:ffc0:3dd7::1', - --[[ Autoupdater settings - branch: Automatically update to this branch - branches: Available branches your community is publishing - sub sub - name: Name of branch (is used when compiling images) - mirrors: List of urls where to find the firmware - just serve the images on port 80 via http. a simple apache file-listing is enough. - see: http://luebeck.freifunk.net/firmware/ - probability: How often should a node search for updates - 1.0 - perform an update every hour - 0.5 - on average, perform an update every two hours - 0.0 - inhibit any automatic updates - good_signatures: How many signatures should be valid so the node decides to upgrade itself - pubkeys: public keys by developers used in manifest file of branch - manifest file - see gluon readme - $ make manifest GLUON_BRANCH=mybranch - $ contrib/sign.sh $SECRETKEY.file images/sysupgrade/manifest - ]] - autoupdater = { - branch = 'experimental', - branches = { - stable = { - name = 'stable', - mirrors = {'http://1.updates.services.ffhl/stable/sysupgrade'}, - probability = 0.08, - good_signatures = 2, - pubkeys = { - 'daa19b44bbd7033965e02088127bad9516ba0fea8f34267a777144a23ec8900c', -- Linus - 'a8dd60765b07330a4bbfdf8406102befca132881a4b65f3efda32cf2d5b362d9', -- Nils - '323bd3285c4e5547a89cd6da1f2aef67f1654b0928bbd5b104efc9dab2156d0b', -- NeoRaider - }, - }, - experimental = { - -- DE: Name des "braches" wird beim erstellen von Images / update generiert - name = 'experimental', - mirrors = {'http://1.updates.services.ffhl/experimental/sysupgrade'}, - probability = 1.00, - good_signatures = 2, - good_signatures = 1, - -- DE: Oeffentlicher Schluessel / Public Key der Entwickler - pubkeys = { - '496136b37e5f561dfdf523611f14e4b6bc2a745cbc1ab7daffa59fded5f202d1', -- philae - }, - }, - }, - }, + -- anycast MAC of all nodes + mac = '16:41:95:40:f7:dc', + }, + -- Refer to http://fastd.readthedocs.org/en/latest/ to better understand + -- what these options do. + fastd_mesh_vpn = { + -- List of crypto-methods to use. + methods = {'salsa2012+gmac'}, + mtu = 1426, + backbone = { + -- Limit number of connected peers to reduce bandwidth. + limit = 2, - --[[ Simple TC settings to limit the bandwidth of the vpn-uplink - mesh_vpn: - sub - ifname: name of the interface/bridge - enabled: default-value - limit_egress: default-value - limit_ingress: default-value - ]] - simple_tc = { - mesh_vpn = { - ifname = 'mesh-vpn', - enabled = false, - limit_egress = 200, - limit_ingress = 3000, - }, - }, + -- List of peers. + peers = { + burgtor = { + key = '657af03e36ff1b8bbe5a5134982a4f110c8523a9a63293870caf548916a95a03', + -- This is a list, so you might add multiple entries. + remotes = {'ipv4 "burgtor.mesh.ffhl.chaotikum.org" port 10000'}, + }, + holstentor = { + key = '8c660f7511bf101ea1b599fe53af20e1146cd923c9e9d2a3a0d534ee75af9067', + remotes = {'ipv4 "holstentor.mesh.ffhl.chaotikum.org" port 10000'}, + }, + }, + }, + }, - --[[ Config Mode settings - Text shown on local website on node while in config mode (after initial flashing or after a long press and hold on the primary button and reboot). You can use html here. - msg_welcome: Welcome message shown at startup - msg_pubkey: Instructions for the user how your community handles the key exchange - only shown if VPN setting is selected - msg_reboot: Message shown when configuration is finished while the node is rebooting. + autoupdater = { + -- Default branch. Don't forget to set GLUON_BRANCH when building! + branch = 'stable', - Variables - Within the text given here you can use variables which are - replaced when the respective website is delivered to the user. - Variables must be used in the format <%=NAME%>. See msg_pubkey for an example. - hostname hostname of the node - pubkey fastd public key of the node - sysconfig.primary_mac the primary mac of the node, also found printed beneath the device - ... other sysconfig.* variables: config_ifname, lan_ifname, wan_ifname - ]] - config_mode = { - msg_welcome = [[ + -- List of branches. You may define multiple branches. + branches = { + stable = { + name = 'stable', + + -- List of mirrors to fetch images from. IPv6 required! + mirrors = {'http://1.updates.services.ffhl/stable/sysupgrade'}, + + -- Number of good signatures required. + -- Have multiple maintainers sign your build and only + -- accept it when a sufficient number of them have + -- signed it. + good_signatures = 2, + + -- List of public keys of maintainers. + pubkeys = { + 'daa19b44bbd7033965e02088127bad9516ba0fea8f34267a777144a23ec8900c', -- Linus + 'a8dd60765b07330a4bbfdf8406102befca132881a4b65f3efda32cf2d5b362d9', -- Nils + '323bd3285c4e5547a89cd6da1f2aef67f1654b0928bbd5b104efc9dab2156d0b', -- NeoRaider + }, + }, + }, + }, + + -- Bandwidth limiting + simple_tc = { + mesh_vpn = { + ifname = 'mesh-vpn', + + -- You may enable it by default here. + enabled = false, + + -- Default upload limit (kbit/s). + limit_egress = 200, + + -- Default download limit (kbit/s). + limit_ingress = 3000, + }, + }, + + -- These strings are shown in config mode. Some HTML is permissible. + -- + -- msg_welcome: shown at startup + -- msg_pubkey: shown when VPN is enabled + -- msg_reboot: shown during reboot (after finishing configuration) + -- + -- You may use some variables, e.g.: + -- + -- <%=hostname%> - the node's hostname + -- <%=pubkey%> - the fastd public key + -- <%=sysconfig.primary_mac%> - the node's primary MAC + config_mode = { + msg_welcome = [[ Willkommen zum Einrichtungsassistenten für deinen neuen Lübecker Freifunk-Knoten. Fülle das folgende Formular deinen Vorstellungen entsprechend aus und sende es ab. ]], - msg_pubkey = [[ + msg_pubkey = [[ Dies ist der öffentliche Schlüssel deines Freifunk-Knotens. Erst nachdem er auf den Servern des Lübecker Freifunk-Projektes eingetragen wurde, kann sich dein Knoten mit dem Lübecker Mesh-VPN zu verbinden. Bitte @@ -238,7 +171,7 @@ schicke dazu diesen Schlüssel und den Namen deines Knotens (<%=hostname%>) an keys@luebeck.freifunk.net. ]], - msg_reboot = [[ + msg_reboot = [[

Dein Knoten startet gerade neu und wird anschließend versuchen, sich anschließend mit anderen Freifunk-Knoten in seiner Nähe zu @@ -250,5 +183,5 @@ Lübecker Freifunk-Community findest du auf Viel Spaß mit deinem Knoten und der Erkundung von Freifunk!

]], - }, + }, } From adad5894b37a33f77782022a1dba40f986395b40 Mon Sep 17 00:00:00 2001 From: Patrick Uven Date: Thu, 16 Oct 2014 19:35:30 +0200 Subject: [PATCH 095/100] Changed example bssid in site.conf to a valid one (in terms of config file parsing) --- docs/site-example/site.conf | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/site-example/site.conf b/docs/site-example/site.conf index 2ecd898d..db2682a8 100644 --- a/docs/site-example/site.conf +++ b/docs/site-example/site.conf @@ -45,9 +45,9 @@ -- HT40+ (2x 20MHz channels, secondary above) htmode = 'HT20', - -- Adjust these values! ff... will not work! - mesh_ssid = 'ff:ff:ff:ff:ff:ff', -- ESSID used for mesh - mesh_bssid = 'ff:ff:ff:ff:ff:ff', -- BSSID used for mesh + -- Adjust these values! + mesh_ssid = 'XX:XX:XX:XX:XX:XX', -- ESSID used for mesh + mesh_bssid = 'XX:XX:XX:XX:XX:XX', -- BSSID used for mesh -- Bitrate used for multicast/broadcast packets. mesh_mcast_rate = 12000, @@ -60,8 +60,8 @@ ssid = 'luebeck.freifunk.net', channel = 44, htmode = 'HT20', - mesh_ssid = 'ff:ff:ff:ff:ff:ff', - mesh_bssid = 'ff:ff:ff:ff:ff:ff', + mesh_ssid = 'XX:XX:XX:XX:XX:XX', + mesh_bssid = 'XX:XX:XX:XX:XX:XX', mesh_mcast_rate = 12000, }, From 62b063f366ddd2b93d77e42a4bcbc2e73cd82256 Mon Sep 17 00:00:00 2001 From: Nils Schneider Date: Mon, 17 Nov 2014 15:19:37 +0100 Subject: [PATCH 096/100] docs/site-example: default to batman-adv-14 --- docs/site-example/site.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/site-example/site.mk b/docs/site-example/site.mk index f7304337..68d14b0e 100644 --- a/docs/site-example/site.mk +++ b/docs/site-example/site.mk @@ -5,7 +5,7 @@ # The gluon-mesh-batman-adv-* package must come first because of the dependency resolution GLUON_SITE_PACKAGES := \ - gluon-mesh-batman-adv-15 \ + gluon-mesh-batman-adv-14 \ gluon-alfred \ gluon-announced \ gluon-autoupdater \ From e0903644bb92942d9f20d84b02c38e89e31d3f52 Mon Sep 17 00:00:00 2001 From: Nils Schneider Date: Mon, 17 Nov 2014 15:37:03 +0100 Subject: [PATCH 097/100] Update gluon packages --- modules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules b/modules index d50563d0..09ba92e0 100644 --- a/modules +++ b/modules @@ -8,7 +8,7 @@ PACKAGES_OPENWRT_COMMIT=e27831d568f5689602abae58f5ae92f060421ada PACKAGES_OPENWRT_BRANCH=for-14.07 PACKAGES_GLUON_REPO=git://github.com/freifunk-gluon/packages.git -PACKAGES_GLUON_COMMIT=62ca03a274a42b707e6b6e70606359d5140dbcec +PACKAGES_GLUON_COMMIT=0eded54626a00ce946c9a2ba99cc439b1dd7fe7c PACKAGES_ROUTING_REPO=git://github.com/openwrt-routing/packages.git PACKAGES_ROUTING_COMMIT=c08fe48bcd3a38d47387eb6dd8474770847e3b66 From 0cf5d6b7fce4e020db2b0cc0280b34d2db00ce61 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Mon, 17 Nov 2014 16:26:27 +0100 Subject: [PATCH 098/100] Update LuCi packages --- modules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules b/modules index 09ba92e0..309dc1f9 100644 --- a/modules +++ b/modules @@ -15,4 +15,4 @@ PACKAGES_ROUTING_COMMIT=c08fe48bcd3a38d47387eb6dd8474770847e3b66 PACKAGES_ROUTING_BRANCH=for-14.07 PACKAGES_LUCI_REPO=git://github.com/openwrt/luci.git -PACKAGES_LUCI_COMMIT=f16df257b8ba224661d3707f7f69b43b4d47e36b +PACKAGES_LUCI_COMMIT=f81be49ae756dab82e1758a6c9de145f0d36960e From db919795504b77273e738bcf523d096430d9e386 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Mon, 17 Nov 2014 16:27:27 +0100 Subject: [PATCH 099/100] Update gluon packages --- modules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules b/modules index 309dc1f9..40392b8e 100644 --- a/modules +++ b/modules @@ -8,7 +8,7 @@ PACKAGES_OPENWRT_COMMIT=e27831d568f5689602abae58f5ae92f060421ada PACKAGES_OPENWRT_BRANCH=for-14.07 PACKAGES_GLUON_REPO=git://github.com/freifunk-gluon/packages.git -PACKAGES_GLUON_COMMIT=0eded54626a00ce946c9a2ba99cc439b1dd7fe7c +PACKAGES_GLUON_COMMIT=eed0315cd2934eb51efa00a5754ed9553e7550ba PACKAGES_ROUTING_REPO=git://github.com/openwrt-routing/packages.git PACKAGES_ROUTING_COMMIT=c08fe48bcd3a38d47387eb6dd8474770847e3b66 From 30987f4613e7f35d411462b0890b6f8c765ae637 Mon Sep 17 00:00:00 2001 From: Malte Date: Thu, 20 Nov 2014 15:55:56 +0100 Subject: [PATCH 100/100] added links to Rheinland and Stuttgart --- docs/user/site.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/user/site.rst b/docs/user/site.rst index 1e9e5986..7da6748e 100644 --- a/docs/user/site.rst +++ b/docs/user/site.rst @@ -222,3 +222,5 @@ This is a non-exhaustive list of site-repos from various communities: * `site-ffnw `_ (Nordwest) * `site-ffpb `_ (Paderborn) * `site-ffka `_ (Karlsruhe) +* `site-ffrl `_ (Rheinland) +* `site-ffs `_ (Stuttgart)