From 1a007dfcc06a0fcce239351beea4a83f055a315b Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 13 Aug 2014 14:41:59 +1000 Subject: [PATCH] build: added subtypes for all boards --- mk/environ.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/mk/environ.mk b/mk/environ.mk index f18a707462..4772b9dc6c 100644 --- a/mk/environ.mk +++ b/mk/environ.mk @@ -132,6 +132,7 @@ endif ifneq ($(findstring sitl, $(MAKECMDGOALS)),) HAL_BOARD = HAL_BOARD_AVR_SITL +HAL_BOARD_SUBTYPE = HAL_BOARD_SUBTYPE_NONE endif ifneq ($(findstring linux, $(MAKECMDGOALS)),) @@ -156,32 +157,39 @@ endif ifneq ($(findstring vrbrain, $(MAKECMDGOALS)),) HAL_BOARD = HAL_BOARD_VRBRAIN +HAL_BOARD_SUBTYPE = HAL_BOARD_SUBTYPE_NONE endif ifneq ($(findstring vrubrain, $(MAKECMDGOALS)),) HAL_BOARD = HAL_BOARD_VRBRAIN +HAL_BOARD_SUBTYPE = HAL_BOARD_SUBTYPE_NONE endif ifneq ($(findstring vrhero, $(MAKECMDGOALS)),) HAL_BOARD = HAL_BOARD_VRBRAIN +HAL_BOARD_SUBTYPE = HAL_BOARD_SUBTYPE_NONE endif ifneq ($(findstring apm1, $(MAKECMDGOALS)),) HAL_BOARD = HAL_BOARD_APM1 +HAL_BOARD_SUBTYPE = HAL_BOARD_SUBTYPE_AVR_APM1 endif ifneq ($(findstring apm2, $(MAKECMDGOALS)),) HAL_BOARD = HAL_BOARD_APM2 +HAL_BOARD_SUBTYPE = HAL_BOARD_SUBTYPE_AVR_APM2 endif ifneq ($(findstring flymaple, $(MAKECMDGOALS)),) HAL_BOARD = HAL_BOARD_FLYMAPLE +HAL_BOARD_SUBTYPE = HAL_BOARD_SUBTYPE_NONE endif # default to APM2 ifeq ($(HAL_BOARD),) #$(warning No HAL_BOARD in config.mk - defaulting to HAL_BOARD_APM2) HAL_BOARD = HAL_BOARD_APM2 +HAL_BOARD_SUBTYPE = HAL_BOARD_SUBTYPE_AVR_APM2 endif HARDWARE ?= arduino