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

Tools: ardupilotwaf: add entry for 64bit versions of Navigator #28239

Merged
merged 2 commits into from
Oct 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions .github/workflows/test_linux_sbc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,10 @@ jobs:
toolchain: armhf-musl
- config: linux
toolchain: base # GCC
- config: navigator64
toolchain: aarch64
- config: linux
toolchain: base # GCC
exclude:
- config: navigator
toolchain: armhf
Expand Down
11 changes: 11 additions & 0 deletions Tools/ardupilotwaf/boards.py
Original file line number Diff line number Diff line change
Expand Up @@ -1430,6 +1430,17 @@ def configure_env(self, cfg, env):
CONFIG_HAL_BOARD_SUBTYPE='HAL_BOARD_SUBTYPE_LINUX_NAVIGATOR',
)

class navigator64(linux):
toolchain = 'aarch64-linux-gnu'

def configure_env(self, cfg, env):
super(navigator64, self).configure_env(cfg, env)

env.DEFINES.update(
CONFIG_HAL_BOARD_SUBTYPE='HAL_BOARD_SUBTYPE_LINUX_NAVIGATOR',
)


class erleboard(linux):
toolchain = 'arm-linux-gnueabihf'

Expand Down
1 change: 1 addition & 0 deletions Tools/scripts/board_list.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ def __init__(self):
self.boards = [
Board("erlebrain2"),
Board("navigator"),
Board("navigator64"),
Board("navio"),
Board("navio2"),
Board("edge"),
Expand Down
8 changes: 8 additions & 0 deletions Tools/scripts/build_ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -409,6 +409,14 @@ for t in $CI_BUILD_TARGET; do
continue
fi

if [ "$t" == "navigator64" ]; then
echo "Building navigator64"
$waf configure --board navigator64 --toolchain=aarch64-linux-gnu
$waf sub
./Tools/scripts/firmware_version_decoder.py -f build/navigator64/bin/ardusub --expected-hash $GIT_VERSION
continue
fi

if [ "$t" == "replay" ]; then
echo "Building replay"
$waf configure --board sitl --debug --disable-scripting
Expand Down
Loading