Kconfig: Expose gnrc/sixlowpan configurations by PeterKietzmann · Pull Request #13123 · RIOT-OS/RIOT

PeterKietzmann · 2020-01-14T15:43:33Z

Contribution description

This PR moves the configuration macros of gnrx/sixlowpan found here to the CONFIG_ namespace, and exposes them to Kconfig for individual modules.

As agreed offline with @leandrolanzieri I did not include the default thread priority parameter because this should be defined by the platform, if not changed manually. We might need a better solution to this in future.

Furthermore, I did not include parameters that relate to selective fragment recovery. As agreed with @miri64, these should be changed in #12648.

Testing procedure

examples/gnrc_networking should still work as usual.
tests/gnrc_sixlowpan_frag should still work as usual.
tests/gnrc_sixlowpan_iphc_w_vrb should still work as usual.
tests/unittests/tests-gnrc_sixlowpan_frag_vrb should still work as usual.
You should be able to configure the module's parameters via make menuconfig in all applications.

Issues/PRs references

Part of #12888

sys/net/gnrc/network_layer/sixlowpan/frag/rb/Kconfig

sys/net/gnrc/network_layer/sixlowpan/Kconfig

sys/net/gnrc/network_layer/sixlowpan/nd/Kconfig

sys/net/gnrc/Kconfig

PeterKietzmann · 2020-01-15T14:41:21Z

I squashed the commit that has fixed one symbol discription. Furthermore, I've added one commit that removes the duplication of CONFIG_GNRC_SIXLOWPAN_ND_AR_LTIME and an other commit that moves the Kconfig includes to a recursive approach. Please let me know if these can be squashed. Finally, we should agree on a solution in #13129 that we apply here afterwards before we can merge.

PeterKietzmann · 2020-01-15T17:51:39Z

I've added #13129 here and adapted it to this PRs needs. After #13129 got merged, this one needs a rebase. Furthermore, there a some commits that need to be squashed. @leandrolanzieri , @fjmolinas I have to leave soon. If you want take over to merge this PR before feature freeze, feel free!

PeterKietzmann · 2020-01-16T15:26:02Z

This PR should be good now after #13129 got merge and a rebase. Can I squash?

leandrolanzieri

Some comments on the Kconfig files

sys/net/gnrc/network_layer/sixlowpan/Kconfig

sys/net/gnrc/network_layer/sixlowpan/frag/vrb/Kconfig

sys/net/gnrc/network_layer/sixlowpan/Kconfig

sys/net/gnrc/network_layer/sixlowpan/nd/Kconfig

sys/net/gnrc/network_layer/sixlowpan/frag/Kconfig

PeterKietzmann · 2020-01-17T13:00:51Z

@leandrolanzieri, addressed your comments. Squash?

sys/net/gnrc/network_layer/sixlowpan/frag/rb/Kconfig

sys/include/net/gnrc/sixlowpan/config.h

sys/net/gnrc/network_layer/sixlowpan/frag/vrb/Kconfig

leandrolanzieri · 2020-01-17T16:45:59Z

@PeterKietzmann Code looks good, from my side you can squash. I will be running the tests now.

leandrolanzieri · 2020-01-17T17:35:11Z

Test results

tests/gnrc_sixlowpan_frag (without Kconfig)

Building application "tests_gnrc_sixlowpan_frag" for "samr21-xpro" with MCU "samd21".

"make" -C /home/leandro/Work/RIOT/boards/samr21-xpro
"make" -C /home/leandro/Work/RIOT/core
"make" -C /home/leandro/Work/RIOT/cpu/samd21
"make" -C /home/leandro/Work/RIOT/cpu/cortexm_common
"make" -C /home/leandro/Work/RIOT/cpu/cortexm_common/periph
"make" -C /home/leandro/Work/RIOT/cpu/sam0_common
"make" -C /home/leandro/Work/RIOT/cpu/sam0_common/periph
"make" -C /home/leandro/Work/RIOT/cpu/samd21/periph
"make" -C /home/leandro/Work/RIOT/drivers
"make" -C /home/leandro/Work/RIOT/drivers/periph_common
"make" -C /home/leandro/Work/RIOT/sys
"make" -C /home/leandro/Work/RIOT/sys/div
"make" -C /home/leandro/Work/RIOT/sys/embunit
"make" -C /home/leandro/Work/RIOT/sys/fmt
"make" -C /home/leandro/Work/RIOT/sys/isrpipe
"make" -C /home/leandro/Work/RIOT/sys/net/crosslayer/inet_csum
"make" -C /home/leandro/Work/RIOT/sys/net/gnrc
"make" -C /home/leandro/Work/RIOT/sys/net/gnrc/netapi
"make" -C /home/leandro/Work/RIOT/sys/net/gnrc/netif
"make" -C /home/leandro/Work/RIOT/sys/net/gnrc/netif/hdr
"make" -C /home/leandro/Work/RIOT/sys/net/gnrc/netreg
"make" -C /home/leandro/Work/RIOT/sys/net/gnrc/network_layer/sixlowpan
"make" -C /home/leandro/Work/RIOT/sys/net/gnrc/network_layer/sixlowpan/frag
"make" -C /home/leandro/Work/RIOT/sys/net/gnrc/network_layer/sixlowpan/frag/fb
"make" -C /home/leandro/Work/RIOT/sys/net/gnrc/network_layer/sixlowpan/frag/rb
"make" -C /home/leandro/Work/RIOT/sys/net/gnrc/pkt
"make" -C /home/leandro/Work/RIOT/sys/net/gnrc/pktbuf
"make" -C /home/leandro/Work/RIOT/sys/net/gnrc/pktbuf_static
"make" -C /home/leandro/Work/RIOT/sys/net/link_layer/l2util
"make" -C /home/leandro/Work/RIOT/sys/net/netif
"make" -C /home/leandro/Work/RIOT/sys/net/network_layer/ipv6/addr
"make" -C /home/leandro/Work/RIOT/sys/net/network_layer/ipv6/hdr
"make" -C /home/leandro/Work/RIOT/sys/net/network_layer/sixlowpan
"make" -C /home/leandro/Work/RIOT/sys/newlib_syscalls_default
"make" -C /home/leandro/Work/RIOT/sys/pm_layered
"make" -C /home/leandro/Work/RIOT/sys/stdio_uart
"make" -C /home/leandro/Work/RIOT/sys/test_utils/interactive_sync
"make" -C /home/leandro/Work/RIOT/sys/tsrb
"make" -C /home/leandro/Work/RIOT/sys/xtimer
   text	  data	   bss	   dec	   hex	filename
  21944	   516	  5368	 27828	  6cb4	/home/leandro/Work/RIOT/tests/gnrc_sixlowpan_frag/bin/samr21-xpro/tests_gnrc_sixlowpan_frag.elf
