mirror of
https://github.com/RIOT-OS/RIOT.git
synced 2024-12-29 04:50:03 +01:00
boards/esp*: replace FLASH_MODE_* by CONFIG_*FLASHMODE_* defines
The former FLASH_MODE_{DOUT,DIO,QOUT,QIO} defines are replaced by the corresponding CONFIG_FLASHMODE_{DOUT,DIO,QOUT,QIO} and CONFIG_ESPTOOLPY_FLASHMODE_{DOUT,DIO,QOUT,QIO} as used by the ESP-IDF. This is also needed for the migration of defining flash mode in Kconfig.
This commit is contained in:
parent
b4fafef6e7
commit
ae16753f6f
@ -152,7 +152,7 @@
|
||||
#define UART0_TXD GPIO1 /**< direct I/O pin for UART_DEV(0) TxD, can't be changed */
|
||||
#define UART0_RXD GPIO3 /**< direct I/O pin for UART_DEV(0) RxD, can't be changed */
|
||||
|
||||
#if FLASH_MODE_DOUT || FLASH_MODE_DIO || DOXYGEN
|
||||
#if CONFIG_FLASHMODE_DOUT || CONFIG_FLASHMODE_DIO || DOXYGEN
|
||||
#ifndef UART1_TXD
|
||||
#define UART1_TXD GPIO10 /**< direct I/O pin for UART_DEV(1) TxD */
|
||||
#endif
|
||||
|
@ -145,7 +145,7 @@
|
||||
#define UART0_TXD GPIO1 /**< direct I/O pin for UART_DEV(0) TxD, can't be changed */
|
||||
#define UART0_RXD GPIO3 /**< direct I/O pin for UART_DEV(0) RxD, can't be changed */
|
||||
|
||||
#if FLASH_MODE_DOUT || FLASH_MODE_DIO || DOXYGEN
|
||||
#if CONFIG_FLASHMODE_DOUT || CONFIG_FLASHMODE_DIO || DOXYGEN
|
||||
#ifndef UART1_TXD
|
||||
#define UART1_TXD GPIO10 /**< direct I/O pin for UART_DEV(1) TxD */
|
||||
#endif
|
||||
|
@ -129,7 +129,7 @@ extern "C" {
|
||||
* as PWM channels with `PWM_DEV(0)`.
|
||||
*/
|
||||
#ifndef PWM0_GPIOS
|
||||
#if FLASH_MODE_DOUT || FLASH_MODE_DIO || DOXYGEN
|
||||
#if CONFIG_FLASHMODE_DOUT || CONFIG_FLASHMODE_DIO || DOXYGEN
|
||||
#define PWM0_GPIOS { GPIO9, GPIO10 }
|
||||
#else
|
||||
#error Configuration problem: Flash mode qio or qout is used, \
|
||||
|
@ -182,7 +182,7 @@ extern "C" {
|
||||
#define UART0_TXD GPIO1 /**< direct I/O pin for UART_DEV(0) TxD, can't be changed */
|
||||
#define UART0_RXD GPIO3 /**< direct I/O pin for UART_DEV(0) RxD, can't be changed */
|
||||
|
||||
#if FLASH_MODE_DOUT || FLASH_MODE_DIO || DOXYGEN
|
||||
#if CONFIG_FLASHMODE_DOUT || CONFIG_FLASHMODE_DIO || DOXYGEN
|
||||
#ifndef UART1_TXD
|
||||
#define UART1_TXD GPIO10 /**< direct I/O pin for UART_DEV(1) TxD */
|
||||
#endif
|
||||
|
@ -39,7 +39,7 @@ static const gpio_t arduino_pinmap[] = {
|
||||
GPIO3, /* ARDUINO_PIN_1 (TxD) */
|
||||
GPIO0, /* ARDUINO_PIN_2 */
|
||||
GPIO2, /* ARDUINO_PIN_3 */
|
||||
#if defined(FLASH_MODE_QIO) || defined(FLASH_MODE_QOUT)
|
||||
#if defined(CONFIG_FLASHMODE_QIO) || defined(CONFIG_FLASHMODE_QOUT)
|
||||
GPIO9, /* ARDUINO_PIN_4 */
|
||||
GPIO10, /* ARDUINO_PIN_5 */
|
||||
#else
|
||||
|
@ -37,7 +37,7 @@ static const gpio_t arduino_pinmap[] = {
|
||||
GPIO3, /* ARDUINO_PIN_1 (TxD) */
|
||||
GPIO0, /* ARDUINO_PIN_2 */
|
||||
GPIO4, /* ARDUINO_PIN_3 */
|
||||
#if defined(FLASH_MODE_QIO) || defined(FLASH_MODE_QOUT)
|
||||
#if defined(CONFIG_FLASHMODE_QIO) || defined(CONFIG_FLASHMODE_QOUT)
|
||||
GPIO9, /* ARDUINO_PIN_4 */
|
||||
GPIO10, /* ARDUINO_PIN_5 */
|
||||
#else
|
||||
|
@ -37,7 +37,7 @@ static const gpio_t arduino_pinmap[] = {
|
||||
GPIO3, /* ARDUINO_PIN_1 (TxD) */
|
||||
GPIO0, /* ARDUINO_PIN_2 */
|
||||
GPIO4, /* ARDUINO_PIN_3 */
|
||||
#if defined(FLASH_MODE_QIO) || defined(FLASH_MODE_QOUT)
|
||||
#if defined(CONFIG_FLASHMODE_QIO) || defined(CONFIG_FLASHMODE_QOUT)
|
||||
GPIO9, /* ARDUINO_PIN_4 */
|
||||
GPIO10, /* ARDUINO_PIN_5 */
|
||||
#else
|
||||
|
Loading…
Reference in New Issue
Block a user