Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Tools: fixed build of CPUInfo and other tools

This commit is contained in:
Andrew Tridgell 2023-04-10 14:45:07 +10:00
parent 7b4e4889c7
commit 6944e73c57
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Tools/CPUInfo/CPUInfo.cpp
View File

@ -25,7 +25,7 @@ const AP_HAL::HAL& hal = AP_HAL::get_HAL();
#if CONFIG_HAL_BOARD != HAL_BOARD_LINUX #if CONFIG_HAL_BOARD != HAL_BOARD_LINUX
// On H750 we want to measure external flash to ram performance // On H750 we want to measure external flash to ram performance
#if defined(EXT_FLASH_SIZE_MB) && defined(STM32H7) #if defined(EXT_FLASH_SIZE_MB) && EXT_FLASH_SIZE_MB>0 && defined(STM32H7)
#define DISABLE_CACHES #define DISABLE_CACHES
#endif #endif

4
Tools/ardupilotwaf/chibios.py
View File

@ -348,7 +348,7 @@ class generate_apj(Task.Task):
class build_abin(Task.Task): class build_abin(Task.Task):
'''build an abin file for skyviper firmware upload via web UI''' '''build an abin file for skyviper firmware upload via web UI'''
color='CYAN' color='CYAN'
run_str='${TOOLS_SCRIPTS}/make_abin.sh ${SRC}.bin ${SRC}.abin' run_str='${TOOLS_SCRIPTS}/make_abin.sh ${SRC} ${TGT}'
always_run = True always_run = True
def keyword(self): def keyword(self):
return "Generating" return "Generating"
@ -400,7 +400,7 @@ def chibios_firmware(self):
if self.env.BUILD_ABIN: if self.env.BUILD_ABIN:
abin_target = self.bld.bldnode.find_or_declare('bin/' + link_output.change_ext('.abin').name) abin_target = self.bld.bldnode.find_or_declare('bin/' + link_output.change_ext('.abin').name)
abin_task = self.create_task('build_abin', src=link_output, tgt=abin_target) abin_task = self.create_task('build_abin', src=bin_target, tgt=abin_target)
abin_task.set_run_after(generate_apj_task) abin_task.set_run_after(generate_apj_task)
cleanup_task = self.create_task('build_normalized_bins', src=bin_target) cleanup_task = self.create_task('build_normalized_bins', src=bin_target)

2
Tools/scripts/build_ci.sh
View File

@ -285,6 +285,8 @@ for t in $CI_BUILD_TARGET; do
$waf configure --board Durandal $waf configure --board Durandal
$waf clean $waf clean
$waf copter $waf copter
echo "Building CPUInfo"
$waf --target=tool/CPUInfo
# test external flash build # test external flash build
echo "Building SPRacingH7" echo "Building SPRacingH7"

2
Tools/scripts/make_abin.sh
View File

@ -12,7 +12,7 @@ BINFILE="$1"
ABINFILE="$2" ABINFILE="$2"
[ -f "$BINFILE" ] || { [ -f "$BINFILE" ] || {
echo "Can't find bin file" echo "Can't find bin file $BINFILE for abin"
exit 1 exit 1
} }