/home/leandro/Work/RIOT/dist/tools/edbg/edbg --serial ATML2127031800002743 --serial ATML2127031800002743  --target atmel_cm0p --verbose --file /home/leandro/Work/RIOT/tests/gnrc_sixlowpan_frag/bin/samr21-xpro/tests_gnrc_sixlowpan_frag.bin --verify || /home/leandro/Work/RIOT/dist/tools/edbg/edbg --serial ATML2127031800002743 --serial ATML2127031800002743  --target atmel_cm0p --verbose --file /home/leandro/Work/RIOT/tests/gnrc_sixlowpan_frag/bin/samr21-xpro/tests_gnrc_sixlowpan_frag.bin --verify --program
Debugger: ATMEL EDBG CMSIS-DAP ATML2127031800002743 03.25.01B6 (S)
Clock frequency: 16.0 MHz
Target: SAM R21G18 (Rev B)
Verification...
at address 0x4 expected 0x01, read 0x45
Error: verification failed
Debugger: ATMEL EDBG CMSIS-DAP ATML2127031800002743 03.25.01B6 (S)
Clock frequency: 16.0 MHz
Target: SAM R21G18 (Rev B)
Programming........................................................................................... done.
Verification........................................................................................... done.
r
/home/leandro/Work/RIOT/dist/tools/pyterm/pyterm -p "/dev/ttyACM0" -b "115200" --noprefix --no-repeat-command-on-empty-line
Twisted not available, please install it if you want to use pyterm's JSON capabilities
Connect to serial port /dev/ttyACM0
Welcome to pyterm!
Type '/exit' to exit.
READY
s
START
.............
OK (13 tests)

tests/gnrc_sixlowpan_frag (with Kconfig defaults)

 > env BOARD=samr21-xpro SERIAL=ATML2127031800002743 make menuconfig
Using default symbol values (no '/home/leandro/Work/RIOT/tests/gnrc_sixlowpan_frag/bin/samr21-xpro/generated/merged.config')
No changes to save (for '/home/leandro/Work/RIOT/tests/gnrc_sixlowpan_frag/bin/samr21-xpro/generated/merged.config')

 > env BOARD=samr21-xpro SERIAL=ATML2127031800002743 make all flash test
Building application "tests_gnrc_sixlowpan_frag" for "samr21-xpro" with MCU "samd21".

"make" -C /home/leandro/Work/RIOT/boards/samr21-xpro
"make" -C /home/leandro/Work/RIOT/core
"make" -C /home/leandro/Work/RIOT/cpu/samd21
"make" -C /home/leandro/Work/RIOT/cpu/cortexm_common
"make" -C /home/leandro/Work/RIOT/cpu/cortexm_common/periph
"make" -C /home/leandro/Work/RIOT/cpu/sam0_common
"make" -C /home/leandro/Work/RIOT/cpu/sam0_common/periph
"make" -C /home/leandro/Work/RIOT/cpu/samd21/periph
"make" -C /home/leandro/Work/RIOT/drivers
"make" -C /home/leandro/Work/RIOT/drivers/periph_common
"make" -C /home/leandro/Work/RIOT/sys
"make" -C /home/leandro/Work/RIOT/sys/div
"make" -C /home/leandro/Work/RIOT/sys/embunit
"make" -C /home/leandro/Work/RIOT/sys/fmt
"make" -C /home/leandro/Work/RIOT/sys/isrpipe
"make" -C /home/leandro/Work/RIOT/sys/net/crosslayer/inet_csum
"make" -C /home/leandro/Work/RIOT/sys/net/gnrc
"make" -C /home/leandro/Work/RIOT/sys/net/gnrc/netapi
"make" -C /home/leandro/Work/RIOT/sys/net/gnrc/netif
"make" -C /home/leandro/Work/RIOT/sys/net/gnrc/netif/hdr
"make" -C /home/leandro/Work/RIOT/sys/net/gnrc/netreg
"make" -C /home/leandro/Work/RIOT/sys/net/gnrc/network_layer/sixlowpan
"make" -C /home/leandro/Work/RIOT/sys/net/gnrc/network_layer/sixlowpan/frag
"make" -C /home/leandro/Work/RIOT/sys/net/gnrc/network_layer/sixlowpan/frag/fb
"make" -C /home/leandro/Work/RIOT/sys/net/gnrc/network_layer/sixlowpan/frag/rb
"make" -C /home/leandro/Work/RIOT/sys/net/gnrc/pkt
"make" -C /home/leandro/Work/RIOT/sys/net/gnrc/pktbuf
"make" -C /home/leandro/Work/RIOT/sys/net/gnrc/pktbuf_static
"make" -C /home/leandro/Work/RIOT/sys/net/link_layer/l2util
"make" -C /home/leandro/Work/RIOT/sys/net/netif
"make" -C /home/leandro/Work/RIOT/sys/net/network_layer/ipv6/addr
"make" -C /home/leandro/Work/RIOT/sys/net/network_layer/ipv6/hdr
"make" -C /home/leandro/Work/RIOT/sys/net/network_layer/sixlowpan
"make" -C /home/leandro/Work/RIOT/sys/newlib_syscalls_default
"make" -C /home/leandro/Work/RIOT/sys/pm_layered
"make" -C /home/leandro/Work/RIOT/sys/stdio_uart
"make" -C /home/leandro/Work/RIOT/sys/test_utils/interactive_sync
"make" -C /home/leandro/Work/RIOT/sys/tsrb
"make" -C /home/leandro/Work/RIOT/sys/xtimer
   text	  data	   bss	   dec	   hex	filename
  21944	   516	  5368	 27828	  6cb4	/home/leandro/Work/RIOT/tests/gnrc_sixlowpan_frag/bin/samr21-xpro/tests_gnrc_sixlowpan_frag.elf
