From 47df5573f7747756a7c10fd30339fee4a919700d Mon Sep 17 00:00:00 2001 From: Pavel Roskin Date: Fri, 30 Dec 2005 18:22:26 -0500 Subject: [PATCH] --- yaml --- r: 18767 b: refs/heads/master c: a485cde662f5b6b2299ee01a7e9e2c11683f807b h: refs/heads/master i: 18765: 3484bd7ce4c094695a25f3eed5386c07f3eaa766 18763: 51b0a19f6cb9f1c9f197b6a702194233d26f54fd 18759: a2792cce4fd2febc66aed20770710b7531671a47 18751: 77b4e5febe70e403dbfb9515396cc743a26094a0 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/hostap/Kconfig | 22 +++++++++++++++---- .../net/wireless/hostap/hostap_config.h | 13 ++++------- 3 files changed, 23 insertions(+), 14 deletions(-) diff --git a/[refs] b/[refs] index d249b95cbcce..7544192f3057 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d834a41c966c6a20368fadb59248740935e6fbae +refs/heads/master: a485cde662f5b6b2299ee01a7e9e2c11683f807b diff --git a/trunk/drivers/net/wireless/hostap/Kconfig b/trunk/drivers/net/wireless/hostap/Kconfig index 56f41c714d38..c8f6286dd35f 100644 --- a/trunk/drivers/net/wireless/hostap/Kconfig +++ b/trunk/drivers/net/wireless/hostap/Kconfig @@ -26,11 +26,25 @@ config HOSTAP_FIRMWARE depends on HOSTAP ---help--- Configure Host AP driver to include support for firmware image - download. Current version supports only downloading to volatile, i.e., - RAM memory. Flash upgrade is not yet supported. + download. This option by itself only enables downloading to the + volatile memory, i.e. the card RAM. This option is required to + support cards that don't have firmware in flash, such as D-Link + DWL-520 rev E and D-Link DWL-650 rev P. - Firmware image downloading needs user space tool, prism2_srec. It is - available from http://hostap.epitest.fi/. + Firmware image downloading needs a user space tool, prism2_srec. + It is available from http://hostap.epitest.fi/. + +config HOSTAP_FIRMWARE_NVRAM + bool "Support for non-volatile firmware download" + depends on HOSTAP_FIRMWARE + ---help--- + Allow Host AP driver to write firmware images to the non-volatile + card memory, i.e. flash memory that survives power cycling. + Enable this option if you want to be able to change card firmware + permanently. + + Firmware image downloading needs a user space tool, prism2_srec. + It is available from http://hostap.epitest.fi/. config HOSTAP_PLX tristate "Host AP driver for Prism2/2.5/3 in PLX9052 PCI adaptors" diff --git a/trunk/drivers/net/wireless/hostap/hostap_config.h b/trunk/drivers/net/wireless/hostap/hostap_config.h index 7ed3425d08c1..c090a5aebb58 100644 --- a/trunk/drivers/net/wireless/hostap/hostap_config.h +++ b/trunk/drivers/net/wireless/hostap/hostap_config.h @@ -21,15 +21,10 @@ #define PRISM2_DOWNLOAD_SUPPORT #endif -#ifdef PRISM2_DOWNLOAD_SUPPORT -/* Allow writing firmware images into flash, i.e., to non-volatile storage. - * Before you enable this option, you should make absolutely sure that you are - * using prism2_srec utility that comes with THIS version of the driver! - * In addition, please note that it is possible to kill your card with - * non-volatile download if you are using incorrect image. This feature has not - * been fully tested, so please be careful with it. */ -/* #define PRISM2_NON_VOLATILE_DOWNLOAD */ -#endif /* PRISM2_DOWNLOAD_SUPPORT */ +/* Allow kernel configuration to enable non-volatile download support. */ +#ifdef CONFIG_HOSTAP_FIRMWARE_NVRAM +#define PRISM2_NON_VOLATILE_DOWNLOAD +#endif /* Save low-level I/O for debugging. This should not be enabled in normal use. */