Subject:
staging/ar6003 doesn't support P2P and BT3.0. So, Revoming P2P and BT 3.0 from
MakeFile and Kconfig
Due to some guys think there is no issue for MEEGO_ENV. So, the change for
MEEGO_EN to MEEGO_ENV isn't included.
Signed-off-by: Samuel Chang <[email protected]>
diff -ruN kernel-2.6.37.6-11.5/drivers/staging/ar6003/Kconfig
kernel-2.6.37.6-11.5_mod_MakeFile_Kconfig//drivers/staging/ar6003/Kconfig
--- kernel-2.6.37.6-11.5/drivers/staging/ar6003/Kconfig 2011-05-27
06:16:59.000000000 +0800
+++ kernel-2.6.37.6-11.5_mod_MakeFile_Kconfig//drivers/staging/ar6003/Kconfig
2011-06-03 00:53:53.310566451 +0800
@@ -87,12 +87,6 @@
help
Enables BT over SDIO. Applicable only for combo designs (eg: WB31)
-config AR6003_HCI_PAL
- bool "HCI PAL, BT 3.0 Support"
- depends on AR6003
- help
- Enables debug support
-
config AR6003_CONFIG_GPIO_BT_RESET
bool "Configure BT Reset GPIO"
depends on AR6003_HCI_BRIDGE
@@ -153,7 +147,7 @@
choice
prompt "AR6003 HW version"
depends on AR6003
- default AR6003_2_1
+ default AR6003_2_1_1
help
Select AR6003 HW Version
@@ -199,12 +193,6 @@
help
WLAN GPIO to be used for Debug UART (Tx)
-config AR6003_DEBUG_HCI_PAL
- bool "HCI PAL Debug Support"
- depends on AR6003_DEBUG && AR6003_HCI_PAL
- help
- Enables HCI PAL debug support
-
config AR6003_DEBUG_ALLOC
bool "Memory Allocate Debug Support"
depends on AR6003_DEBUG
diff -ruN kernel-2.6.37.6-11.5/drivers/staging/ar6003/Makefile
kernel-2.6.37.6-11.5_mod_MakeFile_Kconfig//drivers/staging/ar6003/Makefile
--- kernel-2.6.37.6-11.5/drivers/staging/ar6003/Makefile 2011-06-03
00:47:31.036670863 +0800
+++ kernel-2.6.37.6-11.5_mod_MakeFile_Kconfig//drivers/staging/ar6003/Makefile
2011-06-03 01:01:22.636794539 +0800
@@ -60,15 +60,8 @@
endif
ifeq ($(CONFIG_AR6003_HCI_BRIDGE),y)
- EXTRA_CFLAGS += -DSETUPHCI_ENABLED -DSETUPBTDEV_ENABLED
-endif
-
-ifeq ($(CONFIG_AR6003_HCI_PAL),y)
- EXTRA_CFLAGS += -DSETUPHCIPAL_ENABLED
+ EXTRA_CFLAGS += -DSETUPHCI_ENABLED -DSETUPBTDEV_ENABLED -DAR600x_BT_AR3001
EXTRA_CFLAGS += -DCONFIG_BT
-ifeq ($(CONFIG_AR6003_DEBUG_HCI_PAL),y)
- EXTRA_CFLAGS += -DHCIPAL_DEBUG
-endif
endif
ifeq ($(CONFIG_AR6003_SOFTMAC_FILE_USED),y)
@@ -116,9 +109,6 @@
EXTRA_CFLAGS += -DATH6KL_CONFIG_HIF_VIRTUAL_SCATTER
endif
-ifeq ($(CONFIG_AR6003_BUILD_P2P),y)
- EXTRA_CFLAGS += -DP2P
-endif
ifeq ($(CONFIG_AR6003_2_1),y)
EXTRA_CFLAGS += -DAR6003
Subject: staging/ar6003 doesn't support P2P and BT3.0. So, Revoming P2P and BT 3.0 from ar6003's MakeFile and Kconfig
Signed-off-by: Samuel Chang <[email protected]>
diff -ruN kernel-2.6.37.6-11.5/drivers/staging/ar6003/Kconfig kernel-2.6.37.6-11.5_mod_MakeFile_Kconfig//drivers/staging/ar6003/Kconfig
--- kernel-2.6.37.6-11.5/drivers/staging/ar6003/Kconfig 2011-05-27 06:16:59.000000000 +0800
+++ kernel-2.6.37.6-11.5_mod_MakeFile_Kconfig//drivers/staging/ar6003/Kconfig 2011-06-03 00:53:53.310566451 +0800
@@ -87,12 +87,6 @@
help
Enables BT over SDIO. Applicable only for combo designs (eg: WB31)
-config AR6003_HCI_PAL
- bool "HCI PAL, BT 3.0 Support"
- depends on AR6003
- help
- Enables debug support
-
config AR6003_CONFIG_GPIO_BT_RESET
bool "Configure BT Reset GPIO"
depends on AR6003_HCI_BRIDGE
@@ -153,7 +147,7 @@
choice
prompt "AR6003 HW version"
depends on AR6003
- default AR6003_2_1
+ default AR6003_2_1_1
help
Select AR6003 HW Version
@@ -199,12 +193,6 @@
help
WLAN GPIO to be used for Debug UART (Tx)
-config AR6003_DEBUG_HCI_PAL
- bool "HCI PAL Debug Support"
- depends on AR6003_DEBUG && AR6003_HCI_PAL
- help
- Enables HCI PAL debug support
-
config AR6003_DEBUG_ALLOC
bool "Memory Allocate Debug Support"
depends on AR6003_DEBUG
diff -ruN kernel-2.6.37.6-11.5/drivers/staging/ar6003/Makefile kernel-2.6.37.6-11.5_mod_MakeFile_Kconfig//drivers/staging/ar6003/Makefile
--- kernel-2.6.37.6-11.5/drivers/staging/ar6003/Makefile 2011-06-03 00:47:31.036670863 +0800
+++ kernel-2.6.37.6-11.5_mod_MakeFile_Kconfig//drivers/staging/ar6003/Makefile 2011-06-03 01:01:22.636794539 +0800
@@ -60,15 +60,8 @@
endif
ifeq ($(CONFIG_AR6003_HCI_BRIDGE),y)
- EXTRA_CFLAGS += -DSETUPHCI_ENABLED -DSETUPBTDEV_ENABLED
-endif
-
-ifeq ($(CONFIG_AR6003_HCI_PAL),y)
- EXTRA_CFLAGS += -DSETUPHCIPAL_ENABLED
+ EXTRA_CFLAGS += -DSETUPHCI_ENABLED -DSETUPBTDEV_ENABLED -DAR600x_BT_AR3001
EXTRA_CFLAGS += -DCONFIG_BT
-ifeq ($(CONFIG_AR6003_DEBUG_HCI_PAL),y)
- EXTRA_CFLAGS += -DHCIPAL_DEBUG
-endif
endif
ifeq ($(CONFIG_AR6003_SOFTMAC_FILE_USED),y)
@@ -116,9 +109,6 @@
EXTRA_CFLAGS += -DATH6KL_CONFIG_HIF_VIRTUAL_SCATTER
endif
-ifeq ($(CONFIG_AR6003_BUILD_P2P),y)
- EXTRA_CFLAGS += -DP2P
-endif
ifeq ($(CONFIG_AR6003_2_1),y)
EXTRA_CFLAGS += -DAR6003
_______________________________________________
MeeGo-kernel mailing list
[email protected]
http://lists.meego.com/listinfo/meego-kernel