/home/leandro/Work/RIOT/dist/tools/edbg/edbg --serial ATML2127031800002743 --serial ATML2127031800002743  --target atmel_cm0p --verbose --file /home/leandro/Work/RIOT/tests/gnrc_sixlowpan_frag/bin/samr21-xpro/tests_gnrc_sixlowpan_frag.bin --verify || /home/leandro/Work/RIOT/dist/tools/edbg/edbg --serial ATML2127031800002743 --serial ATML2127031800002743  --target atmel_cm0p --verbose --file /home/leandro/Work/RIOT/tests/gnrc_sixlowpan_frag/bin/samr21-xpro/tests_gnrc_sixlowpan_frag.bin --verify --program
Debugger: ATMEL EDBG CMSIS-DAP ATML2127031800002743 03.25.01B6 (S)
Clock frequency: 16.0 MHz
Target: SAM R21G18 (Rev B)
Verification........................................................................................... done.
r
/home/leandro/Work/RIOT/dist/tools/pyterm/pyterm -p "/dev/ttyACM0" -b "115200" --noprefix --no-repeat-command-on-empty-line
Twisted not available, please install it if you want to use pyterm's JSON capabilities
Connect to serial port /dev/ttyACM0
Welcome to pyterm!
Type '/exit' to exit.
READY
s
START
.............
OK (13 tests)

 ~/W/R/t/gnrc_sixlowpan_frag   pr_kconf_6lo  

tests/gnrc_sixlowpan_iphc_w_vrb (without Kconfig)

> env BOARD=samr21-xpro SERIAL=ATML2127031800002743 make clean

> env BOARD=samr21-xpro SERIAL=ATML2127031800002743 make all flash test
Building application "tests_gnrc_sixlowpan_iphc_w_vrb" for "samr21-xpro" with MCU "samd21".

