aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpx4dev <px4@purgatory.org>2013-04-06 00:04:59 -0700
committerpx4dev <px4@purgatory.org>2013-04-06 00:04:59 -0700
commit2e5809d051121cbb73d92bf98be0a2952f1dbd2e (patch)
treee7ffbbc72beca1c21b4d7f0ac56afa533097f322
parent976f1334efbb1218a0cd5af6e9f1d344b067eb13 (diff)
downloadpx4-firmware-2e5809d051121cbb73d92bf98be0a2952f1dbd2e.tar.gz
px4-firmware-2e5809d051121cbb73d92bf98be0a2952f1dbd2e.tar.bz2
px4-firmware-2e5809d051121cbb73d92bf98be0a2952f1dbd2e.zip
Fix the remaining pieces so that we can build a firmware image for FMUv2
-rw-r--r--Images/px4fmuv2.prototype12
-rw-r--r--Makefile2
-rw-r--r--makefiles/config_px4fmuv2_default.mk6
3 files changed, 13 insertions, 7 deletions
diff --git a/Images/px4fmuv2.prototype b/Images/px4fmuv2.prototype
new file mode 100644
index 000000000..5109b77d1
--- /dev/null
+++ b/Images/px4fmuv2.prototype
@@ -0,0 +1,12 @@
+{
+ "board_id": 9,
+ "magic": "PX4FWv1",
+ "description": "Firmware for the PX4FMUv2 board",
+ "image": "",
+ "build_time": 0,
+ "summary": "PX4FMUv2",
+ "version": "0.1",
+ "image_size": 0,
+ "git_identity": "",
+ "board_revision": 0
+}
diff --git a/Makefile b/Makefile
index e87513e78..0b8a65d94 100644
--- a/Makefile
+++ b/Makefile
@@ -48,7 +48,7 @@ CONFIGS ?= $(subst config_,,$(basename $(notdir $(wildcard $(PX4_MK_DIR)config
#
# Boards that we build NuttX export kits for.
#
-BOARDS = px4fmu px4io
+BOARDS := $(subst board_,,$(basename $(notdir $(wildcard $(PX4_MK_DIR)board_*.mk))))
#
# Debugging
diff --git a/makefiles/config_px4fmuv2_default.mk b/makefiles/config_px4fmuv2_default.mk
index d5bc758b8..2f104a5e4 100644
--- a/makefiles/config_px4fmuv2_default.mk
+++ b/makefiles/config_px4fmuv2_default.mk
@@ -22,7 +22,6 @@ endef
# command priority stack entrypoint
BUILTIN_COMMANDS := \
$(call _B, adc, , 2048, adc_main ) \
- $(call _B, ardrone_interface, SCHED_PRIORITY_MAX-15, 2048, ardrone_interface_main ) \
$(call _B, attitude_estimator_ekf, , 2048, attitude_estimator_ekf_main) \
$(call _B, bl_update, , 4096, bl_update_main ) \
$(call _B, blinkm, , 2048, blinkm_main ) \
@@ -30,10 +29,8 @@ BUILTIN_COMMANDS := \
$(call _B, commander, SCHED_PRIORITY_MAX-30, 2048, commander_main ) \
$(call _B, control_demo, , 2048, control_demo_main ) \
$(call _B, delay_test, , 2048, delay_test_main ) \
- $(call _B, eeprom, , 4096, eeprom_main ) \
$(call _B, fixedwing_att_control, SCHED_PRIORITY_MAX-30, 2048, fixedwing_att_control_main ) \
$(call _B, fixedwing_pos_control, SCHED_PRIORITY_MAX-30, 2048, fixedwing_pos_control_main ) \
- $(call _B, fmu, , 2048, fmu_main ) \
$(call _B, gps, , 2048, gps_main ) \
$(call _B, hil, , 2048, hil_main ) \
$(call _B, hott_telemetry, , 2048, hott_telemetry_main ) \
@@ -43,14 +40,11 @@ BUILTIN_COMMANDS := \
$(call _B, mavlink, , 2048, mavlink_main ) \
$(call _B, mavlink_onboard, , 2048, mavlink_onboard_main ) \
$(call _B, mixer, , 4096, mixer_main ) \
- $(call _B, ms5611, , 2048, ms5611_main ) \
$(call _B, multirotor_att_control, SCHED_PRIORITY_MAX-15, 2048, multirotor_att_control_main) \
$(call _B, multirotor_pos_control, SCHED_PRIORITY_MAX-25, 2048, multirotor_pos_control_main) \
- $(call _B, param, , 4096, param_main ) \
$(call _B, perf, , 2048, perf_main ) \
$(call _B, position_estimator, , 4096, position_estimator_main ) \
$(call _B, preflight_check, , 2048, preflight_check_main ) \
- $(call _B, px4io, , 2048, px4io_main ) \
$(call _B, reboot, , 2048, reboot_main ) \
$(call _B, sdlog, SCHED_PRIORITY_MAX-30, 2048, sdlog_main ) \
$(call _B, sensors, SCHED_PRIORITY_MAX-5, 4096, sensors_main ) \