riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #17279 from leandrolanzieri/pr/cpu/lpc23xx/model_kconfig

Browse Source 
cpu/lpc23xx: model kconfig
This commit is contained in:
Alexandre Abadie 2021-12-01 13:32:12 +01:00 committed by GitHub
commit a2cfbe95cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 113 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.murdock
View File

@ -15,6 +15,7 @@ arduino-nano
atxmega-a1-xplained
atxmega-a3bu-xplained
avr-rss2
avsextrem
bastwan
cc1352-launchpad
cc2650-launchpad

4
boards/mcb2388/Kconfig
View File

@ -17,3 +17,7 @@ config BOARD_MCB2388
select HAS_PERIPH_SPI
select HAS_PERIPH_TIMER
select HAS_PERIPH_UART
select HAVE_SAUL_ADC
select HAVE_SAUL_GPIO
select HAVE_MTD_SPI_MCI

6
boards/mcb2388/Makefile.dep
View File

@ -3,9 +3,7 @@ ifneq (,$(filter saul_default,$(USEMODULE)))
USEMODULE += saul_gpio
endif
# default to mtd_mci if no other MTD backend is selected
# default to mtd_mci
ifneq (,$(filter mtd,$(USEMODULE)))
ifeq (,$(filter mtd_%,$(USEMODULE)))
USEMODULE += mtd_mci
endif
USEMODULE += mtd_mci
endif

4
boards/msba2/Kconfig
View File

@ -18,3 +18,7 @@ config BOARD_MSBA2
select HAS_PERIPH_SPI
select HAS_PERIPH_TIMER
select HAS_PERIPH_UART
select HAVE_LTC4150
select HAVE_SHT11
select HAVE_MTD_SPI_MCI

6
boards/msba2/Makefile.dep
View File

@ -8,9 +8,7 @@ ifneq (,$(filter saul_default,$(USEMODULE)))
USEMODULE += sht11
endif
# default to mtd_mci if no other MTD backend is selected
# default to mtd_mci
ifneq (,$(filter mtd,$(USEMODULE)))
ifeq (,$(filter mtd_%,$(USEMODULE)))
USEMODULE += mtd_mci
endif
USEMODULE += mtd_mci
endif

18
cpu/arm7_common/Kconfig
View File

@ -12,6 +12,8 @@ config CPU_ARCH_ARMV4T
select HAS_CPP
select HAS_LIBSTDCPP
select MODULE_MALLOC_THREAD_SAFE if TEST_KCONFIG
select MODULE_PERIPH if TEST_KCONFIG
imply MODULE_NEWLIB_NANO
config CPU_CORE_ARM7TDMI_S
bool
@ -35,3 +37,19 @@ config CPU_ARCH
config CPU_CORE
default "arm7tdmi_s" if CPU_CORE_ARM7TDMI_S
config MODULE_ARM7_COMMON
bool
depends on TEST_KCONFIG
depends on MODULE_NEWLIB || MODULE_PICOLIBC
depends on HAS_ARCH_ARM7
default y
help
Common arm7 code.
rsource "periph/Kconfig"
choice LIBC_IMPLEMENTATION
default MODULE_NEWLIB
default MODULE_PICOLIBC
endchoice

14
cpu/arm7_common/periph/Kconfig Normal file
View File

@ -0,0 +1,14 @@
# Copyright (c) 2021 HAW Hamburg
#
# This file is subject to the terms and conditions of the GNU Lesser
# General Public License v2.1. See the file LICENSE in the top level
# directory for more details.
#
config MODULE_ARM7_COMMON_PERIPH
bool
depends on TEST_KCONFIG
depends on HAS_ARCH_ARM7
default y
help
Common arm7 peripheral code.

2
cpu/lpc23xx/Kconfig
View File

@ -17,6 +17,8 @@ config CPU_FAM_LPC23XX
select HAS_PERIPH_TIMER_PERIODIC
select HAS_PERIPH_RTC_MS
select MODULE_BITFIELD if TEST_KCONFIG
## CPU Models
config CPU_MODEL_LPC2387
bool

6
cpu/lpc23xx/Makefile.features
View File

@ -7,3 +7,9 @@ FEATURES_PROVIDED += periph_timer_periodic
FEATURES_PROVIDED += periph_rtc_ms
include $(RIOTCPU)/arm7_common/Makefile.features
# This configuration enables modules that are only available when using Kconfig
# module modelling
ifeq (1, $(TEST_KCONFIG))
KCONFIG_ADD_CONFIG += $(RIOTCPU)/lpc23xx/lpc23xx.config
endif

