From c8958d5d75a7bcab6859778526f879482c9b4229 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E9=99=88=E6=99=BA?= Date: Mon, 20 Dec 2010 22:31:09 +0800 Subject: [PATCH] BT: modify config file --- arch/arm/configs/rk29_sdk_defconfig | 49 +++++++++++++++++++++++++---- 1 file changed, 43 insertions(+), 6 deletions(-) diff --git a/arch/arm/configs/rk29_sdk_defconfig b/arch/arm/configs/rk29_sdk_defconfig index 839a760cbc0a..dd93dc073156 100755 --- a/arch/arm/configs/rk29_sdk_defconfig +++ b/arch/arm/configs/rk29_sdk_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.32.27 -# Sat Dec 18 09:08:43 2010 +# Mon Dec 20 22:06:58 2010 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -197,7 +197,8 @@ CONFIG_MMU=y CONFIG_ARCH_RK29=y CONFIG_WIFI_CONTROL_FUNC=y CONFIG_MACH_RK29SDK=y -CONFIG_MACH_RK29SDK_MEM_SIZE_M=512 +# CONFIG_MACH_RK29WINACCORD is not set +CONFIG_RK29_MEM_SIZE_M=512 # # RK29 VPU (Video Processing Unit) support @@ -428,7 +429,29 @@ CONFIG_ANDROID_PARANOID_NETWORK=y # CONFIG_HAMRADIO is not set # CONFIG_CAN is not set # CONFIG_IRDA is not set -# CONFIG_BT is not set +CONFIG_BT=y +CONFIG_BT_L2CAP=y +CONFIG_BT_SCO=y +CONFIG_BT_RFCOMM=y +CONFIG_BT_RFCOMM_TTY=y +# CONFIG_BT_BNEP is not set +# CONFIG_BT_HIDP is not set + +# +# Bluetooth device drivers +# +# CONFIG_BT_HCIBTUSB is not set +# CONFIG_BT_HCIBTSDIO is not set +CONFIG_BT_HCIUART=y +CONFIG_BT_HCIUART_H4=y +# CONFIG_BT_HCIUART_BCSP is not set +# CONFIG_BT_HCIUART_LL is not set +# CONFIG_BT_HCIBCM203X is not set +# CONFIG_BT_HCIBPA10X is not set +# CONFIG_BT_HCIBFUSB is not set +# CONFIG_BT_HCIVHCI is not set +# CONFIG_BT_MRVL is not set +CONFIG_BT_HCIBCM4325=y # CONFIG_AF_RXRPC is not set CONFIG_WIRELESS=y # CONFIG_CFG80211 is not set @@ -446,7 +469,9 @@ CONFIG_WIRELESS_EXT_SYSFS=y # Some wireless drivers require a rate control algorithm # # CONFIG_WIMAX is not set -# CONFIG_RFKILL is not set +CONFIG_RFKILL=y +# CONFIG_RFKILL_PM is not set +# CONFIG_RFKILL_INPUT is not set # CONFIG_NET_9P is not set # @@ -566,6 +591,7 @@ CONFIG_ANDROID_PMEM=y # CONFIG_KERNEL_DEBUGGER_CORE is not set # CONFIG_ISL29003 is not set # CONFIG_UID_STAT is not set +# CONFIG_WL127X_RFKILL is not set # CONFIG_APANIC is not set # CONFIG_STE is not set # CONFIG_C2PORT is not set @@ -693,6 +719,7 @@ CONFIG_BCM4329_NVRAM_PATH="/etc/firmware/nvram_bcm4329_B23.txt" # CONFIG_USB_PEGASUS is not set # CONFIG_USB_RTL8150 is not set # CONFIG_USB_USBNET is not set +# CONFIG_USB_HSO is not set # CONFIG_WAN is not set # CONFIG_PPP is not set # CONFIG_SLIP is not set @@ -765,6 +792,9 @@ CONFIG_TOUCHSCREEN_XPT2046_SPI_NOCHOOSE=y # CONFIG_TOUCHSCREEN_TSC2007 is not set # CONFIG_TOUCHSCREEN_W90X900 is not set CONFIG_HANNSTAR_P1003=y +CONFIG_HANNSTAR_MAX_X=1087 +CONFIG_HANNSTAR_MAX_Y=800 +# CONFIG_HANNSTAR_DEBUG is not set # CONFIG_INPUT_MISC is not set CONFIG_INPUT_GPIO=y # CONFIG_G_SENSOR_DEVICE is not set @@ -799,9 +829,11 @@ CONFIG_DEVKMEM=y CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y CONFIG_SERIAL_RK29=y -# CONFIG_UART0_RK29 is not set +CONFIG_UART0_RK29=y +CONFIG_UART0_CTS_RTS_RK29=y CONFIG_UART1_RK29=y -# CONFIG_UART2_RK29 is not set +CONFIG_UART2_RK29=y +CONFIG_UART2_CTS_RTS_RK29=y # CONFIG_UART3_RK29 is not set CONFIG_SERIAL_RK29_CONSOLE=y CONFIG_UNIX98_PTYS=y @@ -1118,6 +1150,11 @@ CONFIG_TV_NULL=y CONFIG_HDMI_NULL=y # CONFIG_HDMI_ANX7150 is not set +# +# HDMI support +# +# CONFIG_HDMI is not set + # # Console display driver support # -- 2.34.1