From 8e37de3dfc717e3947118d7a2b3dc9dbee1eb5e7 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 21 Aug 2010 11:05:40 +0800 Subject: [PATCH] modify rk2818_info_defconfig to config bcm4329 wifi defaulty --- arch/arm/configs/rk2818_info_defconfig | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/arch/arm/configs/rk2818_info_defconfig b/arch/arm/configs/rk2818_info_defconfig index 39d70141f7be..9de1fb6874b6 100644 --- a/arch/arm/configs/rk2818_info_defconfig +++ b/arch/arm/configs/rk2818_info_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.32.9 -# Fri Aug 6 21:40:27 2010 +# Sat Aug 21 11:03:43 2010 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -205,6 +205,7 @@ CONFIG_ARCH_RK2818=y CONFIG_MACH_RK2818INFO=y CONFIG_RK28_GPIO_IRQ=16 CONFIG_RK28_ADC=y +CONFIG_RK28_USB_WAKE=y # # Processor Type @@ -435,6 +436,7 @@ CONFIG_BT_HCIUART_H4=y # CONFIG_BT_HCIUART_LL is not set # CONFIG_BT_HCIVHCI is not set # CONFIG_BT_MRVL is not set +# CONFIG_BT_HCIBCM4325 is not set # CONFIG_AF_RXRPC is not set CONFIG_WIRELESS=y # CONFIG_CFG80211 is not set @@ -635,12 +637,10 @@ CONFIG_DM9000_USE_NAND_CONTROL=y # CONFIG_NETDEV_10000 is not set CONFIG_WLAN=y # CONFIG_WLAN_PRE80211 is not set -CONFIG_WLAN_80211=y -CONFIG_LIBERTAS=y -CONFIG_LIBERTAS_SDIO=y -# CONFIG_LIBERTAS_SPI is not set -# CONFIG_LIBERTAS_DEBUG is not set -# CONFIG_HOSTAP is not set +# CONFIG_WLAN_80211 is not set +CONFIG_BCM4329=y +CONFIG_BCM4329_FW_PATH="/etc/firmware/fw_bcm4329.bin" +CONFIG_BCM4329_NVRAM_PATH="/etc/firmware/nvram_bcm4329_B23.txt" # # Enable WiMAX (Networking options) to see the WiMAX drivers @@ -730,6 +730,7 @@ CONFIG_TOUCHSCREEN_XPT2046_SPI=y # CONFIG_TOUCHSCREEN_TSC2007 is not set # CONFIG_TOUCHSCREEN_W90X900 is not set CONFIG_INPUT_MISC=y +# CONFIG_INPUT_LPSENSOR_CM3602 is not set # CONFIG_INPUT_ATI_REMOTE is not set # CONFIG_INPUT_ATI_REMOTE2 is not set CONFIG_INPUT_KEYCHORD=y @@ -826,6 +827,7 @@ CONFIG_SPIM_RK2818=y # CONFIG_SPI_SPIDEV is not set # CONFIG_SPI_TLE62X0 is not set # CONFIG_SPI_FPGA is not set +# CONFIG_HEADSET_DET is not set # # PPS support @@ -876,7 +878,6 @@ CONFIG_POWER_SUPPLY=y # CONFIG_BATTERY_BQ27x00 is not set # CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_RK2818 is not set -# CONFIG_PMIC_LP8725 is not set # CONFIG_HWMON is not set # CONFIG_THERMAL is not set # CONFIG_WATCHDOG is not set @@ -919,6 +920,7 @@ CONFIG_REGULATOR_DEBUG=y # CONFIG_REGULATOR_LP3971 is not set # CONFIG_REGULATOR_TPS65023 is not set # CONFIG_REGULATOR_TPS6507X is not set +# CONFIG_RK2818_REGULATOR_LP8725 is not set CONFIG_MEDIA_SUPPORT=y # @@ -1188,6 +1190,7 @@ CONFIG_RTC_HYM8563=y # CONFIG_RTC_DRV_PCF8583 is not set # CONFIG_RTC_DRV_M41T80 is not set # CONFIG_RTC_DRV_S35390A is not set +# CONFIG_RTC_DRV_S35392A is not set # CONFIG_RTC_DRV_FM3130 is not set # CONFIG_RTC_DRV_RX8581 is not set # CONFIG_RTC_DRV_RX8025 is not set -- 2.34.1