"make" -C /home/leandro/Work/RIOT/boards/samr21-xpro
"make" -C /home/leandro/Work/RIOT/core
"make" -C /home/leandro/Work/RIOT/cpu/samd21
"make" -C /home/leandro/Work/RIOT/cpu/cortexm_common
"make" -C /home/leandro/Work/RIOT/cpu/cortexm_common/periph
"make" -C /home/leandro/Work/RIOT/cpu/sam0_common
"make" -C /home/leandro/Work/RIOT/cpu/sam0_common/periph
"make" -C /home/leandro/Work/RIOT/cpu/samd21/periph
"make" -C /home/leandro/Work/RIOT/drivers
"make" -C /home/leandro/Work/RIOT/drivers/netdev_ieee802154
"make" -C /home/leandro/Work/RIOT/drivers/periph_common
"make" -C /home/leandro/Work/RIOT/sys
"make" -C /home/leandro/Work/RIOT/sys/auto_init
"make" -C /home/leandro/Work/RIOT/sys/div
"make" -C /home/leandro/Work/RIOT/sys/embunit
"make" -C /home/leandro/Work/RIOT/sys/evtimer
"make" -C /home/leandro/Work/RIOT/sys/fmt
"make" -C /home/leandro/Work/RIOT/sys/isrpipe
"make" -C /home/leandro/Work/RIOT/sys/luid
"make" -C /home/leandro/Work/RIOT/sys/net/crosslayer/inet_csum
"make" -C /home/leandro/Work/RIOT/sys/net/gnrc
"make" -C /home/leandro/Work/RIOT/sys/net/gnrc/netapi
"make" -C /home/leandro/Work/RIOT/sys/net/gnrc/netif
"make" -C /home/leandro/Work/RIOT/sys/net/gnrc/netif/hdr
"make" -C /home/leandro/Work/RIOT/sys/net/gnrc/netif/ieee802154
"make" -C /home/leandro/Work/RIOT/sys/net/gnrc/netreg
"make" -C /home/leandro/Work/RIOT/sys/net/gnrc/network_layer/icmpv6
"make" -C /home/leandro/Work/RIOT/sys/net/gnrc/network_layer/ipv6
"make" -C /home/leandro/Work/RIOT/sys/net/gnrc/network_layer/ipv6/hdr
"make" -C /home/leandro/Work/RIOT/sys/net/gnrc/network_layer/ipv6/nib
"make" -C /home/leandro/Work/RIOT/sys/net/gnrc/network_layer/ndp
"make" -C /home/leandro/Work/RIOT/sys/net/gnrc/network_layer/sixlowpan
"make" -C /home/leandro/Work/RIOT/sys/net/gnrc/network_layer/sixlowpan/ctx
"make" -C /home/leandro/Work/RIOT/sys/net/gnrc/network_layer/sixlowpan/frag
"make" -C /home/leandro/Work/RIOT/sys/net/gnrc/network_layer/sixlowpan/frag/fb
"make" -C /home/leandro/Work/RIOT/sys/net/gnrc/network_layer/sixlowpan/frag/rb
"make" -C /home/leandro/Work/RIOT/sys/net/gnrc/network_layer/sixlowpan/frag/vrb
"make" -C /home/leandro/Work/RIOT/sys/net/gnrc/network_layer/sixlowpan/iphc
"make" -C /home/leandro/Work/RIOT/sys/net/gnrc/network_layer/sixlowpan/nd
"make" -C /home/leandro/Work/RIOT/sys/net/gnrc/pkt
"make" -C /home/leandro/Work/RIOT/sys/net/gnrc/pktbuf
"make" -C /home/leandro/Work/RIOT/sys/net/gnrc/pktbuf_static
"make" -C /home/leandro/Work/RIOT/sys/net/link_layer/ieee802154
"make" -C /home/leandro/Work/RIOT/sys/net/link_layer/l2util
"make" -C /home/leandro/Work/RIOT/sys/net/netdev_test
"make" -C /home/leandro/Work/RIOT/sys/net/netif
"make" -C /home/leandro/Work/RIOT/sys/net/network_layer/icmpv6
"make" -C /home/leandro/Work/RIOT/sys/net/network_layer/ipv6/addr
"make" -C /home/leandro/Work/RIOT/sys/net/network_layer/ipv6/hdr
"make" -C /home/leandro/Work/RIOT/sys/net/network_layer/sixlowpan
"make" -C /home/leandro/Work/RIOT/sys/newlib_syscalls_default
"make" -C /home/leandro/Work/RIOT/sys/od
"make" -C /home/leandro/Work/RIOT/sys/pm_layered
"make" -C /home/leandro/Work/RIOT/sys/random
"make" -C /home/leandro/Work/RIOT/sys/random/tinymt32
"make" -C /home/leandro/Work/RIOT/sys/stdio_uart
"make" -C /home/leandro/Work/RIOT/sys/test_utils/interactive_sync
"make" -C /home/leandro/Work/RIOT/sys/tsrb
"make" -C /home/leandro/Work/RIOT/sys/xtimer
   text	  data	   bss	   dec	   hex	filename
  43680	   148	 11144	 54972	  d6bc	/home/leandro/Work/RIOT/tests/gnrc_sixlowpan_iphc_w_vrb/bin/samr21-xpro/tests_gnrc_sixlowpan_iphc_w_vrb.elf
/home/leandro/Work/RIOT/dist/tools/edbg/edbg --serial ATML2127031800002743 --serial ATML2127031800002743  --target atmel_cm0p --verbose --file /home/leandro/Work/RIOT/tests/gnrc_sixlowpan_iphc_w_vrb/bin/samr21-xpro/tests_gnrc_sixlowpan_iphc_w_vrb.bin --verify || /home/leandro/Work/RIOT/dist/tools/edbg/edbg --serial ATML2127031800002743 --serial ATML2127031800002743  --target atmel_cm0p --verbose --file /home/leandro/Work/RIOT/tests/gnrc_sixlowpan_iphc_w_vrb/bin/samr21-xpro/tests_gnrc_sixlowpan_iphc_w_vrb.bin --verify --program
Debugger: ATMEL EDBG CMSIS-DAP ATML2127031800002743 03.25.01B6 (S)
Clock frequency: 16.0 MHz
Target: SAM R21G18 (Rev B)
Verification...
at address 0x4 expected 0x45, read 0x01
Error: verification failed
Debugger: ATMEL EDBG CMSIS-DAP ATML2127031800002743 03.25.01B6 (S)
Clock frequency: 16.0 MHz
Target: SAM R21G18 (Rev B)
Programming............................................................................................................................................................................... done.
Verification............................................................................................................................................................................... done.
r
/home/leandro/Work/RIOT/dist/tools/pyterm/pyterm -p "/dev/ttyACM0" -b "115200" --noprefix --no-repeat-command-on-empty-line
Twisted not available, please install it if you want to use pyterm's JSON capabilities
Connect to serial port /dev/ttyACM0
Welcome to pyterm!
Type '/exit' to exit.
READY
s
START
main(): This is RIOT! (Version: 2020.04-devel-38-g96ff9-pr_kconf_6lo)
....
OK (4 tests)

tests/gnrc_sixlowpan_iphc_w_vrb (with Kconfig defaults)

> env BOARD=samr21-xpro SERIAL=ATML2127031800002743 make menuconfig
Using default symbol values (no '/home/leandro/Work/RIOT/tests/gnrc_sixlowpan_iphc_w_vrb/bin/samr21-xpro/generated/merged.config')
No changes to save (for '/home/leandro/Work/RIOT/tests/gnrc_sixlowpan_iphc_w_vrb/bin/samr21-xpro/generated/merged.config')

> env BOARD=samr21-xpro SERIAL=ATML2127031800002743 make all flash test
Building application "tests_gnrc_sixlowpan_iphc_w_vrb" for "samr21-xpro" with MCU "samd21".

"make" -C /home/leandro/Work/RIOT/boards/samr21-xpro
"make" -C /home/leandro/Work/RIOT/core
"make" -C /home/leandro/Work/RIOT/cpu/samd21
"make" -C /home/leandro/Work/RIOT/cpu/cortexm_common
"make" -C /home/leandro/Work/RIOT/cpu/cortexm_common/periph
"make" -C /home/leandro/Work/RIOT/cpu/sam0_common
"make" -C /home/leandro/Work/RIOT/cpu/sam0_common/periph
"make" -C /home/leandro/Work/RIOT/cpu/samd21/periph
"make" -C /home/leandro/Work/RIOT/drivers
"make" -C /home/leandro/Work/RIOT/drivers/netdev_ieee802154
"make" -C /home/leandro/Work/RIOT/drivers/periph_common
"make" -C /home/leandro/Work/RIOT/sys
"make" -C /home/leandro/Work/RIOT/sys/auto_init
"make" -C /home/leandro/Work/RIOT/sys/div
"make" -C /home/leandro/Work/RIOT/sys/embunit
"make" -C /home/leandro/Work/RIOT/sys/evtimer
"make" -C /home/leandro/Work/RIOT/sys/fmt
"make" -C /home/leandro/Work/RIOT/sys/isrpipe
"make" -C /home/leandro/Work/RIOT/sys/luid
"make" -C /home/leandro/Work/RIOT/sys/net/crosslayer/inet_csum
"make" -C /home/leandro/Work/RIOT/sys/net/gnrc
"make" -C /home/leandro/Work/RIOT/sys/net/gnrc/netapi
"make" -C /home/leandro/Work/RIOT/sys/net/gnrc/netif
"make" -C /home/leandro/Work/RIOT/sys/net/gnrc/netif/hdr
"make" -C /home/leandro/Work/RIOT/sys/net/gnrc/netif/ieee802154
"make" -C /home/leandro/Work/RIOT/sys/net/gnrc/netreg
"make" -C /home/leandro/Work/RIOT/sys/net/gnrc/network_layer/icmpv6
"make" -C /home/leandro/Work/RIOT/sys/net/gnrc/network_layer/ipv6
"make" -C /home/leandro/Work/RIOT/sys/net/gnrc/network_layer/ipv6/hdr
"make" -C /home/leandro/Work/RIOT/sys/net/gnrc/network_layer/ipv6/nib
"make" -C /home/leandro/Work/RIOT/sys/net/gnrc/network_layer/ndp
"make" -C /home/leandro/Work/RIOT/sys/net/gnrc/network_layer/sixlowpan
"make" -C /home/leandro/Work/RIOT/sys/net/gnrc/network_layer/sixlowpan/ctx
"make" -C /home/leandro/Work/RIOT/sys/net/gnrc/network_layer/sixlowpan/frag
"make" -C /home/leandro/Work/RIOT/sys/net/gnrc/network_layer/sixlowpan/frag/fb
"make" -C /home/leandro/Work/RIOT/sys/net/gnrc/network_layer/sixlowpan/frag/rb
"make" -C /home/leandro/Work/RIOT/sys/net/gnrc/network_layer/sixlowpan/frag/vrb
"make" -C /home/leandro/Work/RIOT/sys/net/gnrc/network_layer/sixlowpan/iphc
"make" -C /home/leandro/Work/RIOT/sys/net/gnrc/network_layer/sixlowpan/nd
"make" -C /home/leandro/Work/RIOT/sys/net/gnrc/pkt
"make" -C /home/leandro/Work/RIOT/sys/net/gnrc/pktbuf
"make" -C /home/leandro/Work/RIOT/sys/net/gnrc/pktbuf_static
"make" -C /home/leandro/Work/RIOT/sys/net/link_layer/ieee802154
"make" -C /home/leandro/Work/RIOT/sys/net/link_layer/l2util
"make" -C /home/leandro/Work/RIOT/sys/net/netdev_test
"make" -C /home/leandro/Work/RIOT/sys/net/netif
"make" -C /home/leandro/Work/RIOT/sys/net/network_layer/icmpv6
"make" -C /home/leandro/Work/RIOT/sys/net/network_layer/ipv6/addr
"make" -C /home/leandro/Work/RIOT/sys/net/network_layer/ipv6/hdr
"make" -C /home/leandro/Work/RIOT/sys/net/network_layer/sixlowpan
"make" -C /home/leandro/Work/RIOT/sys/newlib_syscalls_default
"make" -C /home/leandro/Work/RIOT/sys/od
"make" -C /home/leandro/Work/RIOT/sys/pm_layered
"make" -C /home/leandro/Work/RIOT/sys/random
"make" -C /home/leandro/Work/RIOT/sys/random/tinymt32
"make" -C /home/leandro/Work/RIOT/sys/stdio_uart
"make" -C /home/leandro/Work/RIOT/sys/test_utils/interactive_sync
"make" -C /home/leandro/Work/RIOT/sys/tsrb
"make" -C /home/leandro/Work/RIOT/sys/xtimer
   text	  data	   bss	   dec	   hex	filename
  43680	   148	 11144	 54972	  d6bc	/home/leandro/Work/RIOT/tests/gnrc_sixlowpan_iphc_w_vrb/bin/samr21-xpro/tests_gnrc_sixlowpan_iphc_w_vrb.elf
/home/leandro/Work/RIOT/dist/tools/edbg/edbg --serial ATML2127031800002743 --serial ATML2127031800002743  --target atmel_cm0p --verbose --file /home/leandro/Work/RIOT/tests/gnrc_sixlowpan_iphc_w_vrb/bin/samr21-xpro/tests_gnrc_sixlowpan_iphc_w_vrb.bin --verify || /home/leandro/Work/RIOT/dist/tools/edbg/edbg --serial ATML2127031800002743 --serial ATML2127031800002743  --target atmel_cm0p --verbose --file /home/leandro/Work/RIOT/tests/gnrc_sixlowpan_iphc_w_vrb/bin/samr21-xpro/tests_gnrc_sixlowpan_iphc_w_vrb.bin --verify --program
Debugger: ATMEL EDBG CMSIS-DAP ATML2127031800002743 03.25.01B6 (S)
Clock frequency: 16.0 MHz
Target: SAM R21G18 (Rev B)
Verification............................................................................................................................................................................... done.
r
/home/leandro/Work/RIOT/dist/tools/pyterm/pyterm -p "/dev/ttyACM0" -b "115200" --noprefix --no-repeat-command-on-empty-line
Twisted not available, please install it if you want to use pyterm's JSON capabilities
Connect to serial port /dev/ttyACM0
Welcome to pyterm!
Type '/exit' to exit.
READY
s
START
main(): This is RIOT! (Version: 2020.04-devel-38-g96ff9-pr_kconf_6lo)
....
OK (4 tests)

tests/unittests/gnrc_sixlowpan_frag_vrb (without Kconfig)

 > env BOARD=samr21-xpro SERIAL=ATML2127031800002743 make clean
 
> env BOARD=samr21-xpro SERIAL=ATML2127031800002743 make tests-gnrc_sixlowpan_frag_vrb flash test
Building application "tests_unittests" for "samr21-xpro" with MCU "samd21".

"make" -C /home/leandro/Work/RIOT/boards/samr21-xpro
"make" -C /home/leandro/Work/RIOT/core
"make" -C /home/leandro/Work/RIOT/cpu/samd21
"make" -C /home/leandro/Work/RIOT/cpu/cortexm_common
"make" -C /home/leandro/Work/RIOT/cpu/cortexm_common/periph
"make" -C /home/leandro/Work/RIOT/cpu/sam0_common
"make" -C /home/leandro/Work/RIOT/cpu/sam0_common/periph
"make" -C /home/leandro/Work/RIOT/cpu/samd21/periph
"make" -C /home/leandro/Work/RIOT/drivers
"make" -C /home/leandro/Work/RIOT/drivers/periph_common
"make" -C /home/leandro/Work/RIOT/sys
"make" -C /home/leandro/Work/RIOT/sys/div
"make" -C /home/leandro/Work/RIOT/sys/embunit
"make" -C /home/leandro/Work/RIOT/sys/fmt
"make" -C /home/leandro/Work/RIOT/sys/isrpipe
"make" -C /home/leandro/Work/RIOT/sys/net/gnrc
"make" -C /home/leandro/Work/RIOT/sys/net/gnrc/netapi
"make" -C /home/leandro/Work/RIOT/sys/net/gnrc/netif
"make" -C /home/leandro/Work/RIOT/sys/net/gnrc/netif/hdr
"make" -C /home/leandro/Work/RIOT/sys/net/gnrc/netreg
"make" -C /home/leandro/Work/RIOT/sys/net/gnrc/network_layer/sixlowpan/frag/fb
"make" -C /home/leandro/Work/RIOT/sys/net/gnrc/network_layer/sixlowpan/frag/vrb
"make" -C /home/leandro/Work/RIOT/sys/net/gnrc/pkt
"make" -C /home/leandro/Work/RIOT/sys/net/gnrc/pktbuf
"make" -C /home/leandro/Work/RIOT/sys/net/gnrc/pktbuf_static
"make" -C /home/leandro/Work/RIOT/sys/net/link_layer/l2util
"make" -C /home/leandro/Work/RIOT/sys/net/netif
"make" -C /home/leandro/Work/RIOT/sys/newlib_syscalls_default
"make" -C /home/leandro/Work/RIOT/sys/pm_layered
"make" -C /home/leandro/Work/RIOT/sys/stdio_uart
"make" -C /home/leandro/Work/RIOT/sys/test_utils/interactive_sync
"make" -C /home/leandro/Work/RIOT/sys/tsrb
"make" -C /home/leandro/Work/RIOT/sys/xtimer
"make" -C /home/leandro/Work/RIOT/tests/unittests/tests-gnrc_sixlowpan_frag_vrb
   text	  data	   bss	   dec	   hex	filename
  13896	   148	  3372	 17416	  4408	/home/leandro/Work/RIOT/tests/unittests/bin/samr21-xpro/tests_unittests.elf
/home/leandro/Work/RIOT/dist/tools/edbg/edbg --serial ATML2127031800002743 --serial ATML2127031800002743  --target atmel_cm0p --verbose --file /home/leandro/Work/RIOT/tests/unittests/bin/samr21-xpro/tests_unittests.bin --verify || /home/leandro/Work/RIOT/dist/tools/edbg/edbg --serial ATML2127031800002743 --serial ATML2127031800002743  --target atmel_cm0p --verbose --file /home/leandro/Work/RIOT/tests/unittests/bin/samr21-xpro/tests_unittests.bin --verify --program
Debugger: ATMEL EDBG CMSIS-DAP ATML2127031800002743 03.25.01B6 (S)
Clock frequency: 16.0 MHz
Target: SAM R21G18 (Rev B)
Verification...
at address 0x4 expected 0xc1, read 0x45
Error: verification failed
Debugger: ATMEL EDBG CMSIS-DAP ATML2127031800002743 03.25.01B6 (S)
Clock frequency: 16.0 MHz
Target: SAM R21G18 (Rev B)
Programming.......................................................... done.
Verification.......................................................... done.
r
/home/leandro/Work/RIOT/dist/tools/pyterm/pyterm -p "/dev/ttyACM0" -b "115200" --noprefix --no-repeat-command-on-empty-line
Twisted not available, please install it if you want to use pyterm's JSON capabilities
Connect to serial port /dev/ttyACM0
Welcome to pyterm!
Type '/exit' to exit.
READY
s
START
.......
OK (7 tests)

