Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

build system: add netif_openwsn feature #20695

Merged
merged 4 commits into from
May 28, 2024
Merged

build system: add netif_openwsn feature #20695

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
798793e
build system: add netif_openwsn feature
maribu May 24, 2024
aa084dd
pkg/openwsn: correctly add dependencies
maribu May 27, 2024
4cf1d5e
pkg/openwsn: Add missing include
maribu May 27, 2024
61679fb
tests/pkg/openwsn*: drop whitelist
maribu May 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions boards/common/iotlab/Makefile.features
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,4 @@ FEATURES_PROVIDED += periph_uart
# Put other features for this board (in alphabetical order)
FEATURES_PROVIDED += riotboot
FEATURES_PROVIDED += netif
FEATURES_PROVIDED += netif_openwsn # at86rf2xx is supported by OpenWSN
1 change: 1 addition & 0 deletions boards/hamilton/Makefile.features
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@ FEATURES_PROVIDED += periph_timer

# Put other features for this board (in alphabetical order)
FEATURES_PROVIDED += netif
FEATURES_PROVIDED += netif_openwsn # at86rf2xx is supported by OpenWSN
1 change: 1 addition & 0 deletions boards/mulle/Makefile.features
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,4 @@ FEATURES_PROVIDED += periph_uart

# Put other features for this board (in alphabetical order)
FEATURES_PROVIDED += netif
FEATURES_PROVIDED += netif_openwsn # at86rf2xx is supported by OpenWSN
1 change: 1 addition & 0 deletions boards/samr21-xpro/Makefile.features
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,6 @@ FEATURES_PROVIDED += periph_usbdev

# Put other features for this board (in alphabetical order)
FEATURES_PROVIDED += netif
FEATURES_PROVIDED += netif_openwsn # at86rf2xx is supported by OpenWSN
FEATURES_PROVIDED += riotboot
FEATURES_PROVIDED += tinyusb_device
1 change: 1 addition & 0 deletions boards/samr30-xpro/Makefile.features
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,6 @@ FEATURES_PROVIDED += periph_usbdev

# Put other features for this board (in alphabetical order)
FEATURES_PROVIDED += netif
FEATURES_PROVIDED += netif_openwsn # at86rf2xx is supported by OpenWSN
FEATURES_PROVIDED += riotboot
FEATURES_PROVIDED += tinyusb_device
2 changes: 2 additions & 0 deletions cpu/cc2538/Makefile.features
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,7 @@ FEATURES_PROVIDED += cortexm_mpu

# MCU has a peripheral network interface
FEATURES_PROVIDED += netif
# the integrated netif is supported by OpenWSN
FEATURES_PROVIDED += netif_openwsn

include $(RIOTCPU)/cortexm_common/Makefile.features
2 changes: 2 additions & 0 deletions cpu/nrf52/Makefile.features
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ CPU_FAM = nrf52
# The 802.15.4 radio is not available on all SoCs
ifneq (,$(filter nrf52811xxaa nrf52820xxaa nrf52833xxaa nrf52840xxaa,$(CPU_MODEL)))
FEATURES_PROVIDED += radio_nrf802154
# the nrf802154 driver is supported by OpenWSN
FEATURES_PROVIDED += netif_openwsn
endif

# crypto features
Expand Down
2 changes: 2 additions & 0 deletions features.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -881,6 +881,8 @@ groups:
help: The board has a network interface
- name: netif_ethernet
help: The board has an Ethernet network interface
- name: netif_openwsn
help: The board has a network interface suitable for OpenWSN
- name: highlevel_stdio
help: A high-level stdio method (such as CDC ACM) is used. This requires a
running thread and set-up and will not print during a crash.
Expand Down
1 change: 1 addition & 0 deletions makefiles/features_existing.inc.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ FEATURES_EXISTING := \
motor_driver \
netif \
netif_ethernet \
netif_openwsn \
newlib \
no_idle_thread \
periph_adc \
Expand Down
3 changes: 3 additions & 0 deletions pkg/openwsn/Makefile.dep
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
FEATURES_REQUIRED += netif_openwsn
FEATURES_REQUIRED += periph_uart

ifneq (,$(filter openwsn_openstack,$(USEMODULE)))
USEMODULE += openwsn_iphc
USEMODULE += openwsn_ipv6
Expand Down
1 change: 1 addition & 0 deletions pkg/openwsn/include/openwsn_uart.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@

#include "stdint.h"
#include "board.h"
#include "periph_conf.h"

#ifdef __cplusplus
extern "C" {
Expand Down
28 changes: 0 additions & 28 deletions tests/pkg/openwsn/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,34 +2,6 @@ BOARD ?= iotlab-m3

include ../Makefile.pkg_common

# list of arm boards that provide at86rf2xx radios, cc2538_rf or nrf52840
# radios
BOARD_WHITELIST = \
adafruit-clue \
adafruit-itsybitsy-nrf52 \
arduino-nano-33-ble \
cc2538dk \
feather-nrf52840 \
firefly \
iotlab-m3 \
iotlab-a8-m3 \
nrf52840-mdk \
nrf52840dk \
nrf52840dongle \
omote \
openmote-b \
openmote-cc2538 \
particle-argon \
particle-boron \
particle-xenon \
samr21-xpro \
samr30-xpro \
reel \
remote-pa \
remote-reva \
remote-revb \
#

# OpenWSN Modules
USEPKG += openwsn
USEMODULE += openwsn_openstack
Expand Down
28 changes: 0 additions & 28 deletions tests/pkg/openwsn_sock_udp/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,34 +2,6 @@ BOARD ?= samr21-xpro

include ../Makefile.pkg_common

# list of arm boards that provide at86rf2xx radios, cc2538_rf or nrf52840
# radios
BOARD_WHITELIST = \
adafruit-clue \
adafruit-itsybitsy-nrf52 \
arduino-nano-33-ble \
cc2538dk \
feather-nrf52840 \
firefly \
iotlab-m3 \
iotlab-a8-m3 \
nrf52840-mdk \
nrf52840dk \
nrf52840dongle \
omote \
openmote-b \
openmote-cc2538 \
particle-argon \
particle-boron \
particle-xenon \
samr21-xpro \
samr30-xpro \
reel \
remote-pa \
remote-reva \
remote-revb \
#

USEPKG += openwsn
USEMODULE += openwsn_openstack
USEMODULE += openwsn_scheduler
Expand Down
Loading