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.

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

[3rd-party] update openthread and ot-br-posix #5062

Merged
merged 8 commits into from
Mar 2, 2021

Conversation

wgtdkp
Copy link
Contributor

@wgtdkp wgtdkp commented Feb 28, 2021

Summary of Changes

Update OpenThread and ot-br-posix to include the latest SRP and Thread Duckhorn Border Router changes.

Depends-On:

@mspang
Copy link
Contributor

mspang commented Mar 1, 2021

Need to figure out the EFR32 update. @jepenven-silabs

@mspang
Copy link
Contributor

mspang commented Mar 1, 2021

Also, build is broken on VerifyOrDie conflict.

@wgtdkp
Copy link
Contributor Author

wgtdkp commented Mar 1, 2021

Need to figure out the EFR32 update. @jepenven-silabs

@mspang @jepenven-silabs I submitted the issue in openthread: openthread/openthread#6218

@wgtdkp
Copy link
Contributor Author

wgtdkp commented Mar 1, 2021

Also, build is broken on VerifyOrDie conflict.

I created openthread/ot-br-posix#713 for this.

@wgtdkp wgtdkp force-pushed the update-ot-otbr branch 2 times, most recently from 9887db4 to 2a20a6c Compare March 1, 2021 12:20
@jepenven-silabs
Copy link
Contributor

jepenven-silabs commented Mar 1, 2021

Need to figure out the EFR32 update. @jepenven-silabs

@mspang @jepenven-silabs I submitted the issue in openthread: openthread/openthread#6218

The failure on the CHIP side of things seems to be related to some headers files missing inside the sdk gn config. I'll take a quick look at this later today. @wgtdkp

@jepenven-silabs
Copy link
Contributor

@wgtdkp @mspang Currently working on a fix for the EFR32. I'll post the commit once the fix is complete so you can cherry-pick it on top of your branch

@todo
Copy link

todo bot commented Mar 2, 2021

have qpg6100 openthread platform implementation defines the APIs.

// TODO: have qpg6100 openthread platform implementation defines the APIs.
// It is not perfect to have the openthread platform calloc/free
// APIs defined here. If a dedicated source file (e.g. Memory.cpp)
// that includes only the two functions is used, the target file
// Memory.o will be thrown away whening linking the libary because
// there is no one referring the symbols (We are not linking
// the 'platform' library against openthread).
extern "C" void * otPlatCAlloc(size_t aNum, size_t aSize)
{
return CHIPPlatformMemoryCalloc(aNum, aSize);
}


This comment was generated by todo based on a TODO comment in eb836e2 in #5062. cc @wgtdkp.

@wgtdkp
Copy link
Contributor Author

wgtdkp commented Mar 2, 2021

@jepenven-silabs Thanks! It works.

@mspang Seems the CI failures have been resolved, PTAL.

