espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-30 02:37:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

refactor(soc): SOC_USB_PERIPH_NUM option

Browse Source 
This commit refactors SOC_USB_PERIPH_NUM as follows:

- Renamed to SOC_USB_OTG_PERIPH_NUM to avoid confusion with USB Serial JTAG
- Updated to unsigned integer "1U"
- Updated some build rules to depend on SOC_USB_OTG_SUPPORTED instead
This commit is contained in:
Darian Leung
2023-11-14 18:45:27 +08:00
committed by Peter Marcisovsky
parent 32160c7b74
commit ec2ba71f97
6 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
components/soc/esp32s2/include/soc/Kconfig.soc_caps.in
View File

@ -719,9 +719,9 @@ config SOC_SPIRAM_SUPPORTED
bool bool
default y default y
config SOC_USB_PERIPH_NUM config SOC_USB_OTG_PERIPH_NUM
bool int
default y default 1
config SOC_SHA_DMA_MAX_BUFFER_SIZE config SOC_SHA_DMA_MAX_BUFFER_SIZE
int int

3
components/soc/esp32s2/include/soc/soc_caps.h
View File

@ -320,8 +320,7 @@
#define SOC_SPIRAM_SUPPORTED 1 #define SOC_SPIRAM_SUPPORTED 1
/*-------------------------- USB CAPS ----------------------------------------*/ /*-------------------------- USB CAPS ----------------------------------------*/
#define SOC_USB_PERIPH_NUM 1 #define SOC_USB_OTG_PERIPH_NUM (1U)
/*--------------------------- SHA CAPS ---------------------------------------*/ /*--------------------------- SHA CAPS ---------------------------------------*/
/* Max amount of bytes in a single DMA operation is 4095, /* Max amount of bytes in a single DMA operation is 4095,

6
components/soc/esp32s3/include/soc/Kconfig.soc_caps.in
View File

@ -815,9 +815,9 @@ config SOC_UART_REQUIRE_CORE_RESET
bool bool
default y default y
config SOC_USB_PERIPH_NUM config SOC_USB_OTG_PERIPH_NUM
bool int
default y default 1
config SOC_SHA_DMA_MAX_BUFFER_SIZE config SOC_SHA_DMA_MAX_BUFFER_SIZE
int int

2
components/soc/esp32s3/include/soc/soc_caps.h
View File

@ -333,7 +333,7 @@
#define SOC_UART_REQUIRE_CORE_RESET (1) #define SOC_UART_REQUIRE_CORE_RESET (1)
/*-------------------------- USB CAPS ----------------------------------------*/ /*-------------------------- USB CAPS ----------------------------------------*/
#define SOC_USB_PERIPH_NUM 1 #define SOC_USB_OTG_PERIPH_NUM (1U)
/*--------------------------- SHA CAPS ---------------------------------------*/ /*--------------------------- SHA CAPS ---------------------------------------*/

2
examples/peripherals/.build-test-rules.yml
View File

@ -191,7 +191,7 @@ examples/peripherals/uart/uart_echo_rs485:
examples/peripherals/usb: examples/peripherals/usb:
disable: disable:
- if: SOC_USB_PERIPH_NUM != 1 - if: SOC_USB_OTG_SUPPORTED != 1
examples/peripherals/wave_gen: examples/peripherals/wave_gen:
enable: enable:

5
examples/system/.build-test-rules.yml
View File

@ -22,7 +22,10 @@ examples/system/console/advanced:
examples/system/console/advanced_usb_cdc: examples/system/console/advanced_usb_cdc:
disable: disable:
- if: SOC_USB_PERIPH_NUM == 0 - if: SOC_USB_OTG_SUPPORTED != 1
depends_components:
- console
- vfs
examples/system/console/basic: examples/system/console/basic:
disable: disable: