diff --git a/boards/seeedstudio-gd32/Kconfig b/boards/seeedstudio-gd32/Kconfig index cae095578b..c4272860fe 100644 --- a/boards/seeedstudio-gd32/Kconfig +++ b/boards/seeedstudio-gd32/Kconfig @@ -12,5 +12,4 @@ config BOARD_SEEEDSTUDIO_GD32 bool default y select CPU_MODEL_GD32VF103VBT6 - select HAS_PERIPH_TIMER select HAS_PERIPH_UART diff --git a/cpu/fe310/Kconfig b/cpu/fe310/Kconfig index f4db3d974f..bcb1a48349 100644 --- a/cpu/fe310/Kconfig +++ b/cpu/fe310/Kconfig @@ -13,6 +13,7 @@ config CPU_FAM_FE310 select HAS_PERIPH_GPIO select HAS_PERIPH_GPIO_IRQ select HAS_PERIPH_PM + select HAS_PERIPH_PLIC select HAS_PERIPH_RTT_OVERFLOW select HAS_PERIPH_RTT_SET_COUNTER select HAS_PERIPH_WDT diff --git a/cpu/fe310/Makefile.dep b/cpu/fe310/Makefile.dep index b3097f251e..684361a387 100644 --- a/cpu/fe310/Makefile.dep +++ b/cpu/fe310/Makefile.dep @@ -1,10 +1,3 @@ - -FEATURES_REQUIRED_ANY += newlib|picolibc -ifneq (,$(filter newlib,$(USEMODULE))) - DEFAULT_MODULE += newlib_nano - USEMODULE += newlib_syscalls_default -endif - USEMODULE += periph USEMODULE += sifive_drivers_fe310 diff --git a/cpu/fe310/Makefile.features b/cpu/fe310/Makefile.features index f7d14f0f5d..56d9979106 100644 --- a/cpu/fe310/Makefile.features +++ b/cpu/fe310/Makefile.features @@ -1,6 +1,7 @@ FEATURES_PROVIDED += periph_cpuid FEATURES_PROVIDED += periph_gpio periph_gpio_irq FEATURES_PROVIDED += periph_pm +FEATURES_PROVIDED += periph_plic FEATURES_PROVIDED += periph_rtt_overflow FEATURES_PROVIDED += periph_rtt_set_counter FEATURES_PROVIDED += periph_wdt diff --git a/cpu/gd32v/Kconfig b/cpu/gd32v/Kconfig index 0ca68c9ecc..0358c5cb49 100644 --- a/cpu/gd32v/Kconfig +++ b/cpu/gd32v/Kconfig @@ -14,6 +14,8 @@ config CPU_FAM_GD32V select HAS_PERIPH_FLASHPAGE select HAS_PERIPH_FLASHPAGE_PAGEWISE select HAS_PERIPH_PM + select HAS_PERIPH_TIMER + select HAS_PERIPH_TIMER_PERIODIC select HAS_PERIPH_WDT config CPU_MODEL_GD32VF103VBT6 diff --git a/cpu/gd32v/Makefile.dep b/cpu/gd32v/Makefile.dep index b5500510a4..7ac5b8a1aa 100644 --- a/cpu/gd32v/Makefile.dep +++ b/cpu/gd32v/Makefile.dep @@ -1,12 +1,6 @@ -FEATURES_REQUIRED += periph_clic -FEATURES_REQUIRED_ANY += newlib|picolibc -ifneq (,$(filter newlib,$(USEMODULE))) - USEMODULE += newlib_nano - USEMODULE += newlib_syscalls_default -endif - USEMODULE += periph -USEMODULE += riscv_common + +FEATURES_REQUIRED += periph_clic ifneq (,$(filter periph_pm,$(USEMODULE))) FEATURES_REQUIRED += periph_wdt diff --git a/cpu/gd32v/Makefile.features b/cpu/gd32v/Makefile.features index 489f9ca4b9..3090c73568 100644 --- a/cpu/gd32v/Makefile.features +++ b/cpu/gd32v/Makefile.features @@ -1,6 +1,7 @@ FEATURES_PROVIDED += periph_clic FEATURES_PROVIDED += periph_gpio FEATURES_PROVIDED += periph_timer +FEATURES_PROVIDED += periph_timer_periodic FEATURES_PROVIDED += periph_wdt FEATURES_PROVIDED += periph_pm FEATURES_PROVIDED += periph_flashpage diff --git a/cpu/riscv_common/Kconfig b/cpu/riscv_common/Kconfig index 635d3c8a09..24f1329b41 100644 --- a/cpu/riscv_common/Kconfig +++ b/cpu/riscv_common/Kconfig @@ -11,7 +11,6 @@ config CPU_ARCH_RISCV select HAS_LIBSTDCPP select HAS_NEWLIB select HAS_PERIPH_CORETIMER - select HAS_PERIPH_PLIC select HAS_PICOLIBC if '$(RIOT_CI_BUILD)' != '1' select MODULE_MALLOC_THREAD_SAFE if TEST_KCONFIG select HAS_SSP diff --git a/cpu/riscv_common/Makefile.dep b/cpu/riscv_common/Makefile.dep index 70aa523b8c..a141e51efc 100644 --- a/cpu/riscv_common/Makefile.dep +++ b/cpu/riscv_common/Makefile.dep @@ -1,3 +1,10 @@ +# Select a C library +FEATURES_REQUIRED_ANY += newlib|picolibc +ifneq (,$(filter newlib,$(USEMODULE))) + DEFAULT_MODULE += newlib_nano + USEMODULE += newlib_syscalls_default +endif + # Tell the build system that the CPU depends on the risc-v common files: USEMODULE += riscv_common diff --git a/cpu/riscv_common/Makefile.features b/cpu/riscv_common/Makefile.features index e73b5bdb50..ef3f9e470f 100644 --- a/cpu/riscv_common/Makefile.features +++ b/cpu/riscv_common/Makefile.features @@ -4,7 +4,6 @@ FEATURES_PROVIDED += cpp FEATURES_PROVIDED += libstdcpp FEATURES_PROVIDED += newlib FEATURES_PROVIDED += periph_coretimer -FEATURES_PROVIDED += periph_plic FEATURES_PROVIDED += ssp # RISC-V toolchain on CI does not work properly with picolibc yet