summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorNarayan Reddy <narayanr@nvidia.com>2013-03-06 19:37:04 +0530
committerSimone Willett <swillett@nvidia.com>2013-03-07 18:14:53 -0800
commitcca1b18907537a5ef0552efd5c3a07dde83ff1d3 (patch)
tree14dd4cead8e3e182cd79a0c5e74ad5d74cbbe524 /arch
parent8c1f88070461da517761aff7bdbbe37e4343ddb8 (diff)
ARM: tegra: config: change wifi firmware path
Change firmware and nvram path to /system/xxxxx inorder to retain after issuing the wipe command. Disable BCM4335,Marvel,TI support, since they are not applicable for rel-roth branch. Bug 1231868 Change-Id: Ic6d0f84a4d38ddb6286cc7a8d8642f64ee9a7df2 Signed-off-by: Narayan Reddy <narayanr@nvidia.com> Reviewed-on: http://git-master/r/206689 Reviewed-by: Simone Willett <swillett@nvidia.com> Tested-by: Simone Willett <swillett@nvidia.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/configs/tegra11_android_defconfig15
1 files changed, 3 insertions, 12 deletions
diff --git a/arch/arm/configs/tegra11_android_defconfig b/arch/arm/configs/tegra11_android_defconfig
index 7151bc386881..f5c16810b074 100644
--- a/arch/arm/configs/tegra11_android_defconfig
+++ b/arch/arm/configs/tegra11_android_defconfig
@@ -239,25 +239,17 @@ CONFIG_USB_NET_SMSC95XX=y
# CONFIG_USB_NET_ZAURUS is not set
CONFIG_USB_NET_RAW_IP=m
CONFIG_BCMDHD=m
-CONFIG_BCMDHD_FW_PATH="/data/misc/wifi/firmware/fw_bcmdhd.bin"
-CONFIG_BCMDHD_NVRAM_PATH="/data/misc/wifi/firmware/nvram.txt"
+CONFIG_BCMDHD_FW_PATH="/system/vendor/firmware/bcm43241/fw_bcmdhd.bin"
+CONFIG_BCMDHD_NVRAM_PATH="/system/etc/nvram_43241.txt"
CONFIG_BCMDHD_CFG80211=y
CONFIG_BCMDHD_WIFI_CONTROL_FUNC=y
CONFIG_BCMDHD_HW_OOB=y
CONFIG_BCMDHD_INSMOD_NO_FW_LOAD=y
-CONFIG_BCM4335=m
-CONFIG_BCM4335_FW_PATH="/data/misc/wifi/firmware/fw_bcmdhd.bin"
-CONFIG_BCM4335_NVRAM_PATH="/data/misc/wifi/firmware/nvram.txt"
-CONFIG_BCM4335_WIFI_CONTROL_FUNC=y
-CONFIG_BCM4335_HW_OOB=y
-CONFIG_SD8797=m
-CONFIG_WL12XX_MENU=m
-CONFIG_WL12XX=m
-CONFIG_WL12XX_SDIO=m
# CONFIG_INPUT_MOUSEDEV is not set
CONFIG_INPUT_JOYDEV=y
CONFIG_INPUT_EVDEV=y
CONFIG_INPUT_KEYRESET=y
+CONFIG_INPUT_CFBOOST=y
# CONFIG_KEYBOARD_ATKBD is not set
CONFIG_KEYBOARD_GPIO=y
CONFIG_KEYBOARD_TEGRA=y
@@ -274,7 +266,6 @@ CONFIG_INPUT_UINPUT=y
CONFIG_INPUT_GPIO=y
CONFIG_INPUT_CAPELLA_CM3217=y
CONFIG_INPUT_CAPELLA_CM3218=y
-CONFIG_INPUT_CFBOOST=y
CONFIG_INV_AK8975=m
CONFIG_INV_MPU=m
CONFIG_SERIO_LIBPS2=y