tests/unittests/gnrc_sixlowpan_frag_vrb (with Kconfig defaults)

> env BOARD=samr21-xpro SERIAL=ATML2127031800002743 make menuconfig
Using default symbol values (no '/home/leandro/Work/RIOT/tests/unittests/bin/samr21-xpro/generated/merged.config')
No changes to save (for '/home/leandro/Work/RIOT/tests/unittests/bin/samr21-xpro/generated/merged.config')

> env BOARD=samr21-xpro SERIAL=ATML2127031800002743 make tests-gnrc_sixlowpan_frag_vrb flash test
Building application "tests_unittests" for "samr21-xpro" with MCU "samd21".

"make" -C /home/leandro/Work/RIOT/boards/samr21-xpro
"make" -C /home/leandro/Work/RIOT/core
"make" -C /home/leandro/Work/RIOT/cpu/samd21
"make" -C /home/leandro/Work/RIOT/cpu/cortexm_common
"make" -C /home/leandro/Work/RIOT/cpu/cortexm_common/periph
"make" -C /home/leandro/Work/RIOT/cpu/sam0_common
"make" -C /home/leandro/Work/RIOT/cpu/sam0_common/periph
"make" -C /home/leandro/Work/RIOT/cpu/samd21/periph
"make" -C /home/leandro/Work/RIOT/drivers
"make" -C /home/leandro/Work/RIOT/drivers/periph_common
"make" -C /home/leandro/Work/RIOT/sys
"make" -C /home/leandro/Work/RIOT/sys/div
"make" -C /home/leandro/Work/RIOT/sys/embunit
"make" -C /home/leandro/Work/RIOT/sys/fmt
"make" -C /home/leandro/Work/RIOT/sys/isrpipe
"make" -C /home/leandro/Work/RIOT/sys/net/gnrc
"make" -C /home/leandro/Work/RIOT/sys/net/gnrc/netapi
"make" -C /home/leandro/Work/RIOT/sys/net/gnrc/netif
"make" -C /home/leandro/Work/RIOT/sys/net/gnrc/netif/hdr
"make" -C /home/leandro/Work/RIOT/sys/net/gnrc/netreg
"make" -C /home/leandro/Work/RIOT/sys/net/gnrc/network_layer/sixlowpan/frag/fb
"make" -C /home/leandro/Work/RIOT/sys/net/gnrc/network_layer/sixlowpan/frag/vrb
"make" -C /home/leandro/Work/RIOT/sys/net/gnrc/pkt
"make" -C /home/leandro/Work/RIOT/sys/net/gnrc/pktbuf
"make" -C /home/leandro/Work/RIOT/sys/net/gnrc/pktbuf_static
"make" -C /home/leandro/Work/RIOT/sys/net/link_layer/l2util
"make" -C /home/leandro/Work/RIOT/sys/net/netif
"make" -C /home/leandro/Work/RIOT/sys/newlib_syscalls_default
"make" -C /home/leandro/Work/RIOT/sys/pm_layered
"make" -C /home/leandro/Work/RIOT/sys/stdio_uart
"make" -C /home/leandro/Work/RIOT/sys/test_utils/interactive_sync
"make" -C /home/leandro/Work/RIOT/sys/tsrb
"make" -C /home/leandro/Work/RIOT/sys/xtimer
"make" -C /home/leandro/Work/RIOT/tests/unittests/tests-gnrc_sixlowpan_frag_vrb
   text	  data	   bss	   dec	   hex	filename
  13896	   148	  3372	 17416	  4408	/home/leandro/Work/RIOT/tests/unittests/bin/samr21-xpro/tests_unittests.elf
/home/leandro/Work/RIOT/dist/tools/edbg/edbg --serial ATML2127031800002743 --serial ATML2127031800002743  --target atmel_cm0p --verbose --file /home/leandro/Work/RIOT/tests/unittests/bin/samr21-xpro/tests_unittests.bin --verify || /home/leandro/Work/RIOT/dist/tools/edbg/edbg --serial ATML2127031800002743 --serial ATML2127031800002743  --target atmel_cm0p --verbose --file /home/leandro/Work/RIOT/tests/unittests/bin/samr21-xpro/tests_unittests.bin --verify --program
Debugger: ATMEL EDBG CMSIS-DAP ATML2127031800002743 03.25.01B6 (S)
Clock frequency: 16.0 MHz
Target: SAM R21G18 (Rev B)
Verification.......................................................... done.
r
/home/leandro/Work/RIOT/dist/tools/pyterm/pyterm -p "/dev/ttyACM0" -b "115200" --noprefix --no-repeat-command-on-empty-line
Twisted not available, please install it if you want to use pyterm's JSON capabilities
Connect to serial port /dev/ttyACM0
Welcome to pyterm!
Type '/exit' to exit.
READY
s
START
.......
OK (7 tests)

leandrolanzieri · 2020-01-20T08:56:19Z

Tests were OK and code changes look good. @miri64 any comments on your side?

miri64

Apart from the lines marked (where I need to adapt my PR for) only renames, duplicate removals and Kconfig additions in this PR. So LGTM from my side.

miri64 · 2020-01-20T12:35:38Z

sys/include/net/gnrc/sixlowpan/config.h

