Merge pull request #5860 from tannewt/s3_core_1

Switch CP to core 1 on S3
This commit is contained in:
Dan Halbert 2022-01-17 16:10:05 -05:00 committed by GitHub
commit 3453ced296
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 5 deletions

View File

@ -86,10 +86,10 @@ CONFIG_ESP32S3_UNIVERSAL_MAC_ADDRESSES=4
# end of MAC Config # end of MAC Config
CONFIG_ESP_SLEEP_GPIO_RESET_WORKAROUND=y CONFIG_ESP_SLEEP_GPIO_RESET_WORKAROUND=y
CONFIG_ESP_MAIN_TASK_AFFINITY_CPU0=y # CONFIG_ESP_MAIN_TASK_AFFINITY_CPU0 is not set
# CONFIG_ESP_MAIN_TASK_AFFINITY_CPU1 is not set CONFIG_ESP_MAIN_TASK_AFFINITY_CPU1=y
# CONFIG_ESP_MAIN_TASK_AFFINITY_NO_AFFINITY is not set # CONFIG_ESP_MAIN_TASK_AFFINITY_NO_AFFINITY is not set
CONFIG_ESP_MAIN_TASK_AFFINITY=0x0 CONFIG_ESP_MAIN_TASK_AFFINITY=0x1
# #
# Wi-Fi # Wi-Fi
# #

View File

@ -246,6 +246,7 @@ CONFIG_ESP_PHY_CALIBRATION_AND_DATA_STORAGE=y
# CONFIG_ESP_PHY_INIT_DATA_IN_PARTITION is not set # CONFIG_ESP_PHY_INIT_DATA_IN_PARTITION is not set
CONFIG_ESP_PHY_MAX_WIFI_TX_POWER=20 CONFIG_ESP_PHY_MAX_WIFI_TX_POWER=20
CONFIG_ESP_PHY_MAX_TX_POWER=20 CONFIG_ESP_PHY_MAX_TX_POWER=20
CONFIG_ESP_PHY_ENABLE_USB=y
# end of PHY # end of PHY
# CONFIG_PM_ENABLE is not set # CONFIG_PM_ENABLE is not set

View File

@ -9,6 +9,7 @@ OPT_SETTINGS = [
"CONFIG_ESP_CONSOLE_", "CONFIG_ESP_CONSOLE_",
"CONFIG_CONSOLE_UART_", "CONFIG_CONSOLE_UART_",
"CONFIG_ESP_SYSTEM_PANIC_", "CONFIG_ESP_SYSTEM_PANIC_",
"CONFIG_ESP32S2_PANIC_",
"COMPILER_OPTIMIZATION_", "COMPILER_OPTIMIZATION_",
"CONFIG_ESP32S3_DEBUG_OCDAWARE", "CONFIG_ESP32S3_DEBUG_OCDAWARE",
"CONFIG_FREERTOS_ASSERT_", "CONFIG_FREERTOS_ASSERT_",
@ -142,8 +143,7 @@ def update(debug, board, update_all):
current_group = None current_group = None
else: else:
current_group = line[2:] current_group = line[2:]
elif (not update_all and line not in defaults) or (
if (not update_all and line not in defaults) or (
update_all and matches_group(line, BOARD_SETTINGS) update_all and matches_group(line, BOARD_SETTINGS)
): ):
last_board_group = add_group(board_settings, last_board_group, current_group) last_board_group = add_group(board_settings, last_board_group, current_group)