Skip to content

Commit

Permalink
Merge branch 'endomorphism'.
Browse files Browse the repository at this point in the history
  • Loading branch information
mlyle committed Sep 22, 2015
2 parents 4b9fc7d + 5d56d1e commit f069ece
Show file tree
Hide file tree
Showing 570 changed files with 345,613 additions and 286,112 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Exclude temporary and system files
.DS_Store
*.swp

# /flight/
/flight/*.pnproj
Expand Down
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -839,9 +839,9 @@ endef

# Start out assuming that we'll build fw, bl and bu for all boards
FW_BOARDS := $(ALL_BOARDS)
BL_BOARDS := $(ALL_BOARDS)
BU_BOARDS := $(ALL_BOARDS)
EF_BOARDS := $(ALL_BOARDS)
BL_BOARDS := $(filter-out naze32, $(ALL_BOARDS))
BU_BOARDS := $(BL_BOARDS)
EF_BOARDS := $(filter-out naze32, $(ALL_BOARDS))

# Sim targets are different for each host OS
ifeq ($(UNAME), Linux)
Expand Down Expand Up @@ -908,7 +908,7 @@ $(eval $(call SIM_TEMPLATE,simulation,Simulation,'sim ',posix,elf))
#
##############################

ALL_UNITTESTS := logfs i2c_vm misc_math sin_lookup coordinate_conversions error_correcting streamfs dsm timeutils
ALL_UNITTESTS := logfs i2c_vm misc_math coordinate_conversions error_correcting streamfs dsm timeutils
ALL_PYTHON_UNITTESTS := python_ut_test

UT_OUT_DIR := $(BUILD_DIR)/unit_tests
Expand Down
Loading

0 comments on commit f069ece

Please sign in to comment.