-#ifndef GNRC_SIXLOWPAN_FRAG_VRB_SIZE
-#if defined(MODULE_GNRC_SIXLOWPAN_FRAG_VRB) || defined(DOXYGEN)
-#define GNRC_SIXLOWPAN_FRAG_VRB_SIZE        (16U)
-#else   /* defined(MODULE_GNRC_SIXLOWPAN_FRAG_VRB) || defined(DOXYGEN) */
-#define GNRC_SIXLOWPAN_FRAG_VRB_SIZE        (0U)
-#endif  /* defined(MODULE_GNRC_SIXLOWPAN_FRAG_VRB) || defined(DOXYGEN) */
-#endif  /* GNRC_SIXLOWPAN_FRAG_VRB_SIZE */
+#ifndef CONFIG_GNRC_SIXLOWPAN_FRAG_VRB_SIZE
+#define CONFIG_GNRC_SIXLOWPAN_FRAG_VRB_SIZE        (16U)
+#endif  /* CONFIG_GNRC_SIXLOWPAN_FRAG_VRB_SIZE */


Note to self: adapt #11068 for this.

leandrolanzieri

All green, ACK!

PeterKietzmann added Area: network Area: Networking Type: new feature The issue requests / The PR implemements a new feature for RIOT TF: Config Marks issues and PRs related to the work of the Configuration Task Force labels Jan 14, 2020

PeterKietzmann requested review from leandrolanzieri and miri64 January 14, 2020 15:43

leandrolanzieri mentioned this pull request Jan 14, 2020

[CTF-tracker] Kconfig: Configuration exposure list #12888

Open

71 tasks

leandrolanzieri reviewed Jan 14, 2020

View reviewed changes

PeterKietzmann mentioned this pull request Jan 15, 2020

gnrc/sixlowpan: add deprecation note for GNRC_SIXLOWPAN_FRAG_RBUF_AGGRESSIVE_OVERRIDE #13129

Merged

PeterKietzmann force-pushed the pr_kconf_6lo branch from 366f22f to 88a9e7a Compare January 15, 2020 14:37

PeterKietzmann force-pushed the pr_kconf_6lo branch from 88a9e7a to 9e1e7cc Compare January 15, 2020 17:47

PeterKietzmann force-pushed the pr_kconf_6lo branch from 9e1e7cc to 44e953f Compare January 16, 2020 15:24

leandrolanzieri reviewed Jan 17, 2020

View reviewed changes

PeterKietzmann force-pushed the pr_kconf_6lo branch from 676e8cd to 1335be1 Compare January 17, 2020 13:00

PeterKietzmann force-pushed the pr_kconf_6lo branch from 1335be1 to 3294707 Compare January 17, 2020 13:05

miri64 reviewed Jan 17, 2020

View reviewed changes

sys/net/gnrc/network_layer/sixlowpan/frag/rb/Kconfig Show resolved Hide resolved

leandrolanzieri reviewed Jan 17, 2020

View reviewed changes

sys/include/net/gnrc/sixlowpan/config.h Show resolved Hide resolved

sys/net/gnrc/network_layer/sixlowpan/frag/vrb/Kconfig Outdated Show resolved Hide resolved

sys/net/gnrc/network_layer/sixlowpan/frag/vrb/Kconfig Outdated Show resolved Hide resolved

PeterKietzmann added 9 commits January 17, 2020 18:09

Kconfig: Expose gnrc/sixlowpan configurations

de99b99

net/gnrc/sixlowpan:Move queue size macro to 'CONFIG_' namespace

b5ea312

net/gnrc/sixlowpan/frag/fb:Move size macro to 'CONFIG_' namespace

89af238

net/gnrc/sixlowpan/frag/rb:Move size macro to 'CONFIG_' namespace

9389d5b

net/gnrc/sixlowpan/frag/rb:Move timeout macro to 'CONFIG_' namespace

811facf

net/gnrc/sixlowpan/frag/rb:Move del. timer macro to 'CONFIG_' namespace

582779a

net/gnrc/sixlowpan/nd:Move ND time macro to 'CONFIG_' namespace

7d2c9ef

net/gnrc/sixlowpan/nd: remove duplicate definition

a3f349c

net/gnrc/sixlowpan/frag/vrb:Move size macro to 'CONFIG_' namespace

cc6bee4

PeterKietzmann added 2 commits January 17, 2020 18:09

net/gnrc/sixlowpan/frag/vrb:Move timeout macro to 'CONFIG_' namespace

55282a1

net/gnrc/sixlowpan/frag/rb:Move not override to 'CONFIG_' namespace

df7a5d6

PeterKietzmann force-pushed the pr_kconf_6lo branch from 96ff906 to df7a5d6 Compare January 17, 2020 17:10

PeterKietzmann added the CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR label Jan 17, 2020

miri64 reviewed Jan 20, 2020

View reviewed changes

leandrolanzieri added CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR and removed CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR labels Jan 20, 2020

leandrolanzieri approved these changes Jan 20, 2020

View reviewed changes

leandrolanzieri merged commit 881f17a into RIOT-OS:master Jan 20, 2020

leandrolanzieri added the Area: Kconfig Area: Kconfig integration label Feb 20, 2020

leandrolanzieri added this to the Release 2020.04 milestone Feb 20, 2020

Conversation

PeterKietzmann commented Jan 14, 2020

Contribution description

Testing procedure

Issues/PRs references

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

PeterKietzmann commented Jan 15, 2020

Uh oh!

PeterKietzmann commented Jan 15, 2020

Uh oh!

PeterKietzmann commented Jan 16, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

leandrolanzieri left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

PeterKietzmann commented Jan 17, 2020

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

leandrolanzieri commented Jan 17, 2020

Uh oh!

leandrolanzieri commented Jan 17, 2020

Test results

Uh oh!

leandrolanzieri commented Jan 20, 2020

Uh oh!

miri64 left a comment

Choose a reason for hiding this comment

Uh oh!

miri64 Jan 20, 2020

Choose a reason for hiding this comment

Uh oh!

leandrolanzieri left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

PeterKietzmann commented Jan 16, 2020 •

edited

Loading