summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorEric Nelson <eric.nelson@boundarydevices.com>2013-06-03 17:43:11 -0700
committerEric Nelson <eric.nelson@boundarydevices.com>2013-06-03 17:43:11 -0700
commite4e8d89fc6b8d44690595757f3bb4ac6a3f314bc (patch)
tree1085fbd007c3e042e6d098c9cfe6c7e2fb3ef0f6 /arch
parent936d90aa26f18625ac9f83bbfd6d2334810a2e78 (diff)
nit6xlite_defconfig: move broadcom firmware to /lib/firmware, add G_SERIAL
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/configs/nit6xlite_defconfig12
1 files changed, 3 insertions, 9 deletions
diff --git a/arch/arm/configs/nit6xlite_defconfig b/arch/arm/configs/nit6xlite_defconfig
index c45becd7b3d1..98e32f352ead 100644
--- a/arch/arm/configs/nit6xlite_defconfig
+++ b/arch/arm/configs/nit6xlite_defconfig
@@ -102,8 +102,6 @@ CONFIG_MTD_UBI=y
CONFIG_BLK_DEV_LOOP=y
CONFIG_MISC_DEVICES=y
CONFIG_MXS_PERFMON=m
-CONFIG_BLK_DEV_SD=y
-CONFIG_SCSI_MULTI_LUN=y
CONFIG_NETDEVICES=y
CONFIG_TUN=y
CONFIG_MII=y
@@ -113,6 +111,8 @@ CONFIG_FEC_NAPI=y
# CONFIG_NETDEV_1000 is not set
# CONFIG_NETDEV_10000 is not set
CONFIG_BCMDHD=m
+CONFIG_BCMDHD_FW_PATH="/lib/firmware/fw_bcmdhd.bin"
+CONFIG_BCMDHD_NVRAM_PATH="/lib/firmware/bcmdhd.cal"
CONFIG_INPUT_POLLDEV=y
CONFIG_INPUT_EVDEV=y
CONFIG_KEYBOARD_GPIO=y
@@ -131,7 +131,6 @@ CONFIG_SERIAL_IMX_CONSOLE=y
CONFIG_FSL_OTP=y
CONFIG_HW_RANDOM=y
CONFIG_MXS_VIIM=y
-CONFIG_I2C=y
CONFIG_I2C_CHARDEV=y
CONFIG_I2C_MUX=y
CONFIG_I2C_MUX_GPIO=y
@@ -191,13 +190,11 @@ CONFIG_USB_EHCI_ARC=y
CONFIG_USB_EHCI_ROOT_HUB_TT=y
# CONFIG_USB_EHCI_TT_NEWSCHED is not set
CONFIG_USB_ACM=y
-CONFIG_USB_STORAGE=y
CONFIG_USB_SERIAL=y
CONFIG_USB_SERIAL_QUALCOMM=y
CONFIG_USB_SERIAL_OPTION=y
CONFIG_USB_GADGET=y
-CONFIG_USB_G_ANDROID=y
-CONFIG_USB_OTG_WAKELOCK=y
+CONFIG_USB_G_SERIAL=m
CONFIG_MXC_OTG=y
CONFIG_MMC=y
CONFIG_MMC_UNSAFE_RESUME=y
@@ -210,9 +207,6 @@ CONFIG_LEDS_GPIO=y
CONFIG_LEDS_TRIGGERS=y
CONFIG_LEDS_TRIGGER_GPIO=y
CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
-CONFIG_LEDS_TRIGGER_SLEEP=y
-CONFIG_SWITCH=y
-CONFIG_SWITCH_GPIO=y
CONFIG_RTC_CLASS=y
CONFIG_RTC_INTF_DEV_UIE_EMUL=y
CONFIG_RTC_DRV_ISL1208=y