kaspar/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-29 16:31:18 +01:00
Code Releases Activity

Merge pull request #18739 from jue89/feature/pkg-gecko_sdk_41

Browse Source 
pkg/gecko_sdk: Bump to version 4.1.2
This commit is contained in:
Marian Buschsieweke 2022-10-15 18:11:23 +02:00 committed by GitHub
commit c58817f839
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 84 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cpu/efm32/Makefile.features
View File

@ -3,6 +3,9 @@ include $(RIOTCPU)/efm32/efm32-features.mk
CPU_CORE = $(EFM32_ARCHITECTURE)
# allow CPU families to add features individually
-include $(RIOTCPU)/efm32/families/$(CPU_FAM)/Makefile.features
# families without MPU
ifeq (,$(filter efm32zg efm32hg, $(CPU_FAM)))
FEATURES_PROVIDED += cortexm_mpu
@ -22,6 +25,9 @@ FEATURES_PROVIDED += periph_wdt
FEATURES_CONFLICT += periph_rtc:periph_rtt
FEATURES_CONFLICT_MSG += "On the EFM32, the RTC and RTT map to the same hardware peripheral."
FEATURES_CONFLICT += cortexm_fpu:gecko_sdk_librail_nonfpu
FEATURES_CONFLICT_MSG += "Using librail with the FPU enabled is not supported on this CPU."
ifeq (1,$(EFM32_TRNG))
FEATURES_PROVIDED += periph_hwrng
endif

3
cpu/efm32/Makefile.include
View File

@ -6,6 +6,9 @@ include $(RIOTCPU)/efm32/efm32-info.mk
# `cpu_$(CPU_FAM)` for something that is MODULE related.
include $(RIOTCPU)/efm32/families/$(CPU_FAM)/Makefile.include
# Export vars for Gecko SDK librail Makefile
export EFM32_LIBRAIL_BLOB_NAME
ifeq (,$(EFM32_HEADER))
$(error Header file for $(CPU_MODEL) is missing)
endif

1
cpu/efm32/families/efr32mg12p/Kconfig
View File

@ -11,6 +11,7 @@ config CPU_FAM_EFR32MG12P
select CPU_EFM32_SERIES1
select HAS_PERIPH_HWRNG
select HAS_CORTEXM_MPU
select HAS_GECKO_SDK_LIBRAIL_NONFPU
config MODULE_CPU_EFR32MG12P
bool

1
cpu/efm32/families/efr32mg12p/Makefile.features Normal file
View File

@ -0,0 +1 @@
FEATURES_PROVIDED += gecko_sdk_librail_nonfpu

7
cpu/efm32/families/efr32mg12p/Makefile.include
View File

@ -3,5 +3,10 @@
# as easy as adding the header file only.
EFM32_HEADER = $(wildcard $(RIOTCPU)/efm32/families/efr32mg12p/include/vendor/$(CPU_MODEL).h)
# Names of librail related files
EFM32_LIBRAIL_BLOB_NAME = efr32xg12
EFM32_LIBRAIL_HEADER_NAME = efr32xg1x
EFM32_LIBRAIL_PA_HEADER_NAME = efr32xg1x
# include vendor device headers
INCLUDES += -I$(RIOTCPU)/efm32/families/efr32mg12p/include/vendor
INCLUDES += -I$(RIOTCPU)/efm32/families/efr32mg12p/include/vendor

1
cpu/efm32/families/efr32mg1b/Kconfig
View File

@ -10,6 +10,7 @@ config CPU_FAM_EFR32MG1B
select CPU_COMMON_EFM32
select CPU_EFM32_SERIES1
select HAS_CORTEXM_MPU
select HAS_GECKO_SDK_LIBRAIL_NONFPU
config MODULE_CPU_EFR32MG1B
bool

1
cpu/efm32/families/efr32mg1b/Makefile.features Normal file
View File

@ -0,0 +1 @@
FEATURES_PROVIDED += gecko_sdk_librail_nonfpu

7
cpu/efm32/families/efr32mg1b/Makefile.include
View File

@ -3,5 +3,10 @@
# as easy as adding the header file only.
EFM32_HEADER = $(wildcard $(RIOTCPU)/efm32/families/efr32mg1b/include/vendor/$(CPU_MODEL).h)
# Names of librail related files
EFM32_LIBRAIL_BLOB_NAME = efr32xg1
EFM32_LIBRAIL_HEADER_NAME = efr32xg1x
EFM32_LIBRAIL_PA_HEADER_NAME = efr32xg1x
# include vendor device headers
INCLUDES += -I$(RIOTCPU)/efm32/families/efr32mg1b/include/vendor
INCLUDES += -I$(RIOTCPU)/efm32/families/efr32mg1b/include/vendor

1
cpu/efm32/families/efr32mg1p/Kconfig
View File

@ -10,6 +10,7 @@ config CPU_FAM_EFR32MG1P
select CPU_COMMON_EFM32
select CPU_EFM32_SERIES1
select HAS_CORTEXM_MPU
select HAS_GECKO_SDK_LIBRAIL_NONFPU
config MODULE_CPU_EFR32MG1P
bool

1
cpu/efm32/families/efr32mg1p/Makefile.features Normal file
View File

@ -0,0 +1 @@
FEATURES_PROVIDED += gecko_sdk_librail_nonfpu

5
cpu/efm32/families/efr32mg1p/Makefile.include
View File

