Skip to content

Commit e0fdc3c

Browse files
committed
*Kconfig*: Modify Kconfig to remove dep model
1 parent 7a68fb0 commit e0fdc3c

File tree

544 files changed

+674
-9602
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

544 files changed

+674
-9602
lines changed

Kconfig

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,6 @@ mainmenu "RIOT Configuration"
99
# Load macro definitions
1010
rsource "kconfigs/Kconfig.consts"
1111

12-
# Load feature declarations
13-
rsource "kconfigs/Kconfig.features"
14-
15-
# Load error symbols
16-
rsource "kconfigs/Kconfig.errors"
17-
1812
# For now, get used modules as macros from this file (see kconfig.mk)
1913
osource "$(KCONFIG_GENERATED_DEPENDENCIES)"
2014

@@ -41,23 +35,5 @@ menu "External Packages"
4135
osource "$(KCONFIG_EXTERNAL_PKG_CONFIGS)"
4236
endmenu # External Packages
4337

44-
comment "RIOT is in a migration phase."
4538
comment "Some configuration options may not be here. Use CFLAGS instead."
46-
47-
comment "!! ERROR: There are conflicting modules active !!"
48-
depends on ERROR_MODULES_CONFLICT != ""
49-
50-
config TEST_KCONFIG
51-
bool
52-
default y if '$(TEST_KCONFIG)' = '1'
53-
help
54-
This is used during the Kconfig migration to test the module dependency
55-
modelling. Don't change the default value unless you know what you are
56-
doing.
57-
58-
config DEVELHELP
59-
bool "Development Help"
60-
help
61-
Set to enable code in RIOT that does safety checking which might not be
62-
needed in a production environment but helps in the development
63-
process.
39+
comment "Ideally, make a PR to add them to the Kconfig."

boards/Kconfig

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,3 @@ config BOARD
88
string
99
help
1010
Name of the currently selected board.
11-
12-
config MODULE_BOARD
13-
bool
14-
default y
15-
depends on TEST_KCONFIG
16-
help
17-
Module which holds all board-specific files.
18-
19-
config MODULE_BOARD_COMMON_INIT
20-
bool
21-
default y
22-
depends on TEST_KCONFIG
23-
help
24-
Common board initialization module

boards/acd52832/Kconfig

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,5 @@ config BOARD_ACD52832
1212
default y
1313
select BOARD_COMMON_NRF52
1414
select CPU_MODEL_NRF52832XXAA
15-
select HAS_PERIPH_I2C
16-
select HAS_PERIPH_SPI
17-
select HAS_PERIPH_UART
18-
19-
select HAVE_SAUL_GPIO
2015

2116
source "$(RIOTBOARD)/common/nrf52xxxdk/Kconfig"

boards/adafruit-clue/Kconfig

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,5 @@ config BOARD_ADAFRUIT_CLUE
1212
default y
1313
select BOARD_COMMON_NRF52
1414
select CPU_MODEL_NRF52840XXAA
15-
select HAS_PERIPH_I2C
16-
select HAS_PERIPH_SPI
17-
select HAS_PERIPH_UART
18-
select HAS_PERIPH_USBDEV
19-
select HAS_HIGHLEVEL_STDIO
20-
21-
select HAVE_APDS9960
22-
select HAVE_BMP280_I2C
23-
select HAVE_ILI9341
24-
select HAVE_LIS3MDL
25-
select HAVE_SAUL_GPIO
26-
select HAVE_SHT3X
27-
28-
select MODULE_USB_BOARD_RESET if KCONFIG_USB && TEST_KCONFIG
29-
30-
config FORCE_USB_STDIO
31-
default y
3215

3316
source "$(RIOTBOARD)/common/nrf52/Kconfig"

boards/adafruit-grand-central-m4-express/Kconfig

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -11,26 +11,3 @@ config BOARD_ADAFRUIT_GRAND_CENTRAL_M4_EXPRESS
1111
bool
1212
default y
1313
select CPU_MODEL_SAMD51P20A
14-
select HAS_ARDUINO_ANALOG
15-
select HAS_ARDUINO_PINS
16-
select HAS_HIGHLEVEL_STDIO
17-
select HAS_PERIPH_ADC
18-
select HAS_PERIPH_DAC
19-
select HAS_PERIPH_I2C
20-
select HAS_PERIPH_PWM
21-
select HAS_PERIPH_RTC
22-
select HAS_PERIPH_RTT
23-
select HAS_PERIPH_SPI
24-
select HAS_PERIPH_TIMER
25-
select HAS_PERIPH_UART
26-
select HAS_PERIPH_USBDEV
27-
select HAVE_SAUL_GPIO
28-
29-
select HAVE_MTD_SPI_NOR
30-
# This specific board requires SPI_ON_QSPI for the MTD_SPI_NOR
31-
select MODULE_PERIPH_SPI_ON_QSPI if MODULE_MTD_SPI_NOR
32-
33-
select HAVE_MTD_SDCARD_DEFAULT
34-
select MODULE_FATFS_VFS if MODULE_VFS_DEFAULT
35-
36-
source "$(RIOTBOARD)/common/samdx1-arduino-bootloader/Kconfig"

