Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-04 14:53:47 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

boards/arm/rp2040: move duplicate peripheral configs to common

Browse Source 
Kconfigs with same names in different files could not be handled
correctly

Signed-off-by: Peter Bee <bijunda1@xiaomi.com>
This commit is contained in:
Peter Bee
2023-01-18 16:05:04 +08:00
committed by Alan Carvalho de Assis
parent dc454765fb
commit 5d08844413
5 changed files with 44 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files
boards/arm/rp2040/adafruit-feather-rp2040/Kconfig
-28
View File
@@ -5,32 +5,4 @@
if ARCH_BOARD_ADAFRUIT_FEATHER_RP2040 if ARCH_BOARD_ADAFRUIT_FEATHER_RP2040
config RP2040_LCD_SPI_CH
int "RP2040 LCD SPI channel number"
default 0
range 0 1
depends on LCD
---help---
Select SPI channel number to use LCD display.
config RP2040_ENC28J60_SPI_CH
int "ENC28J60 SPI channel number"
default 1
range 0 1
depends on ENC28J60
---help---
Select SPI channel number to use ENC28J60 ethernet.
config RP2040_ENC28J60_INTR_GPIO
int "ENC28J60 interrupt GPIO pin assign"
default -1
range -1 29
depends on ENC28J60
config RP2040_ENC28J60_RESET_GPIO
int "ENC28J60 reset GPIO pin assign (optional)"
default -1
range -1 29
depends on ENC28J60
endif endif
boards/arm/rp2040/adafruit-kb2040/Kconfig
-28
View File
@@ -5,32 +5,4 @@
if ARCH_BOARD_ADAFRUIT_KB2040 if ARCH_BOARD_ADAFRUIT_KB2040
config RP2040_LCD_SPI_CH
int "RP2040 LCD SPI channel number"
default 0
range 0 1
depends on LCD
---help---
Select SPI channel number to use LCD display.
config RP2040_ENC28J60_SPI_CH
int "ENC28J60 SPI channel number"
default 1
range 0 1
depends on ENC28J60
---help---
Select SPI channel number to use ENC28J60 ethernet.
config RP2040_ENC28J60_INTR_GPIO
int "ENC28J60 interrupt GPIO pin assign"
default -1
range -1 29
depends on ENC28J60
config RP2040_ENC28J60_RESET_GPIO
int "ENC28J60 reset GPIO pin assign (optional)"
default -1
range -1 29
depends on ENC28J60
endif endif
boards/arm/rp2040/common/Kconfig
+41 -1
View File
@@ -482,7 +482,7 @@ if RP2040_PWM7
endif # PWM_MULTICHAN && PWM_NCHANNELS > 1 endif # PWM_MULTICHAN && PWM_NCHANNELS > 1
endif # RP2040_PWM7 endif # RP2040_PWM7
##################################################################### #####################################################################
# I2S Configuration # I2S Configuration
##################################################################### #####################################################################
@@ -540,3 +540,43 @@ if RP2040_FLASH_FILE_SYSTEM
This is the overall amount of flash memory on the board. This is the overall amount of flash memory on the board.
endif # RP2040_FLASH_FILE_SYSTEM endif # RP2040_FLASH_FILE_SYSTEM
#####################################################################
# LCD Configuration
#####################################################################
if LCD
config RP2040_LCD_SPI_CH
int "RP2040 LCD SPI channel number"
default 0
range 0 1
---help---
Select SPI channel number to use LCD display.
endif # LCD
#####################################################################
# Ethernet Configuration
#####################################################################
if ENC28J60
config RP2040_ENC28J60_SPI_CH
int "ENC28J60 SPI channel number"
default 1
range 0 1
---help---
Select SPI channel number to use ENC28J60 ethernet.
config RP2040_ENC28J60_INTR_GPIO
int "ENC28J60 interrupt GPIO pin assign"
default -1
range -1 29
config RP2040_ENC28J60_RESET_GPIO
int "ENC28J60 reset GPIO pin assign (optional)"
default -1
range -1 29
endif # ENC28J60
boards/arm/rp2040/raspberrypi-pico-w/Kconfig
+3 -31
View File
@@ -5,34 +5,6 @@
if ARCH_BOARD_RASPBERRYPI_PICO_W if ARCH_BOARD_RASPBERRYPI_PICO_W
config RP2040_LCD_SPI_CH
int "RP2040 LCD SPI channel number"
default 0
range 0 1
depends on LCD
---help---
Select SPI channel number to use LCD display.
config RP2040_ENC28J60_SPI_CH
int "ENC28J60 SPI channel number"
default 1
range 0 1
depends on ENC28J60
---help---
Select SPI channel number to use ENC28J60 ethernet.
config RP2040_ENC28J60_INTR_GPIO
int "ENC28J60 interrupt GPIO pin assign"
default -1
range -1 29
depends on ENC28J60
config RP2040_ENC28J60_RESET_GPIO
int "ENC28J60 reset GPIO pin assign (optional)"
default -1
range -1 29
depends on ENC28J60
menuconfig RP2040_INFINEON_CYW43439 menuconfig RP2040_INFINEON_CYW43439
bool "Has Infineon cyw43439 WiFi chip" bool "Has Infineon cyw43439 WiFi chip"
depends on IEEE80211_INFINEON_CYW43439 depends on IEEE80211_INFINEON_CYW43439
@@ -57,10 +29,10 @@ if RP2040_INFINEON_CYW43439
default 224190 default 224190
---help--- ---help---
This is the length of just the base firmware in the firmware file specified This is the length of just the base firmware in the firmware file specified
by the "Path to Infineon 43439 firmware file" configuration option. by the "Path to Infineon 43439 firmware file" configuration option.
This length does not include the length of any padding nor the length of This length does not include the length of any padding nor the length of
the appended clm_blob. If a clm_blob is present in the firmware file, this the appended clm_blob. If a clm_blob is present in the firmware file, this
length will be less than the length of the whole file. length will be less than the length of the whole file.
boards/arm/rp2040/raspberrypi-pico/Kconfig
-28
View File
@@ -5,32 +5,4 @@
if ARCH_BOARD_RASPBERRYPI_PICO if ARCH_BOARD_RASPBERRYPI_PICO
config RP2040_LCD_SPI_CH
int "RP2040 LCD SPI channel number"
default 0
range 0 1
depends on LCD
---help---
Select SPI channel number to use LCD display.
config RP2040_ENC28J60_SPI_CH
int "ENC28J60 SPI channel number"
default 1
range 0 1
depends on ENC28J60
---help---
Select SPI channel number to use ENC28J60 ethernet.
config RP2040_ENC28J60_INTR_GPIO
int "ENC28J60 interrupt GPIO pin assign"
default -1
range -1 29
depends on ENC28J60
config RP2040_ENC28J60_RESET_GPIO
int "ENC28J60 reset GPIO pin assign (optional)"
default -1
range -1 29
depends on ENC28J60
endif endif