summaryrefslogtreecommitdiff
path: root/chromeos/config
diff options
context:
space:
mode:
authorWei Ni <wni@nvidia.com>2012-10-08 16:42:03 +0800
committerDan Willemsen <dwillemsen@nvidia.com>2013-09-14 12:36:57 -0700
commitecdcc0e36273de4fca8fcdc31bf011a01459cce1 (patch)
treec3a990817db4fa74fa85c249e2d2727809844314 /chromeos/config
parent569e81a25df5b1261664f6228f0350d6a531ca8f (diff)
ChromeOs: enable config TEGRA_PREPOWER_WIFI
Use brcmfmac for both bcm4329 and bcm4330. Enable TEGRA_PREPOWER_WIFI: enable it, so that the sdhci driver can scan the wlan. Disable BCMDHD disable bcmdhd driver,which is for bcm4330. Change-Id: I4c08638a7038349019ce515abe477f8faa2b5726 Signed-off-by: Wei Ni <wni@nvidia.com> Reviewed-on: http://git-master/r/143991 Reviewed-by: Simone Willett <swillett@nvidia.com> Tested-by: Simone Willett <swillett@nvidia.com> Rebase-Id: R1fb91f9f63c84fe61e1da72bf65af7187759b03f
Diffstat (limited to 'chromeos/config')
-rw-r--r--chromeos/config/armel/chromeos-tegra3.flavour.config19
1 files changed, 10 insertions, 9 deletions
diff --git a/chromeos/config/armel/chromeos-tegra3.flavour.config b/chromeos/config/armel/chromeos-tegra3.flavour.config
index f3248d2be2b0..35e65ba0dae9 100644
--- a/chromeos/config/armel/chromeos-tegra3.flavour.config
+++ b/chromeos/config/armel/chromeos-tegra3.flavour.config
@@ -58,17 +58,17 @@ CONFIG_BATTERY_BQ27x00=y
CONFIG_BATTERY_GAUGE_TPS8003X=y
# CONFIG_BATTERY_SBS is not set
CONFIG_BCM4329_RFKILL=y
-CONFIG_BCMDHD=m
-CONFIG_BCMDHD_CFG80211=y
-CONFIG_BCMDHD_CSCAN_ENABLE=y
+# CONFIG_BCMDHD is not set
+# CONFIG_BCMDHD_CFG80211 is not set
+# CONFIG_BCMDHD_CSCAN_ENABLE is not set
# CONFIG_BCMDHD_CUSTOM_REGULATORY_DOMAIN is not set
-CONFIG_BCMDHD_FW_PATH="/lib/firmware/bcm4330/fw_bcmdhd.bin"
-CONFIG_BCMDHD_HW_OOB=y
-CONFIG_BCMDHD_INSMOD_NO_FW_LOAD=y
+# CONFIG_BCMDHD_FW_PATH="/lib/firmware/bcm4330/fw_bcmdhd.bin"
+# CONFIG_BCMDHD_HW_OOB is not set
+# CONFIG_BCMDHD_INSMOD_NO_FW_LOAD is not set
# CONFIG_BCMDHD_NOAPI is not set
-CONFIG_BCMDHD_NVRAM_PATH="/lib/firmware/nvram_4330.txt"
+# CONFIG_BCMDHD_NVRAM_PATH="/lib/firmware/nvram_4330.txt"
# CONFIG_BCMDHD_WEXT is not set
-CONFIG_BCMDHD_WIFI_CONTROL_FUNC=y
+# CONFIG_BCMDHD_WIFI_CONTROL_FUNC is not set
# CONFIG_BE2ISCSI is not set
# CONFIG_BE2NET is not set
# CONFIG_BLK_CPQ_CISS_DA is not set
@@ -93,6 +93,7 @@ CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
# CONFIG_BRCMDBG is not set
CONFIG_BRCMFMAC=m
CONFIG_BRCMFMAC_SDIO=y
+# CONFIG_BRCMFMAC_SDIO_OOB is not set
# CONFIG_BRCMFMAC_USB is not set
CONFIG_BRCMUTIL=m
CONFIG_BT=y
@@ -1143,7 +1144,7 @@ CONFIG_TEGRA_NVMAP=y
CONFIG_TEGRA_PCI=y
CONFIG_TEGRA_PLLM_RESTRICTED=y
CONFIG_TEGRA_PREINIT_CLOCKS=y
-# CONFIG_TEGRA_PREPOWER_WIFI is not set
+CONFIG_TEGRA_PREPOWER_WIFI=y
CONFIG_TEGRA_PWM=y
CONFIG_TEGRA_RPC=y
# CONFIG_TEGRA_SD_GEN2 is not set