Add option to build OTBR and CLI references separately, and add support for 1.3.x nrf52840 type fw #58
Conversation
.github/workflows/build.yml
Outdated
| run: | | ||
| export PATH=/tmp/gcc-arm-none-eabi-9-2019-q4-major/bin:$PATH | ||
| REFERENCE_PLATFORM=nrf52840 REFERENCE_RELEASE_TYPE=1.3 ./script/make-reference-release.bash | ||
| REFERENCE_TYPE=CLI REFERENCE_PLATFORM=nrf52840 REFERENCE_RELEASE_TYPE=1.3 ./script/make-reference-release.bash |
There was a problem hiding this comment.
REFERENCE_TYPE and REFERENCE_RELEASE_TYPE may be ambiguous when put together. Shall we rename one of them? Note that renaming REFERENCE_RELEASE_TYPE may break backward compatibility.
There was a problem hiding this comment.
What about REFERENCE_TYPE -> REFERENCE_RELEASE_TARGET? or any better suggestions?
There was a problem hiding this comment.
REFERENCE_RELEASE_TARGET looks good to me. On the other hand I'm afraid in the end we have to rename REFERENCE_RELEASE_TYPE anyway.
There was a problem hiding this comment.
Had an offline discussion with @superwhd , I'll rename REFERENCE_RELEASE_TYPE to REFERENCE_THREAD_VERSION to avoid confusion.
There was a problem hiding this comment.
I'll rename REFERENCE_RELEASE_TYPE to REFERENCE_THREAD_VERSION in a separate PR to limit the scope of this PR.
script/make-firmware.bash
Outdated
| @@ -292,6 +307,23 @@ build() | |||
| thread_version=1.2 build_ot "-DBOARD=brd4166a" "${options[@]}" "$@" | |||
| ;; | |||
| esac | |||
| elif [ "${REFERENCE_RELEASE_TYPE}" = "1.3.1" ]; then | |||
There was a problem hiding this comment.
I think it's still possible to merge these two if branches into one.
You already have the options for different platforms of the same version number like build_${version}_options_${platform}. Maybe you can build a string to refer to the variable name. I'm not super familiar with this shell syntax but it seems to work.
Just an example:
build=build_1_3_1
build_1_3_1_options="-DOT_VERSION=1.3.1"
options_var_name="$build"_options
options=${!options_var_name}
reference: https://stackoverflow.com/questions/8515411/what-is-indirect-expansion-what-does-var-mean
sunytt
force-pushed
the
refactor-build-options
branch
from
3df9d7c
to
8033a37
Compare
Add support for nrf52840 1.3.1 build
sunytt
force-pushed
the
refactor-build-options
branch
from
8033a37
to
80346af
Compare
|
Disabled building for ncs type reference release for now due to #61 |
sunytt
changed the title
This PR introduces the option REFERENCE_TYPE=(OTBR|CLI) so it's possible to build CLI reference release and OTBR(host+RCP) reference release separately. If this option is not provided all types of reference release will be built as before.
ot-br-posix commit id is added to the output path.
Added support for building 1.3.1 reference release with REFERENCE_PLATFORM=nrf52840. It can be used when building OTBR reference release so the same openthread commit is used to build RCP and host. (If we use ncs as platform then the openthread commit is hardcoded in
sdk-nrfso it may differ with the host image)