Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
19689: cpu/sam0_eth: disable PHY when MAC is sleeping r=maribu a=benpicco





19700: pkg/openthread: Fix Kconfig and broken example r=maribu a=MrKevinWeiss

### Contribution description

There were some improvements that could be make to the kconfig modeling of the `pkg/openthread` after looking a bit closer.

The bigger problem is the hash check on nightlies require reproducible builds, however, even with make, the builds are not reproducible.  So, for now, I just rename the `app.config.test` to `skip.app.config.test` to prevent murdock from trying to do a hash check but still letting it be useable.

### Testing procedure

Green murdock, all modules match `examples/openthread`


- Rename `skip.app.config.test` to `app.config.test`
- Run the following
```
./dist/tools/compile_test/compile_like_murdock.py -j 8 -a examples/openthread/ -b all -m
```

<details>

```
examples/openthread/           cc2538dk                       PASS
examples/openthread/           frdm-kw41z                     PASS
examples/openthread/           iotlab-a8-m3                   PASS
examples/openthread/           iotlab-m3                      PASS
examples/openthread/           nrf52840-mdk                   PASS
examples/openthread/           nrf52840dk                     PASS
examples/openthread/           omote                          PASS
examples/openthread/           openlabs-kw41z-mini            PASS
examples/openthread/           openlabs-kw41z-mini-256kib     PASS
examples/openthread/           openmote-cc2538                PASS
examples/openthread/           phynode-kw41z                  PASS
examples/openthread/           reel                           PASS
examples/openthread/           remote-reva                    PASS
examples/openthread/           remote-revb                    PASS
examples/openthread/           samr21-xpro                    PASS
examples/openthread/           usb-kw41z                      PASS
```
</details>


### Issues/PRs references

Fixes an aspect of broken master


19701: sys/usb/Kconfig: Fix default PID r=maribu a=MrKevinWeiss


### Contribution description

Seems like I just didn't have the correct `USB_PID` defined in the `usb-codes.inc.mk`.

It should be 0x7D01 not 0x7001.

It only shows up in nightlies since the hash would mismatch.

### Testing procedure

Simulated nightly testing with:

```
./dist/tools/compile_test/compile_like_murdock.py -j 8 -a tests/pkg/tinyusb_cdc_acm_stdio/ tests/pkg/tinyusb_cdc_msc/ tests/pkg/tinyusb_cdc_msc/ tests/sys/fido2_ctap/ tests/sys/usbus_board_reset/ tests/sys/usbus_msc/  -b arduino-zero samd21-xpro nucleo-f767zi -v
```

<details>

```
tests/pkg/tinyusb_cdc_acm_stdio/ arduino-zero                   PASS
ctests/pkg/tinyusb_cdc_acm_stdio/ nucleo-f767zi                  PASS
tests/pkg/tinyusb_cdc_acm_stdio/ samd21-xpro                    PASS
tests/pkg/tinyusb_cdc_msc/     arduino-zero                   PASS
tests/pkg/tinyusb_cdc_msc/     nucleo-f767zi                  PASS
tests/pkg/tinyusb_cdc_msc/     samd21-xpro                    PASS
tests/pkg/tinyusb_cdc_msc/     arduino-zero                   PASS
tests/pkg/tinyusb_cdc_msc/     nucleo-f767zi                  PASS
tests/pkg/tinyusb_cdc_msc/     samd21-xpro                    PASS
tests/sys/fido2_ctap/          arduino-zero                   PASS
tests/sys/fido2_ctap/          samd21-xpro                    PASS
tests/sys/usbus_board_reset/   arduino-zero                   PASS
tests/sys/usbus_board_reset/   nucleo-f767zi                  PASS
tests/sys/usbus_board_reset/   samd21-xpro                    PASS
tests/sys/usbus_msc/           arduino-zero                   PASS
tests/sys/usbus_msc/           nucleo-f767zi                  PASS
tests/sys/usbus_msc/           samd21-xpro                    PASS
```

### Issues/PRs references

Broken master in nightlies.

Co-authored-by: Benjamin Valentin <benjamin.valentin@ml-pa.com>
Co-authored-by: MrKevinWeiss <weiss.kevin604@gmail.com>
  • Loading branch information
3 people authored Jun 2, 2023
4 parents d16f8f1 + 385d260 + f1f4f20 + d283919 commit 0dce63b
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 9 deletions.
6 changes: 6 additions & 0 deletions cpu/sam0_common/periph/eth.c
Original file line number Diff line number Diff line change
Expand Up @@ -124,11 +124,17 @@ void sam0_eth_poweron(void)
{
_enable_clock();
sam0_clear_rx_buffers();

/* enable PHY */
gpio_set(sam_gmac_config[0].rst_pin);
_is_sleeping = false;
}

void sam0_eth_poweroff(void)
{
/* disable PHY */
gpio_clear(sam_gmac_config[0].rst_pin);

_is_sleeping = true;
_disable_clock();
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
CONFIG_PACKAGE_OPENTHREAD=y
CONFIG_MODULE_CPP11-COMPAT=y
CONFIG_MODULE_OPENTHREAD-FTD=y
CONFIG_MODULE_OPENTHREAD-CLI-FTD=y
CONFIG_MODULE_NETDEV_DEFAULT=y
Expand Down
8 changes: 1 addition & 7 deletions pkg/openthread/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -10,34 +10,28 @@ menuconfig PACKAGE_OPENTHREAD
depends on TEST_KCONFIG

depends on HAS_CPP
select MODULE_CPP11-COMPAT
select MODULE_CPP
select MODULE_EVENT
select MODULE_NETDEV
select MODULE_OPENTHREAD_CONTRIB
select MODULE_OPENTHREAD_CONTRIB_NETDEV
select MODULE_L2UTIL
select MODULE_TIMEX
select MODULE_ZTIMER
select MODULE_ZTIMER64
select MODULE_ZTIMER_MSEC

if PACKAGE_OPENTHREAD

config MODULE_OPENTHREAD-FTD
bool "Openthread Full Thread Device"
depends on TEST_KCONFIG

config MODULE_OPENTHREAD-MTD
bool "Openthread Minimal Thread Device"
depends on TEST_KCONFIG

config MODULE_OPENTHREAD-CLI-FTD
bool "Openthread Full Thread Device CLI"
depends on TEST_KCONFIG

config MODULE_OPENTHREAD-CLI-MTD
bool "Openthread Minimal Thread Device CLI"
depends on TEST_KCONFIG

config MODULE_OPENTHREAD_CONTRIB
bool
Expand Down
4 changes: 2 additions & 2 deletions sys/usb/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ config USB_PID
hex "Product ID"
depends on CUSTOM_USB_VID_PID
range 0x0000 0xFFFF
# default 0x7002 if MODULE_RIOTBOOT_DFU
default 0x7001
# default 0x7D02 if MODULE_RIOTBOOT_DFU
default 0x7D01
help
You must provide your own PID.

Expand Down

0 comments on commit 0dce63b

Please sign in to comment.