sdkconfig: update defaults

redchenjs · redchenjs · commit 8611a4e85af6 · 2019-07-03T20:49:49.000+08:00
diff --git a/sdkconfig.defaults b/sdkconfig.defaults
@@ -1,8 +1,7 @@
 #
 # Serial flasher config
 #
-CONFIG_ESPTOOLPY_BAUD_921600B=y
-CONFIG_FLASHMODE_QIO=y
+CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
 CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
 CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
 
@@ -15,32 +14,28 @@ CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
 #
 # Compiler options
 #
-CONFIG_OPTIMIZATION_LEVEL_RELEASE=y
+CONFIG_COMPILER_OPTIMIZATION_LEVEL_RELEASE=y
 
 #
 # Bluetooth
 #
 CONFIG_BT_ENABLED=y
+CONFIG_BTDM_CTRL_MODE_BTDM=y
 CONFIG_BLUEDROID_ENABLED=y
-CONFIG_CLASSIC_BT_ENABLED=y
-CONFIG_A2DP_ENABLE=y
-CONFIG_GATTS_ENABLE=y
+CONFIG_BT_CLASSIC_ENABLED=y
+CONFIG_BT_A2DP_ENABLE=y
 CONFIG_BT_SPP_ENABLED=y
+CONFIG_BT_SSP_ENABLED=y
+CONFIG_BT_BLE_ENABLED=y
+CONFIG_BT_GATTS_ENABLE=y
 CONFIG_BT_STACK_NO_LOG=y
-CONFIG_BTDM_CONTROLLER_MODE_BTDM=y
 
 #
 # ESP32-specific
 #
 CONFIG_ESP32_DEFAULT_CPU_FREQ_240=y
 CONFIG_NEWLIB_NANO_FORMAT=y
 
-#
-# Wi-Fi
-#
-CONFIG_SW_COEXIST_ENABLE=y
-CONFIG_SW_COEXIST_PREFERENCE_BT=y
-
 #
 # FreeRTOS
 #

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,7 @@`
`1`	`1`	`#`
`2`	`2`	`# Serial flasher config`
`3`	`3`	`#`
`4`		`-CONFIG_ESPTOOLPY_BAUD_921600B=y`
`5`		`-CONFIG_FLASHMODE_QIO=y`
	`4`	`+CONFIG_ESPTOOLPY_FLASHMODE_QIO=y`
`6`	`5`	`CONFIG_ESPTOOLPY_FLASHFREQ_80M=y`
`7`	`6`	`CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y`
`8`	`7`
`@@ -15,32 +14,28 @@ CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"`
`15`	`14`	`#`
`16`	`15`	`# Compiler options`
`17`	`16`	`#`
`18`		`-CONFIG_OPTIMIZATION_LEVEL_RELEASE=y`
	`17`	`+CONFIG_COMPILER_OPTIMIZATION_LEVEL_RELEASE=y`
`19`	`18`
`20`	`19`	`#`
`21`	`20`	`# Bluetooth`
`22`	`21`	`#`
`23`	`22`	`CONFIG_BT_ENABLED=y`
	`23`	`+CONFIG_BTDM_CTRL_MODE_BTDM=y`
`24`	`24`	`CONFIG_BLUEDROID_ENABLED=y`
`25`		`-CONFIG_CLASSIC_BT_ENABLED=y`
`26`		`-CONFIG_A2DP_ENABLE=y`
`27`		`-CONFIG_GATTS_ENABLE=y`
	`25`	`+CONFIG_BT_CLASSIC_ENABLED=y`
	`26`	`+CONFIG_BT_A2DP_ENABLE=y`
`28`	`27`	`CONFIG_BT_SPP_ENABLED=y`
	`28`	`+CONFIG_BT_SSP_ENABLED=y`
	`29`	`+CONFIG_BT_BLE_ENABLED=y`
	`30`	`+CONFIG_BT_GATTS_ENABLE=y`
`29`	`31`	`CONFIG_BT_STACK_NO_LOG=y`
`30`		`-CONFIG_BTDM_CONTROLLER_MODE_BTDM=y`
`31`	`32`
`32`	`33`	`#`
`33`	`34`	`# ESP32-specific`
`34`	`35`	`#`
`35`	`36`	`CONFIG_ESP32_DEFAULT_CPU_FREQ_240=y`
`36`	`37`	`CONFIG_NEWLIB_NANO_FORMAT=y`
`37`	`38`
`38`		`-#`
`39`		`-# Wi-Fi`
`40`		`-#`
`41`		`-CONFIG_SW_COEXIST_ENABLE=y`
`42`		`-CONFIG_SW_COEXIST_PREFERENCE_BT=y`
`43`		`-`
`44`	`39`	`#`
`45`	`40`	`# FreeRTOS`
`46`	`41`	`#`