1
cpu/lpc23xx/lpc23xx.config Normal file
View File

@ -0,0 +1 @@
CONFIG_MODULE_PM_LAYERED=y

1
cpu/lpc23xx/mci/Kconfig
View File

@ -9,3 +9,4 @@ config MODULE_MCI
bool "LPC23XX Multimedia Card Interface (MCI) driver"
depends on CPU_FAM_LPC23XX
depends on TEST_KCONFIG
select MODULE_XTIMER

6
drivers/ltc4150/Kconfig
View File

@ -16,3 +16,9 @@ config MODULE_LTC4150
help
Driver for the Linear Tech LTC4150 Coulomb Counter (a.k.a. battery
gauge sensor or power consumption sensor).
config HAVE_LTC4150
bool
select MODULE_LTC4150 if MODULE_SAUL_DEFAULT
help
Indicates that an ltc4150 coulomb counter is present.

66
drivers/sht1x/Kconfig
View File

@ -5,32 +5,52 @@
# directory for more details.
#
if TEST_KCONFIG
choice
bool "SHT10/SHT11/SHT15 Humidity and Temperature Sensor"
optional
depends on HAS_PERIPH_GPIO
config MODULE_SHT10
bool "SHT10"
select MODULE_SHT1X
config MODULE_SHT11
bool "SHT11"
select MODULE_SHT1X
config MODULE_SHT15
bool "SHT15"
select MODULE_SHT1X
endchoice
config MODULE_SHT1X
menuconfig MODULE_SHT1X
bool
prompt "SHT10/SHT11/SHT15 Humidity and Temperature Sensor" if !(HAVE_SHT1X && MODULE_SAUL_DEFAULT)
default y if HAVE_SHT1X && MODULE_SAUL_DEFAULT
depends on HAS_PERIPH_GPIO
depends on TEST_KCONFIG
select MODULE_PERIPH_GPIO
select MODULE_XTIMER
endif # TEST_KCONFIG
choice
bool "Select sensor variant"
depends on MODULE_SHT1X
default MODULE_SHT10 if HAVE_SHT10
default MODULE_SHT11 if HAVE_SHT11
default MODULE_SHT15 if HAVE_SHT15
config MODULE_SHT10
bool "SHT10"
config MODULE_SHT11
bool "SHT11"
config MODULE_SHT15
bool "SHT15"
endchoice
config HAVE_SHT10
bool
select HAVE_SHT1X
help
Indicates that an sht10 humidity and temperature sensor is present.
config HAVE_SHT11
bool
select HAVE_SHT1X
help
Indicates that an sht11 humidity and temperature sensor is present.
config HAVE_SHT15
bool
select HAVE_SHT1X
help
Indicates that an sht15 humidity and temperature sensor is present.
config HAVE_SHT1X
bool
help
Indicates that an sht1x humidity and temperature sensor is present.

1
tests/driver_sht1x/app.config.test
View File

@ -5,6 +5,7 @@
CONFIG_MODULE_SAUL=y
CONFIG_MODULE_SAUL_DEFAULT=y
CONFIG_MODULE_SHT1X=y
CONFIG_MODULE_SHT11=y
CONFIG_MODULE_PS=y

12
tests/pkg_fatfs_vfs/main.c
View File

@ -67,10 +67,12 @@ static vfs_mount_t _test_vfs_mount = {
/* provide mtd devices for use within diskio layer of fatfs */
mtd_dev_t *fatfs_mtd_devs[FF_VOLUMES];
#ifdef MODULE_MTD_NATIVE
/* mtd device for native is provided in boards/native/board_init.c */
#if defined(MODULE_MTD_NATIVE) || defined(MODULE_MTD_MCI)
/* mtd devices are provided in the board's board_init.c*/
extern mtd_dev_t *mtd0;
#elif MODULE_MTD_SDCARD
#endif
#if defined(MODULE_MTD_SDCARD)
#define SDCARD_SPI_NUM ARRAY_SIZE(sdcard_spi_params)
extern sdcard_spi_t sdcard_spi_devs[SDCARD_SPI_NUM];
mtd_sdcard_t mtd_sdcard_devs[SDCARD_SPI_NUM];
@ -407,7 +409,9 @@ int main(void)
#if defined(MODULE_MTD_NATIVE) || defined(MODULE_MTD_MCI)
fatfs_mtd_devs[fatfs.vol_idx] = mtd0;
#else
#endif
#if defined(MODULE_MTD_SDCARD)
fatfs_mtd_devs[fatfs.vol_idx] = mtd1;
#endif