aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: fix for HAL_SITL rename

Browse Source
This commit is contained in:
Andrew Tridgell 2015-05-04 16:18:15 +10:00
parent 212e0ec002
commit 4ad3075754
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mk/apm.mk
View File

@ -36,7 +36,7 @@ ifeq ($(HAL_BOARD),HAL_BOARD_APM2)
include $(MK_DIR)/board_avr.mk include $(MK_DIR)/board_avr.mk
endif endif
ifeq ($(HAL_BOARD),HAL_BOARD_AVR_SITL) ifeq ($(HAL_BOARD),HAL_BOARD_SITL)
include $(MK_DIR)/board_native.mk include $(MK_DIR)/board_native.mk
endif endif

2
mk/environ.mk
View File

@ -131,7 +131,7 @@ HAL_BOARD = HAL_BOARD_PX4
endif endif
ifneq ($(findstring sitl, $(MAKECMDGOALS)),) ifneq ($(findstring sitl, $(MAKECMDGOALS)),)
HAL_BOARD = HAL_BOARD_AVR_SITL HAL_BOARD = HAL_BOARD_SITL
HAL_BOARD_SUBTYPE = HAL_BOARD_SUBTYPE_NONE HAL_BOARD_SUBTYPE = HAL_BOARD_SUBTYPE_NONE
endif endif

4
mk/targets.mk
View File

@ -1,11 +1,11 @@
default: all default: all
# convenient targets for our supported boards # convenient targets for our supported boards
sitl: HAL_BOARD = HAL_BOARD_AVR_SITL sitl: HAL_BOARD = HAL_BOARD_SITL
sitl: TOOLCHAIN = NATIVE sitl: TOOLCHAIN = NATIVE
sitl: all sitl: all
sitl-arm: HAL_BOARD = HAL_BOARD_AVR_SITL sitl-arm: HAL_BOARD = HAL_BOARD_SITL
sitl-arm: TOOLCHAIN = RPI sitl-arm: TOOLCHAIN = RPI
sitl-arm: all sitl-arm: all