mirror
/
esp-idf
kopia lustrzana https://github.com/espressif/esp-idf
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Rename Kconfig options (components/esptool_py)

pull/3528/head
Roland Dobai 2019-05-09 13:39:30 +02:00
rodzic 6c0a7a66f3
commit 997b29a9ca
15 zmienionych plików z 73 dodań i 56 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
components/bootloader/Kconfig.projbuild
Wyświetl plik

@ -32,7 +32,7 @@ menu "Bootloader config"
int "SPI Flash WP Pin when customising pins via eFuse (read help)"
range 0 33
default 7
depends on FLASHMODE_QIO || FLASHMODE_QOUT
depends on ESPTOOLPY_FLASHMODE_QIO || ESPTOOLPY_FLASHMODE_QOUT
help
This value is ignored unless flash mode is set to QIO or QOUT *and* the SPI flash pins have been
overriden by setting the eFuses SPI_PAD_CONFIG_xxx.

2
components/bootloader_support/src/bootloader_init.c
Wyświetl plik

@ -173,7 +173,7 @@ static esp_err_t bootloader_main()
ESP_LOGI(TAG, "Enabling RNG early entropy source...");
bootloader_random_enable();
#if CONFIG_FLASHMODE_QIO || CONFIG_FLASHMODE_QOUT
#if CONFIG_ESPTOOLPY_FLASHMODE_QIO || CONFIG_ESPTOOLPY_FLASHMODE_QOUT
bootloader_enable_qio_mode();
#endif

2
components/bootloader_support/src/flash_qio_mode.c
Wyświetl plik

@ -211,7 +211,7 @@ static esp_err_t enable_qio_mode(read_status_fn_t read_status_fn,
ESP_LOGD(TAG, "Enabling QIO mode...");
esp_rom_spiflash_read_mode_t mode;
#if CONFIG_FLASHMODE_QOUT
#if CONFIG_ESPTOOLPY_FLASHMODE_QOUT
mode = ESP_ROM_SPIFLASH_QOUT_MODE;
#else
mode = ESP_ROM_SPIFLASH_QIO_MODE;

58
components/esptool_py/Kconfig.projbuild
Wyświetl plik

@ -54,20 +54,20 @@ menu "Serial flasher config"
decompress it on the fly before flashing it. For most payloads, this should result in a
speed increase.
choice FLASHMODE
choice ESPTOOLPY_FLASHMODE
prompt "Flash SPI mode"
default FLASHMODE_DIO
default ESPTOOLPY_FLASHMODE_DIO
help
Mode the flash chip is flashed in, as well as the default mode for the
binary to run in.
config FLASHMODE_QIO
config ESPTOOLPY_FLASHMODE_QIO
bool "QIO"
config FLASHMODE_QOUT
config ESPTOOLPY_FLASHMODE_QOUT
bool "QOUT"
config FLASHMODE_DIO
config ESPTOOLPY_FLASHMODE_DIO
bool "DIO"
config FLASHMODE_DOUT
config ESPTOOLPY_FLASHMODE_DOUT
bool "DOUT"
endchoice
@ -76,10 +76,10 @@ menu "Serial flasher config"
# itself to quad mode during initialisation
config ESPTOOLPY_FLASHMODE
string
default "dio" if FLASHMODE_QIO
default "dio" if FLASHMODE_QOUT
default "dio" if FLASHMODE_DIO
default "dout" if FLASHMODE_DOUT
default "dio" if ESPTOOLPY_FLASHMODE_QIO
default "dio" if ESPTOOLPY_FLASHMODE_QOUT
default "dio" if ESPTOOLPY_FLASHMODE_DIO
default "dout" if ESPTOOLPY_FLASHMODE_DOUT
choice ESPTOOLPY_FLASHFREQ
prompt "Flash SPI speed"
@ -180,44 +180,44 @@ menu "Serial flasher config"
default "hard_reset" if ESPTOOLPY_AFTER_RESET
default "no_reset" if ESPTOOLPY_AFTER_NORESET
choice MONITOR_BAUD
choice ESPTOOLPY_MONITOR_BAUD
prompt "'make monitor' baud rate"
default MONITOR_BAUD_115200B
default ESPTOOLPY_MONITOR_BAUD_115200B
help
Baud rate to use when running 'make monitor' to view serial output
from a running chip.
Can override by setting the MONITORBAUD environment variable.
config MONITOR_BAUD_9600B
config ESPTOOLPY_MONITOR_BAUD_9600B
bool "9600 bps"
config MONITOR_BAUD_57600B
config ESPTOOLPY_MONITOR_BAUD_57600B
bool "57600 bps"
config MONITOR_BAUD_115200B
config ESPTOOLPY_MONITOR_BAUD_115200B
bool "115200 bps"
config MONITOR_BAUD_230400B
config ESPTOOLPY_MONITOR_BAUD_230400B
bool "230400 bps"
config MONITOR_BAUD_921600B
config ESPTOOLPY_MONITOR_BAUD_921600B
bool "921600 bps"
config MONITOR_BAUD_2MB
config ESPTOOLPY_MONITOR_BAUD_2MB
bool "2 Mbps"
config MONITOR_BAUD_OTHER
config ESPTOOLPY_MONITOR_BAUD_OTHER
bool "Custom baud rate"
endchoice
config MONITOR_BAUD_OTHER_VAL
int "Custom baud rate value" if MONITOR_BAUD_OTHER
config ESPTOOLPY_MONITOR_BAUD_OTHER_VAL
int "Custom baud rate value" if ESPTOOLPY_MONITOR_BAUD_OTHER
default 115200
config MONITOR_BAUD
config ESPTOOLPY_MONITOR_BAUD
int
default 9600 if MONITOR_BAUD_9600B
default 57600 if MONITOR_BAUD_57600B
default 115200 if MONITOR_BAUD_115200B
default 230400 if MONITOR_BAUD_230400B
default 921600 if MONITOR_BAUD_921600B
default 2000000 if MONITOR_BAUD_2MB
default MONITOR_BAUD_OTHER_VAL if MONITOR_BAUD_OTHER
default 9600 if ESPTOOLPY_MONITOR_BAUD_9600B
default 57600 if ESPTOOLPY_MONITOR_BAUD_57600B
default 115200 if ESPTOOLPY_MONITOR_BAUD_115200B
default 230400 if ESPTOOLPY_MONITOR_BAUD_230400B
default 921600 if ESPTOOLPY_MONITOR_BAUD_921600B
default 2000000 if ESPTOOLPY_MONITOR_BAUD_2MB
default ESPTOOLPY_MONITOR_BAUD_OTHER_VAL if ESPTOOLPY_MONITOR_BAUD_OTHER
endmenu

2
components/esptool_py/Makefile.projbuild
Wyświetl plik

@ -81,7 +81,7 @@ erase_flash: | check_python_dependencies
@echo "Erasing entire flash..."
$(ESPTOOLPY_SERIAL) erase_flash
MONITORBAUD ?= $(CONFIG_MONITOR_BAUD)
MONITORBAUD ?= $(CONFIG_ESPTOOLPY_MONITOR_BAUD)
MONITOR_PYTHON := $(PYTHON)

17
components/esptool_py/sdkconfig.rename 100644
Wyświetl plik

@ -0,0 +1,17 @@
# sdkconfig replacement configurations for deprecated options formatted as
# CONFIG_DEPRECATED_OPTION CONFIG_NEW_OPTION
CONFIG_FLASHMODE_QIO CONFIG_ESPTOOLPY_FLASHMODE_QIO
CONFIG_FLASHMODE_QOUT CONFIG_ESPTOOLPY_FLASHMODE_QOUT
CONFIG_FLASHMODE_DIO CONFIG_ESPTOOLPY_FLASHMODE_DIO
CONFIG_FLASHMODE_DOUT CONFIG_ESPTOOLPY_FLASHMODE_DOUT
CONFIG_MONITOR_BAUD CONFIG_ESPTOOLPY_MONITOR_BAUD
CONFIG_MONITOR_BAUD_9600B CONFIG_ESPTOOLPY_MONITOR_BAUD_9600B
CONFIG_MONITOR_BAUD_57600B CONFIG_ESPTOOLPY_MONITOR_BAUD_57600B
CONFIG_MONITOR_BAUD_115200B CONFIG_ESPTOOLPY_MONITOR_BAUD_115200B
CONFIG_MONITOR_BAUD_230400B CONFIG_ESPTOOLPY_MONITOR_BAUD_230400B
CONFIG_MONITOR_BAUD_921600B CONFIG_ESPTOOLPY_MONITOR_BAUD_921600B
CONFIG_MONITOR_BAUD_2MB CONFIG_ESPTOOLPY_MONITOR_BAUD_2MB
CONFIG_MONITOR_BAUD_OTHER CONFIG_ESPTOOLPY_MONITOR_BAUD_OTHER
CONFIG_MONITOR_BAUD_OTHER_VAL CONFIG_ESPTOOLPY_MONITOR_BAUD_OTHER_VAL

4
examples/bluetooth/ble_throughput/throughput_client/sdkconfig.defaults
Wyświetl plik

@ -12,8 +12,8 @@ CONFIG_BTDM_CTRL_PINNED_TO_CORE=1
#
# Serial flasher config
#
CONFIG_MONITOR_BAUD_921600B=y
CONFIG_MONITOR_BAUD=921600
CONFIG_ESPTOOLPY_MONITOR_BAUD_921600B=y
CONFIG_ESPTOOLPY_MONITOR_BAUD=921600
#
# ESP32-specific
#

4
examples/bluetooth/ble_throughput/throughput_server/sdkconfig.defaults
Wyświetl plik

@ -12,8 +12,8 @@ CONFIG_BTDM_CTRL_PINNED_TO_CORE=1
#
# Serial flasher config
#
CONFIG_MONITOR_BAUD_921600B=y
CONFIG_MONITOR_BAUD=921600
CONFIG_ESPTOOLPY_MONITOR_BAUD_921600B=y
CONFIG_ESPTOOLPY_MONITOR_BAUD=921600
#
# ESP32-specific
#

2
examples/wifi/iperf/sdkconfig.defaults
Wyświetl plik

@ -25,7 +25,7 @@ CONFIG_LWIP_UDP_RECVMBOX_SIZE=64
CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=64
CONFIG_LWIP_ETHARP_TRUST_IP_MAC=n
CONFIG_FLASHMODE_QIO=y
CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
CONFIG_ESPTOOLPY_FLASHFREQ_40M=y
CONFIG_LWIP_IRAM_OPTIMIZATION=y

2
examples/wifi/iperf/sdkconfig.defaults.05
Wyświetl plik

@ -23,7 +23,7 @@ CONFIG_LWIP_UDP_RECVMBOX_SIZE=64
CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=64
CONFIG_LWIP_ETHARP_TRUST_IP_MAC=
CONFIG_FLASHMODE_QIO=y
CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
CONFIG_LWIP_IRAM_OPTIMIZATION=y

2
examples/wifi/iperf/sdkconfig.defaults.06
Wyświetl plik

@ -21,6 +21,6 @@ CONFIG_LWIP_UDP_RECVMBOX_SIZE=64
CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=64
CONFIG_LWIP_ETHARP_TRUST_IP_MAC=
CONFIG_FLASHMODE_QIO=y
CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
CONFIG_LWIP_IRAM_OPTIMIZATION=y

2
examples/wifi/iperf/sdkconfig.defaults.07
Wyświetl plik

@ -25,6 +25,6 @@ CONFIG_LWIP_UDP_RECVMBOX_SIZE=64
CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=64
CONFIG_LWIP_ETHARP_TRUST_IP_MAC=
CONFIG_FLASHMODE_QIO=y
CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
CONFIG_LWIP_IRAM_OPTIMIZATION=y

2
examples/wifi/iperf/sdkconfig.defaults.99
Wyświetl plik

@ -25,6 +25,6 @@ CONFIG_LWIP_UDP_RECVMBOX_SIZE=64
CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=64
CONFIG_LWIP_ETHARP_TRUST_IP_MAC=
CONFIG_FLASHMODE_QIO=y
CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
CONFIG_LWIP_IRAM_OPTIMIZATION=y

2
tools/cmake/project_description.json.in
Wyświetl plik

@ -8,7 +8,7 @@
"app_bin": "${PROJECT_BIN}",
"git_revision": "${IDF_VER}",
"phy_data_partition": "${CONFIG_ESP32_PHY_INIT_DATA_IN_PARTITION}",
"monitor_baud" : "${CONFIG_MONITOR_BAUD}",
"monitor_baud" : "${CONFIG_ESPTOOLPY_MONITOR_BAUD}",
"config_environment" : {
"COMPONENT_KCONFIGS" : "${COMPONENT_KCONFIGS}",
"COMPONENT_KCONFIGS_PROJBUILD" : "${COMPONENT_KCONFIGS_PROJBUILD}"

26
tools/ldgen/samples/sdkconfig
Wyświetl plik

@ -36,10 +36,10 @@ CONFIG_ESPTOOLPY_BAUD_OTHER=
CONFIG_ESPTOOLPY_BAUD_OTHER_VAL=115200
CONFIG_ESPTOOLPY_BAUD=115200
CONFIG_ESPTOOLPY_COMPRESSED=
CONFIG_FLASHMODE_QIO=
CONFIG_FLASHMODE_QOUT=
CONFIG_FLASHMODE_DIO=y
CONFIG_FLASHMODE_DOUT=
CONFIG_ESPTOOLPY_FLASHMODE_QIO=
CONFIG_ESPTOOLPY_FLASHMODE_QOUT=
CONFIG_ESPTOOLPY_FLASHMODE_DIO=y
CONFIG_ESPTOOLPY_FLASHMODE_DOUT=
CONFIG_ESPTOOLPY_FLASHMODE="dio"
CONFIG_ESPTOOLPY_FLASHFREQ_80M=
CONFIG_ESPTOOLPY_FLASHFREQ_40M=y
@ -59,15 +59,15 @@ CONFIG_ESPTOOLPY_BEFORE="default_reset"
CONFIG_ESPTOOLPY_AFTER_RESET=y
CONFIG_ESPTOOLPY_AFTER_NORESET=
CONFIG_ESPTOOLPY_AFTER="hard_reset"
CONFIG_MONITOR_BAUD_9600B=
CONFIG_MONITOR_BAUD_57600B=
CONFIG_MONITOR_BAUD_115200B=y
CONFIG_MONITOR_BAUD_230400B=
CONFIG_MONITOR_BAUD_921600B=
CONFIG_MONITOR_BAUD_2MB=
CONFIG_MONITOR_BAUD_OTHER=
CONFIG_MONITOR_BAUD_OTHER_VAL=115200
CONFIG_MONITOR_BAUD=115200
CONFIG_ESPTOOLPY_MONITOR_BAUD_9600B=
CONFIG_ESPTOOLPY_MONITOR_BAUD_57600B=
CONFIG_ESPTOOLPY_MONITOR_BAUD_115200B=y
CONFIG_ESPTOOLPY_MONITOR_BAUD_230400B=
CONFIG_ESPTOOLPY_MONITOR_BAUD_921600B=
CONFIG_ESPTOOLPY_MONITOR_BAUD_2MB=
CONFIG_ESPTOOLPY_MONITOR_BAUD_OTHER=
CONFIG_ESPTOOLPY_MONITOR_BAUD_OTHER_VAL=115200
CONFIG_ESPTOOLPY_MONITOR_BAUD=115200
#
# Partition Table