carl9170 firmware: always enable HW watchdog

[carl9170fw.git] / carlfw / Kconfig

diff --git a/carlfw/Kconfig b/carlfw/Kconfig
index 93267043a927694d10d32e6018135a0d8b886d65..fd1161e816dc04f53b8fa8ee867b9e4f9a1853a2 100644 (file)
--- a/carlfw/Kconfig
+++ b/carlfw/Kconfig
@@ -1,13 +1,7 @@
 menu "General"
 
-config CARL9170FW_MAKE_RELEASE
-       def_bool n
-       prompt "Update/Generate new release/revision files"
-
 config CARL9170FW_RELEASE_VERSION
        int
-       depends on CARL9170FW_MAKE_RELEASE
-       prompt "Major CARL9170 Firmware Revision"
        default 1
 
 menu "Selectable Hardware Options"
@@ -37,15 +31,6 @@ config CARL9170FW_RX_FRAME_LEN
        default 16384 if CARL9170FW_RX_FRAME_LEN_16384
        default 32768 if CARL9170FW_RX_FRAME_LEN_32768
 
-config CARL9170FW_WATCHDOG
-       def_bool y
-       prompt "Activate HW Watchdog"
-       ---help---
-        The watchdog will notify the application as soon as the firmware
-        has stalled.
-
-        Say Y.
-
 config CARL9170FW_GPIO_INTERRUPT
        def_bool y
        prompt "GPIO Software Interrupt"
@@ -139,27 +124,49 @@ config CARL9170FW_PSM
         Firmware will automatically turn it on again, when the
         PRETBTT event fires.
 
-config CARL9170FW_DELAYED_TX
-       def_bool y
-       prompt "Delay and reorder TX"
+config CARL9170FW_WOL_OPTION
+       def_bool n
+       prompt "Wakeup on WLAN"
        depends on CARL9170FW_EXPERIMENTAL
        ---help---
-        Delay incoming TX' from the application until wlan_complete
-        has finished.
+        With this option enabled, the firmware can wake-up
+        suspended hosts... As long as they fully support
+        USB remote wakeup.
+
+config CARL9170FW_WOL
+       def_bool n
+       depends on CARL9170FW_WOL_OPTION
+
+config CARL9170FW_WOL_MAGIC_PACKET
+       def_bool n
+       prompt "Magic Packet(tm)"
+       depends on CARL9170FW_WOL_OPTION
+       select CARL9170FW_WOL
+       ---help---
+        Sniff all incoming data frames for the magic packet pattern.
 
-        This feature is necessary to keep A-MPDUs partially ordered.
+config CARL9170FW_WOL_PROBE_REQUEST
+       def_bool n
+       prompt "Probe Request"
+       depends on CARL9170FW_WOL_OPTION
+       select CARL9170FW_WOL
+       ---help---
+        Scan probe requests for a given SSID.
 
-        Doesn't work 100% yet, but in most cases other HW designs can
-        deal with the fallout.
+config CARL9170FW_WOL_PROBE_REQUEST_SSID
+       string
+       prompt "Wakeup on WLAN SSID"
+       default "CARL9170_WAKEUP"
+       depends on CARL9170FW_WOL_PROBE_REQUEST
 
 config CARL9170FW_VIFS_NUM
-       default 0
+       default 1
        int
        prompt "Number of additional pseudo virtual interfaces"
        depends on CARL9170FW_EXPERIMENTAL
 
 config CARL9170FW_FW_MAC_RESET
-       def_bool n
+       def_bool y
        prompt "Firmware MAC Chip recovery"
        depends on CARL9170FW_EXPERIMENTAL
 
@@ -192,7 +199,7 @@ config CARL9170FW_DEBUG_UART
 
 config CARL9170FW_WATCHDOG_BUTTON
        def_bool n
-       depends on CARL9170FW_BROKEN && CARL9170FW_WATCHDOG && CARL9170FW_GPIO_INTERRUPT
+       depends on CARL9170FW_BROKEN && CARL9170FW_GPIO_INTERRUPT
        prompt "Trigger Watchdog by pressing the WPS button"
 
 choice CARL9170FW_UART_CLOCK
@@ -246,6 +253,11 @@ config CARL9170FW_USB_MODESWITCH
         Mostly implemented, but untested and some serious
         doubts remain.
 
+config CARL9170FW_DMA_QUEUE_BUMP
+       def_bool n
+       prompt "Bump a stuck TX queue before doing a MAC reset"
+       depends on CARL9170FW_BROKEN_FEATURES
+
 menu "Build Options"
 config CARL9170FW_AGGRESSIVE_CFLAGS
        def_bool y