@ -3,5 +3,10 @@
# as easy as adding the header file only.
EFM32_HEADER = $(wildcard $(RIOTCPU)/efm32/families/efr32mg1p/include/vendor/$(CPU_MODEL).h)
# Names of librail related files
EFM32_LIBRAIL_BLOB_NAME = efr32xg1
EFM32_LIBRAIL_HEADER_NAME = efr32xg1x
EFM32_LIBRAIL_PA_HEADER_NAME = efr32xg1x
# include vendor device headers
INCLUDES += -I$(RIOTCPU)/efm32/families/efr32mg1p/include/vendor

4
cpu/efm32/periph/gpio.c
View File

@ -122,8 +122,8 @@ int gpio_init_int(gpio_t pin, gpio_mode_t mode, gpio_flank_t flank,
isr_ctx[_pin_num(pin)].arg = arg;
/* enable interrupts */
GPIO_IntConfig(_port_num(pin), _pin_num(pin),
flank & GPIO_RISING, flank & GPIO_FALLING, true);
GPIO_ExtIntConfig(_port_num(pin), _pin_num(pin), _pin_num(pin),
flank & GPIO_RISING, flank & GPIO_FALLING, true);
NVIC_ClearPendingIRQ(GPIO_EVEN_IRQn);
NVIC_ClearPendingIRQ(GPIO_ODD_IRQn);

34
pkg/gecko_sdk/Kconfig
View File

@ -1,11 +1,29 @@
# Copyright (c) 2021 HAW Hamburg
# 2022 SSV Software Systems GmbH
#
# 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 PACKAGE_GECKO_SDK
## Definition of Gecko SDK specific features
config HAS_GECKO_SDK_LIBRAIL_NONFPU
bool
help
Indicates that the CPU offers librail support if the FPU is disabled.
Librail is shipped as pre-compiled blobs. Thus, we have to adapt to
their choice how to process floats.
config HAS_GECKO_SDK_LIBRAIL_FPU
bool
help
Indicates that the CPU offers librail support if the FPU is enabled.
Librail is shipped as pre-compiled blobs. Thus, we have to adapt to
their choice how to process floats.
## Provided modules
menuconfig PACKAGE_GECKO_SDK
bool "Vendor library for EFM/EFR/EZR32 MCUs"
depends on TEST_KCONFIG
help
@ -27,4 +45,18 @@ config MODULE_GECKO_SDK_EMLIB_EXTRA
help
Extra utility methods from EMBLIB vendor library.
config MODULE_GECKO_SDK_LIBRAIL
bool "Radio Abstraction Interface Layer (RAIL)"
depends on (HAS_GECKO_SDK_LIBRAIL_NONFPU && !MODULE_CORTEXM_FPU) || (HAS_GECKO_SDK_LIBRAIL_FPU && MODULE_CORTEXM_FPU)
help
The Silicon Labs Radio Abstraction Interface Layer (RAIL) is required
to use the integrated radio offered by the EFR32 families.
config MODULE_GECKO_SDK_LIBRAIL_PA
bool "Power Amplifier Power Conversion Functions"
depends on MODULE_GECKO_SDK_LIBRAIL
help
Helper to convert between transmission power in dBm and the
chip- and circuit-specific raw power level.
endif # PACKAGE_GECKO_SDK

2
pkg/gecko_sdk/Makefile
View File

@ -1,6 +1,6 @@
PKG_NAME=gecko_sdk
PKG_URL=https://github.com/basilfx/RIOT-gecko-sdk
PKG_VERSION=e291e7e0bb56d3f51f03ef7c0b8af138a8d1301a
PKG_VERSION=944639a57adce84fb110fe89e54f50e161607918
PKG_LICENSE=Zlib
include $(RIOTBASE)/pkg/pkg.mk

4
pkg/gecko_sdk/Makefile.dep
View File

@ -1,2 +1,6 @@
USEMODULE += gecko_sdk_emlib
USEMODULE += gecko_sdk_emlib_extra
ifneq (,$(filter gecko_sdk_librail_pa,$(USEMODULE)))
USEMODULE += gecko_sdk_librail
endif

12
pkg/gecko_sdk/Makefile.include
View File

@ -1,2 +1,14 @@
INCLUDES += -I$(PKGDIRBASE)/gecko_sdk/dist/common/inc
INCLUDES += -I$(PKGDIRBASE)/gecko_sdk/dist/emlib/inc
INCLUDES += -I$(PKGDIRBASE)/gecko_sdk/dist/emlib-extra/inc
ifneq (,$(filter gecko_sdk_librail,$(USEMODULE)))
ARCHIVES += $(BINDIR)/gecko_sdk_librail.a
INCLUDES += -I$(PKGDIRBASE)/gecko_sdk/dist/radio/rail_lib/common
INCLUDES += -I$(PKGDIRBASE)/gecko_sdk/dist/radio/rail_lib/chip/efr32/$(EFM32_LIBRAIL_HEADER_NAME)
endif
ifneq (,$(filter gecko_sdk_librail_pa,$(USEMODULE)))
INCLUDES += -I$(PKGDIRBASE)/gecko_sdk/dist/radio/rail_lib/plugin/pa-conversions
INCLUDES += -I$(PKGDIRBASE)/gecko_sdk/dist/radio/rail_lib/plugin/pa-conversions/$(EFM32_LIBRAIL_PA_HEADER_NAME)/config
endif