From 4ad30757548cf0be56336c3538bdf554225bfe89 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 4 May 2015 16:18:15 +1000 Subject: [PATCH] build: fix for HAL_SITL rename --- mk/apm.mk | 2 +- mk/environ.mk | 2 +- mk/targets.mk | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mk/apm.mk b/mk/apm.mk index f81635607a..065314f98b 100644 --- a/mk/apm.mk +++ b/mk/apm.mk @@ -36,7 +36,7 @@ ifeq ($(HAL_BOARD),HAL_BOARD_APM2) include $(MK_DIR)/board_avr.mk endif -ifeq ($(HAL_BOARD),HAL_BOARD_AVR_SITL) +ifeq ($(HAL_BOARD),HAL_BOARD_SITL) include $(MK_DIR)/board_native.mk endif diff --git a/mk/environ.mk b/mk/environ.mk index 5eb8c73694..6aafc51e0b 100644 --- a/mk/environ.mk +++ b/mk/environ.mk @@ -131,7 +131,7 @@ HAL_BOARD = HAL_BOARD_PX4 endif ifneq ($(findstring sitl, $(MAKECMDGOALS)),) -HAL_BOARD = HAL_BOARD_AVR_SITL +HAL_BOARD = HAL_BOARD_SITL HAL_BOARD_SUBTYPE = HAL_BOARD_SUBTYPE_NONE endif diff --git a/mk/targets.mk b/mk/targets.mk index 6dcd07eb18..c97f8891d4 100644 --- a/mk/targets.mk +++ b/mk/targets.mk @@ -1,11 +1,11 @@ default: all # convenient targets for our supported boards -sitl: HAL_BOARD = HAL_BOARD_AVR_SITL +sitl: HAL_BOARD = HAL_BOARD_SITL sitl: TOOLCHAIN = NATIVE sitl: all -sitl-arm: HAL_BOARD = HAL_BOARD_AVR_SITL +sitl-arm: HAL_BOARD = HAL_BOARD_SITL sitl-arm: TOOLCHAIN = RPI sitl-arm: all