From 2899e44c0ce27e57611411b3c2ddad4c89879143 Mon Sep 17 00:00:00 2001 From: Mikhail Avkhimenia Date: Wed, 23 Jul 2014 14:13:55 +0400 Subject: [PATCH] build: add navio build target --- mk/environ.mk | 10 +++++++--- mk/targets.mk | 7 +++++-- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/mk/environ.mk b/mk/environ.mk index c6d941a414..f18a707462 100644 --- a/mk/environ.mk +++ b/mk/environ.mk @@ -14,7 +14,7 @@ export LANG=C # Locate the sketch sources based on the initial Makefile's path # SRCROOT := $(realpath $(dir $(firstword $(MAKEFILE_LIST)))) -ifneq ($(findstring CYGWIN, $(SYSTYPE)),) +ifneq ($(findstring CYGWIN, $(SYSTYPE)),) # Workaround a $(realpath ) bug on cygwin ifeq ($(SRCROOT),) SRCROOT := $(shell cygpath -m ${CURDIR}) @@ -48,7 +48,7 @@ else $(warning WARNING: sketchbook directory $(SKETCHBOOK) contains no libraries) endif endif -ifneq ($(findstring CYGWIN, $(SYSTYPE)),) +ifneq ($(findstring CYGWIN, $(SYSTYPE)),) # Convert cygwin path into a windows normal path SKETCHBOOK := $(shell cygpath ${SKETCHBOOK}) endif @@ -149,6 +149,11 @@ HAL_BOARD = HAL_BOARD_LINUX HAL_BOARD_SUBTYPE = HAL_BOARD_SUBTYPE_LINUX_PXF endif +ifneq ($(findstring navio, $(MAKECMDGOALS)),) +HAL_BOARD = HAL_BOARD_LINUX +HAL_BOARD_SUBTYPE = HAL_BOARD_SUBTYPE_LINUX_NAVIO +endif + ifneq ($(findstring vrbrain, $(MAKECMDGOALS)),) HAL_BOARD = HAL_BOARD_VRBRAIN endif @@ -189,4 +194,3 @@ BOARD = mega endif endif - diff --git a/mk/targets.mk b/mk/targets.mk index 74a26c504d..73b93785bf 100644 --- a/mk/targets.mk +++ b/mk/targets.mk @@ -35,6 +35,10 @@ pxf: HAL_BOARD = HAL_BOARD_LINUX pxf: TOOLCHAIN = BBONE pxf: all +navio: HAL_BOARD = HAL_BOARD_LINUX +navio: TOOLCHAIN = RPI +navio: all + empty: HAL_BOARD = HAL_BOARD_EMPTY empty: TOOLCHAIN = AVR empty: all @@ -48,7 +52,7 @@ empty: all # cope with copter and hil targets FRAMES = quad tri hexa y6 octa octa-quad heli single obc -BOARDS = apm1 apm2 apm2beta apm1-1280 px4 px4-v1 px4-v2 sitl flymaple linux vrbrain vrbrain-v40 vrbrain-v45 vrbrainv-50 vrbrain-v51 vrubrain-v51 vrhero-v10 erle pxf +BOARDS = apm1 apm2 apm2beta apm1-1280 px4 px4-v1 px4-v2 sitl flymaple linux vrbrain vrbrain-v40 vrbrain-v45 vrbrainv-50 vrbrain-v51 vrubrain-v51 vrhero-v10 erle pxf navio define frame_template $(1)-$(2) : EXTRAFLAGS += "-DFRAME_CONFIG=$(shell echo $(2) | tr a-z A-Z | sed s/-/_/g)_FRAME " @@ -78,4 +82,3 @@ etags: clean: @rm -fr $(BUILDROOT) -