boards/adafruit-itsybitsy-m4/Kconfig

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,3 @@ config BOARD_ADAFRUIT_ITSYBITSY_M4
1111
bool
1212
default y
1313
select CPU_MODEL_SAMD51G19A
14-
select HAS_HIGHLEVEL_STDIO
15-
select HAS_PERIPH_DAC
16-
select HAS_PERIPH_ADC
17-
select HAS_PERIPH_I2C
18-
select HAS_PERIPH_RTC
19-
select HAS_PERIPH_RTT
20-
select HAS_PERIPH_PWM
21-
select HAS_PERIPH_SPI
22-
select HAS_PERIPH_TIMER
23-
select HAS_PERIPH_UART
24-
select HAS_PERIPH_USBDEV
25-
select HAVE_SAUL_GPIO
26-
27-
select HAVE_MTD_SPI_NOR
28-
# This specific board requires SPI_ON_QSPI for the MTD_SPI_NOR
29-
select MODULE_PERIPH_SPI_ON_QSPI if MODULE_MTD_SPI_NOR
30-
31-
source "$(RIOTBOARD)/common/samdx1-arduino-bootloader/Kconfig"

boards/adafruit-itsybitsy-nrf52/Kconfig

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,5 @@ config BOARD_ADAFRUIT_ITSYBITSY_NRF52
1212
default y
1313
select BOARD_COMMON_NRF52
1414
select CPU_MODEL_NRF52840XXAA
15-
select HAS_PERIPH_I2C
16-
select HAS_PERIPH_SPI
17-
select HAS_PERIPH_UART
18-
select HAS_PERIPH_USBDEV
19-
select HAS_HIGHLEVEL_STDIO
20-
21-
select HAVE_SAUL_GPIO
22-
23-
select MODULE_USB_BOARD_RESET if KCONFIG_USB && TEST_KCONFIG
24-
25-
config FORCE_USB_STDIO
26-
default y
2715

2816
source "$(RIOTBOARD)/common/nrf52/Kconfig"

boards/adafruit-pybadge/Kconfig

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,3 @@ config BOARD_ADAFRUIT_PYBADGE
1111
bool
1212
default y
1313
select CPU_MODEL_SAMD51J19A
14-
select HAS_HIGHLEVEL_STDIO
15-
select HAS_PERIPH_ADC
16-
select HAS_PERIPH_DAC
17-
select HAS_PERIPH_I2C
18-
select HAS_PERIPH_PWM
19-
select HAS_PERIPH_RTC
20-
select HAS_PERIPH_RTT
21-
select HAS_PERIPH_SPI
22-
select HAS_PERIPH_TIMER
23-
select HAS_PERIPH_UART
24-
select HAS_PERIPH_USBDEV
25-
26-
select HAVE_ST7735
27-
select HAVE_SAUL_GPIO
28-
select HAVE_MTD_SPI_NOR
29-
# This specific board requires SPI_ON_QSPI for the MTD_SPI_NOR
30-
select MODULE_PERIPH_SPI_ON_QSPI if MODULE_MTD_SPI_NOR
31-
32-
source "$(RIOTBOARD)/common/samdx1-arduino-bootloader/Kconfig"

boards/airfy-beacon/Kconfig

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,5 @@ config BOARD_AIRFY_BEACON
1212
default y
1313
select BOARD_COMMON_NRF51
1414
select CPU_MODEL_NRF51X22XXAA
15-
select HAS_PERIPH_ADC
16-
select HAS_PERIPH_I2C
17-
select HAS_PERIPH_SPI
18-
select HAS_PERIPH_UART
19-
select MODULE_BOARDS_COMMON_NRF51 if TEST_KCONFIG
2015

2116
source "$(RIOTBOARD)/common/nrf51/Kconfig"

boards/alientek-pandora/Kconfig

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,7 @@ config BOARD_ALIENTEK_PANDORA
1313
default y
1414
select CPU_MODEL_STM32L475VE
1515

16-
# Put defined MCU peripherals here (in alphabetical order)
17-
select HAS_PERIPH_RTC
18-
select HAS_PERIPH_RTT
19-
select HAS_PERIPH_TIMER
20-
select HAS_PERIPH_UART
21-
22-
# Put other features for this board (in alphabetical order)
23-
select HAS_RIOTBOOT
24-
2516
# Clock configuration
2617
select BOARD_HAS_LSE
2718

28-
select HAVE_SAUL_GPIO
29-
3019
source "$(RIOTBOARD)/common/stm32/Kconfig"

0 commit comments

Comments
 (0)