diff options
| author | Bartosz Markowski <bartosz.markowski@tieto.com> | 2011-09-01 08:38:50 +0200 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@stericsson.com> | 2011-09-19 16:05:58 +0200 |
| commit | 4177d232fc0bcf6fc28de011444bb5c96444fd31 (patch) | |
| tree | 61c769ab42c6411aaa676acb6974494bf9b49412 | |
| parent | 9b05a8ad87e490021d9e59bbe33978d0949787b0 (diff) | |
WLAN: OpenMAC delivery
This patch add internal support for openMAC driver
from compat-wireless-openmac git.
Internal only, for customer deliveries changes
should be made in defconfig and Kconfig accordingly
to what's done now via script called from Android.mk
Only one (UMAC or openMAC based) solution should be delivered
to customers.
ST-Ericsson ID: 355582
ST-Ericsson FOSS-OUT ID: Trivial
ST-Ericsson Linux next: NA
Change-Id: Idd0081cc327faf64131f29a3f3a54fd6d670acf2
Signed-off-by: Bartosz Markowski <bartosz.markowski@tieto.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/28667
Reviewed-by: Linus WALLEIJ <linus.walleij@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/30004
| -rw-r--r-- | Android.mk | 24 | ||||
| -rw-r--r-- | net/Kconfig | 19 | ||||
| -rw-r--r-- | net/Makefile | 7 | ||||
| l--------- | net/compat-wireless-openmac | 1 |
4 files changed, 50 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk index 05c1fa7cbc9..dd2fd7251be 100644 --- a/Android.mk +++ b/Android.mk @@ -13,6 +13,9 @@ PRIVATE_OUT := $(abspath $(PRODUCT_OUT)/system) PATH := $(PATH):$(BOOT_PATH)/u-boot/tools:$(abspath $(UBOOT_OUTPUT)/tools) export PATH +# For compat-wireless gits to compile with kernel +export STERICSSON_WLAN_BUILT_IN=y + # only do this if we are buidling out of tree ifneq ($(KERNEL_OUTPUT),) ifneq ($(KERNEL_OUTPUT), $(abspath $(TOP)/kernel)) @@ -76,6 +79,27 @@ else $(MAKE) $(PRIVATE_KERNEL_ARGS) $(KERNEL_DEFCONFIG) endif +# Enable openMAC from here, since the defconfig is now set for UMAC +ifeq ($(WLAN_ENABLE_OPEN_MAC_SOLUTION),true) +ifeq ($(shell [ -f kernel/net/compat-wireless-openmac/Makefile ] && echo "OK"), OK) + kernel/scripts/config --file $(KERNEL_OUTPUT)/.config \ + --enable CONFIG_MAC80211 \ + --module CONFIG_CW1200 \ + --enable CONFIG_CW1200_WAPI_SUPPORT \ + --enable CONFIG_CW1200_USE_STE_EXTENSIONS \ + --disable CONFIG_CW1200_NON_POWER_OF_TWO_BLOCKSIZES \ + --disable CONFIG_CW1200_USE_GPIO_IRQ \ + --disable CONFIG_CW1200_5GHZ_SUPPORT \ + --enable CONFIG_CW1200_STA_DEBUG \ + --enable CONFIG_CW1200_DEBUGFS \ + --disable CONFIG_CW1200_BH_DEBUG \ + --disable CONFIG_CW1200_WSM_DEBUG \ + --disable CONFIG_CW1200_WSM_DUMPS \ + --disable CONFIG_CW1200_TXRX_DEBUG \ + --disable CONFIG_CW1200_TX_POLICY_DEBUG +endif +endif + $(MAKE) $(PRIVATE_KERNEL_ARGS) uImage ifeq ($(KERNEL_NO_MODULES),) $(MAKE) $(PRIVATE_KERNEL_ARGS) modules diff --git a/net/Kconfig b/net/Kconfig index 9a68cc0b5c9..c73b0762bf1 100644 --- a/net/Kconfig +++ b/net/Kconfig @@ -334,12 +334,24 @@ config COMPAT_WIRELESS To compile this code as a module, choose M here. if COMPAT_WIRELESS +config COMPAT_WIRELESS_MODULES + tristate "Wireless modules" + default n + ---help--- + To compile this code as a module, choose M here. + config CFG80211 tristate "Compat CFG80211" default n ---help--- To compile this code as a module, choose M here. +config MAC80211 + tristate "Compat MAC80211" + default n + ---help--- + To compile this code as a module, choose M here. + config COMPAT_MAC80211_RC_DEFAULT string "MAC80211_RC_DEFAULT" default "minstrel" @@ -387,6 +399,13 @@ config MAC80211_RC_MINSTREL default y ---help--- +config MAC80211_RC_MINSTREL_HT + bool "Minstrel 802.11n support" if EXPERT + depends on MAC80211_RC_MINSTREL + default y + ---help--- + This option enables the 'minstrel_ht' TX rate control algorithm + config MAC80211_LEDS bool "MAC80211_LEDS" depends on COMPAT_WIRELESS diff --git a/net/Makefile b/net/Makefile index 87cfc364a68..b6d42169585 100644 --- a/net/Makefile +++ b/net/Makefile @@ -49,7 +49,12 @@ obj-$(CONFIG_IP_DCCP) += dccp/ obj-$(CONFIG_IP_SCTP) += sctp/ obj-$(CONFIG_RDS) += rds/ ifneq ($(CONFIG_COMPAT_WIRELESS),) -obj-$(CONFIG_COMPAT_WIRELESS) += compat-wireless/ +# If MAC80211 is disabled use UMAC +ifneq ($(CONFIG_MAC80211),) +obj-$(CONFIG_COMPAT_WIRELESS) += compat-wireless-openmac/ +else +obj-$(CONFIG_COMPAT_WIRELESS) += compat-wireless/ +endif else obj-$(CONFIG_WIRELESS) += wireless/ obj-$(CONFIG_MAC80211) += mac80211/ diff --git a/net/compat-wireless-openmac b/net/compat-wireless-openmac new file mode 120000 index 00000000000..51c37423584 --- /dev/null +++ b/net/compat-wireless-openmac @@ -0,0 +1 @@ +../../vendor/st-ericsson/connectivity/wlan/compat-wireless-openmac/
\ No newline at end of file |