(There are several commits, please do squash merge.

@mspang mspang merged commit fc59bd2 into project-chip:master Mar 2, 2021
mspang added a commit to mspang/connectedhomeip that referenced this pull request Mar 20, 2021
- Remove all of the duplicate include_dirs that were needed due
  to missing dependencies & improper use of private deps.
- Add back an retargetserial.c file which is needed for this build. It
  was removed in fc59bd2 ("[3rd-party] update openthread and
  ot-br-posix (project-chip#5062)")
- Remove some unusual whitespace in defines
mspang added a commit to mspang/connectedhomeip that referenced this pull request Mar 20, 2021
- Remove all of the duplicate include_dirs that were needed due
  to missing dependencies & improper use of private deps.
- Add back an retargetserial.c file which is needed for this build. It
  was removed in fc59bd2 ("[3rd-party] update openthread and
  ot-br-posix (project-chip#5062)")
- Remove some unusual whitespace in defines
mspang added a commit to mspang/connectedhomeip that referenced this pull request Mar 22, 2021
- Remove all of the duplicate include_dirs that were needed due
  to missing dependencies & improper use of private deps.
- Add back an retargetserial.c file which is needed for this build. It
  was removed in fc59bd2 ("[3rd-party] update openthread and
  ot-br-posix (project-chip#5062)")
- Remove some unusual whitespace in defines
woody-apple pushed a commit that referenced this pull request Mar 22, 2021
- Remove all of the duplicate include_dirs that were needed due
  to missing dependencies & improper use of private deps.
- Add back an retargetserial.c file which is needed for this build. It
  was removed in fc59bd2 ("[3rd-party] update openthread and
  ot-br-posix (#5062)")
- Remove some unusual whitespace in defines
mspang added a commit to mspang/connectedhomeip that referenced this pull request Mar 25, 2021
- Remove all of the duplicate include_dirs that were needed due
  to missing dependencies & improper use of private deps.
- Add back an retargetserial.c file which is needed for this build. It
  was removed in fc59bd2 ("[3rd-party] update openthread and
  ot-br-posix (project-chip#5062)")
- Define the pigweed_lighting debug API in a common place. This
  means we need to move the enable_pw_rpc to that place, too.
- Add missing bits to CHIPProjectConfig.h needed after c99bef7
  ("[EFR32] BLE Advertissement fixes and change default pin code
  (project-chip#5503)")

Tested via
  gn gen out/with_pw_rpc --args='import("//with_pw_rpc.gni")'
  ninja -C out/with_pw_rpc

Note it is still broken due to OpenThread serial conflict.
mspang added a commit to mspang/connectedhomeip that referenced this pull request Mar 25, 2021
- Remove all of the duplicate include_dirs that were needed due
  to missing dependencies & improper use of private deps.
- Add back an retargetserial.c file which is needed for this build. It
  was removed in fc59bd2 ("[3rd-party] update openthread and
  ot-br-posix (project-chip#5062)")
- Define the pigweed_lighting debug API in a common place. This
  means we need to move the enable_pw_rpc to that place, too.
- Add missing bits to CHIPProjectConfig.h needed after c99bef7
  ("[EFR32] BLE Advertissement fixes and change default pin code
  (project-chip#5503)")

Tested via
  gn gen out/with_pw_rpc --args='import("//with_pw_rpc.gni")'
  ninja -C out/with_pw_rpc

Note it is still broken due to OpenThread serial conflict.
mspang added a commit to mspang/connectedhomeip that referenced this pull request Mar 25, 2021
- Remove all of the duplicate include_dirs that were needed due
  to missing dependencies & improper use of private deps.
- Add back an retargetserial.c file which is needed for this build. It
  was removed in fc59bd2 ("[3rd-party] update openthread and
  ot-br-posix (project-chip#5062)")
- Define the pigweed_lighting debug API in a common place. This
  means we need to move the enable_pw_rpc to that place, too.
- Add missing bits to CHIPProjectConfig.h needed after c99bef7
  ("[EFR32] BLE Advertissement fixes and change default pin code
  (project-chip#5503)")

Tested via
  gn gen out/with_pw_rpc --args='import("//with_pw_rpc.gni")'
  ninja -C out/with_pw_rpc

Note it is still broken due to OpenThread serial conflict.
jimlyall-q pushed a commit to jimlyall-q/connectedhomeip that referenced this pull request Mar 26, 2021
- Remove all of the duplicate include_dirs that were needed due
  to missing dependencies & improper use of private deps.
- Add back an retargetserial.c file which is needed for this build. It
  was removed in fc59bd2 ("[3rd-party] update openthread and
  ot-br-posix (project-chip#5062)")
- Remove some unusual whitespace in defines
jmartinez-silabs pushed a commit to jmartinez-silabs/connectedhomeip that referenced this pull request Mar 26, 2021
- Remove all of the duplicate include_dirs that were needed due
  to missing dependencies & improper use of private deps.
- Add back an retargetserial.c file which is needed for this build. It
  was removed in fc59bd2 ("[3rd-party] update openthread and
  ot-br-posix (project-chip#5062)")
- Define the pigweed_lighting debug API in a common place. This
  means we need to move the enable_pw_rpc to that place, too.
- Add missing bits to CHIPProjectConfig.h needed after c99bef7
  ("[EFR32] BLE Advertissement fixes and change default pin code
  (project-chip#5503)")

Tested via
  gn gen out/with_pw_rpc --args='import("//with_pw_rpc.gni")'
  ninja -C out/with_pw_rpc

Note it is still broken due to OpenThread serial conflict.

Clean up and add comments for the uart api
remap OT uart functions to use our uart api.
jmartinez-silabs pushed a commit to jmartinez-silabs/connectedhomeip that referenced this pull request Mar 26, 2021
- Remove all of the duplicate include_dirs that were needed due
  to missing dependencies & improper use of private deps.
- Add back an retargetserial.c file which is needed for this build. It
  was removed in fc59bd2 ("[3rd-party] update openthread and
  ot-br-posix (project-chip#5062)")
- Define the pigweed_lighting debug API in a common place. This
  means we need to move the enable_pw_rpc to that place, too.
- Add missing bits to CHIPProjectConfig.h needed after c99bef7
  ("[EFR32] BLE Advertissement fixes and change default pin code
  (project-chip#5503)")

Tested via
  gn gen out/with_pw_rpc --args='import("//with_pw_rpc.gni")'
  ninja -C out/with_pw_rpc

Note it is still broken due to OpenThread serial conflict.

Clean up and add comments for the uart api
remap OT uart functions to use our uart api.
jmartinez-silabs pushed a commit to jmartinez-silabs/connectedhomeip that referenced this pull request Mar 26, 2021
- Remove all of the duplicate include_dirs that were needed due
  to missing dependencies & improper use of private deps.
- Add back an retargetserial.c file which is needed for this build. It
  was removed in fc59bd2 ("[3rd-party] update openthread and
  ot-br-posix (project-chip#5062)")
- Define the pigweed_lighting debug API in a common place. This
  means we need to move the enable_pw_rpc to that place, too.
- Add missing bits to CHIPProjectConfig.h needed after c99bef7
  ("[EFR32] BLE Advertissement fixes and change default pin code
  (project-chip#5503)")

Tested via
  gn gen out/with_pw_rpc --args='import("//with_pw_rpc.gni")'
  ninja -C out/with_pw_rpc

Note it is still broken due to OpenThread serial conflict.

Clean up and add comments for the uart api
remap OT uart functions to use our uart api.
jmartinez-silabs pushed a commit to jmartinez-silabs/connectedhomeip that referenced this pull request Mar 26, 2021
- Remove all of the duplicate include_dirs that were needed due
  to missing dependencies & improper use of private deps.
- Add back an retargetserial.c file which is needed for this build. It
  was removed in fc59bd2 ("[3rd-party] update openthread and
  ot-br-posix (project-chip#5062)")
- Define the pigweed_lighting debug API in a common place. This
  means we need to move the enable_pw_rpc to that place, too.
- Add missing bits to CHIPProjectConfig.h needed after c99bef7
  ("[EFR32] BLE Advertissement fixes and change default pin code
  (project-chip#5503)")

Tested via
  gn gen out/with_pw_rpc --args='import("//with_pw_rpc.gni")'
  ninja -C out/with_pw_rpc

Note it is still broken due to OpenThread serial conflict.

Clean up and add comments for the uart api
remap OT uart functions to use our uart api.
jmartinez-silabs pushed a commit to jmartinez-silabs/connectedhomeip that referenced this pull request Mar 26, 2021
- Remove all of the duplicate include_dirs that were needed due
  to missing dependencies & improper use of private deps.
- Add back an retargetserial.c file which is needed for this build. It
  was removed in fc59bd2 ("[3rd-party] update openthread and
  ot-br-posix (project-chip#5062)")
- Define the pigweed_lighting debug API in a common place. This
  means we need to move the enable_pw_rpc to that place, too.
- Add missing bits to CHIPProjectConfig.h needed after c99bef7
  ("[EFR32] BLE Advertissement fixes and change default pin code
  (project-chip#5503)")

Tested via
  gn gen out/with_pw_rpc --args='import("//with_pw_rpc.gni")'
  ninja -C out/with_pw_rpc

Note it is still broken due to OpenThread serial conflict.

Clean up and add comments for the uart api
remap OT uart functions to use our uart api.
mspang added a commit to mspang/connectedhomeip that referenced this pull request Mar 29, 2021
- Remove all of the duplicate include_dirs that were needed due
  to missing dependencies & improper use of private deps.
- Add back an retargetserial.c file which is needed for this build. It
  was removed in fc59bd2 ("[3rd-party] update openthread and
  ot-br-posix (project-chip#5062)")
- Define the pigweed_lighting debug API in a common place. This
  means we need to move the enable_pw_rpc to that place, too.
- Add missing bits to CHIPProjectConfig.h needed after c99bef7
  ("[EFR32] BLE Advertissement fixes and change default pin code
  (project-chip#5503)")

Tested via
  gn gen out/with_pw_rpc --args='import("//with_pw_rpc.gni")'
  ninja -C out/with_pw_rpc

Note it is still broken due to OpenThread serial conflict.
mspang added a commit that referenced this pull request Mar 29, 2021
- Remove all of the duplicate include_dirs that were needed due
  to missing dependencies & improper use of private deps.
- Add back an retargetserial.c file which is needed for this build. It
  was removed in fc59bd2 ("[3rd-party] update openthread and
  ot-br-posix (#5062)")
- Define the pigweed_lighting debug API in a common place. This
  means we need to move the enable_pw_rpc to that place, too.
- Add missing bits to CHIPProjectConfig.h needed after c99bef7
  ("[EFR32] BLE Advertissement fixes and change default pin code
  (#5503)")

Tested via
  gn gen out/with_pw_rpc --args='import("//with_pw_rpc.gni")'
  ninja -C out/with_pw_rpc

Note it is still broken due to OpenThread serial conflict.
jimlyall-q pushed a commit to jimlyall-q/connectedhomeip that referenced this pull request Mar 29, 2021
…5628)

- Remove all of the duplicate include_dirs that were needed due
  to missing dependencies & improper use of private deps.
- Add back an retargetserial.c file which is needed for this build. It
  was removed in fc59bd2 ("[3rd-party] update openthread and
  ot-br-posix (project-chip#5062)")
- Define the pigweed_lighting debug API in a common place. This
  means we need to move the enable_pw_rpc to that place, too.
- Add missing bits to CHIPProjectConfig.h needed after c99bef7
  ("[EFR32] BLE Advertissement fixes and change default pin code
  (project-chip#5503)")

Tested via
  gn gen out/with_pw_rpc --args='import("//with_pw_rpc.gni")'
  ninja -C out/with_pw_rpc

Note it is still broken due to OpenThread serial conflict.
jmartinez-silabs pushed a commit to jmartinez-silabs/connectedhomeip that referenced this pull request Mar 29, 2021
- Remove all of the duplicate include_dirs that were needed due
  to missing dependencies & improper use of private deps.
- Add back an retargetserial.c file which is needed for this build. It
  was removed in fc59bd2 ("[3rd-party] update openthread and
  ot-br-posix (project-chip#5062)")
- Define the pigweed_lighting debug API in a common place. This
  means we need to move the enable_pw_rpc to that place, too.
- Add missing bits to CHIPProjectConfig.h needed after c99bef7
  ("[EFR32] BLE Advertissement fixes and change default pin code
  (project-chip#5503)")

Tested via
  gn gen out/with_pw_rpc --args='import("//with_pw_rpc.gni")'
  ninja -C out/with_pw_rpc

Note it is still broken due to OpenThread serial conflict.

Clean up and add comments for the uart api
remap OT uart functions to use our uart api.
mspang added a commit that referenced this pull request Mar 30, 2021
…read (#5648)

* Rework uart functionality for pigweed to use silabs UARTDRV and DMA.

Rework Uart.c to use a circular buffer and the uardrv dma for RX
Remove from build the uart from openthread. Was causing issue with PW
Add some weak empty implementations of now missing/unused Thread uart functions. Will remap those functions to use uart api implementation for efr32 in chip

* Fix and clean up examples/lighting-app/efr32 RPC build

- Remove all of the duplicate include_dirs that were needed due
  to missing dependencies & improper use of private deps.
- Add back an retargetserial.c file which is needed for this build. It
  was removed in fc59bd2 ("[3rd-party] update openthread and
  ot-br-posix (#5062)")
- Define the pigweed_lighting debug API in a common place. This
  means we need to move the enable_pw_rpc to that place, too.
- Add missing bits to CHIPProjectConfig.h needed after c99bef7
  ("[EFR32] BLE Advertissement fixes and change default pin code
  (#5503)")

Tested via
  gn gen out/with_pw_rpc --args='import("//with_pw_rpc.gni")'
  ninja -C out/with_pw_rpc

Note it is still broken due to OpenThread serial conflict.

Clean up and add comments for the uart api
remap OT uart functions to use our uart api.

* Restyled by whitespace

* Restyled by clang-format

* Restyled by gn

Co-authored-by: Michael Spang <spang@google.com>
Co-authored-by: Restyled.io <commits@restyled.io>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants