diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-04-28 14:54:57 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-04-28 14:54:57 +0200 |
| commit | a1503a8dd7f29c52cd4bd1740ad0a0010d50ddfe (patch) | |
| tree | a0ffd694a4e337a4846f92cb5518f8b3d25b2978 /makefiles | |
| parent | 1df5e98aa507c7a89f1491254d7f34f94c04ede6 (diff) | |
| parent | 0eafc2ade1dce974d5f7bdf05ca7678fa0b59ab0 (diff) | |
| download | px4-firmware-a1503a8dd7f29c52cd4bd1740ad0a0010d50ddfe.tar.gz px4-firmware-a1503a8dd7f29c52cd4bd1740ad0a0010d50ddfe.tar.bz2 px4-firmware-a1503a8dd7f29c52cd4bd1740ad0a0010d50ddfe.zip | |
Merge branch 'public-export-build' into fmuv2_bringup
Diffstat (limited to 'makefiles')
| -rw-r--r-- | makefiles/config_px4fmu_default.mk | 4 | ||||
| -rw-r--r-- | makefiles/setup.mk | 3 |
2 files changed, 1 insertions, 6 deletions
diff --git a/makefiles/config_px4fmu_default.mk b/makefiles/config_px4fmu_default.mk index 32b26fcf1..5d80d2def 100644 --- a/makefiles/config_px4fmu_default.mk +++ b/makefiles/config_px4fmu_default.mk @@ -116,7 +116,5 @@ endef # command priority stack entrypoint BUILTIN_COMMANDS := \ - $(call _B, math_demo, , 8192, math_demo_main ) \ $(call _B, sercon, , 2048, sercon_main ) \ - $(call _B, serdis, , 2048, serdis_main ) \ - $(call _B, uorb, , 4096, uorb_main ) + $(call _B, serdis, , 2048, serdis_main ) diff --git a/makefiles/setup.mk b/makefiles/setup.mk index 3c910bcfa..8072ec791 100644 --- a/makefiles/setup.mk +++ b/makefiles/setup.mk @@ -59,9 +59,6 @@ export INCLUDE_DIRS := $(PX4_MODULE_SRC) \ $(PX4_MODULE_SRC)/modules/ \ $(PX4_INCLUDE_DIR) -# Include from legacy app/library path -export INCLUDE_DIRS += $(NUTTX_APP_SRC) - # # Tools # |