From e7dcb43407b0d699100f655fb93e1ab239115c2a Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <andrew@tridgell.net>
Date: Thu, 8 Jan 2015 13:41:51 +1100
Subject: [PATCH] PX4: update to new PX4 config

---
 mk/PX4/config_px4fmu-v1_APM.mk | 78 +---------------------------------
 mk/PX4/config_px4fmu-v2_APM.mk | 77 +--------------------------------
 2 files changed, 3 insertions(+), 152 deletions(-)

diff --git a/mk/PX4/config_px4fmu-v1_APM.mk b/mk/PX4/config_px4fmu-v1_APM.mk
index 36e535803f..6f17f693a2 100644
--- a/mk/PX4/config_px4fmu-v1_APM.mk
+++ b/mk/PX4/config_px4fmu-v1_APM.mk
@@ -1,83 +1,7 @@
 #
 # Makefile for the px4fmu-v1_APM configuration
 #
+include $(SKETCHBOOK)/mk/PX4/px4_common.mk
 
-#
-# Use the configuration's ROMFS.
-#
-ROMFS_ROOT	 = $(SKETCHBOOK)/mk/PX4/ROMFS
-
-MODULES		+= $(APM_MODULE_DIR)
-
-#
-# Board support modules
-#
-MODULES		+= drivers/device
-MODULES		+= drivers/stm32
-MODULES		+= drivers/stm32/adc
-MODULES		+= drivers/stm32/tone_alarm
-MODULES		+= drivers/led
-MODULES		+= drivers/px4io
-MODULES		+= drivers/px4fmu
 MODULES		+= drivers/boards/px4fmu-v1
-MODULES		+= drivers/rgbled
-MODULES		+= drivers/l3gd20
-# MODULES		+= drivers/bma180
-MODULES		+= drivers/mpu6000
-MODULES		+= drivers/hmc5883
-MODULES		+= drivers/ms5611
-MODULES		+= drivers/mb12xx
-MODULES		+= drivers/ll40ls
-MODULES		+= drivers/gps
-#MODULES		+= drivers/hil
-#MODULES		+= drivers/hott_telemetry
-MODULES		+= drivers/blinkm
-MODULES		+= drivers/airspeed
-MODULES		+= drivers/ets_airspeed
-MODULES		+= drivers/meas_airspeed
-MODULES		+= drivers/mkblctrl
-#MODULES	+= modules/sensors
 
-#
-# System commands
-#
-MODULES		+= systemcmds/mtd
-MODULES		+= systemcmds/bl_update
-MODULES		+= systemcmds/boardinfo
-MODULES		+= systemcmds/i2c
-MODULES		+= systemcmds/mixer
-MODULES		+= systemcmds/perf
-MODULES		+= systemcmds/pwm
-MODULES		+= systemcmds/reboot
-MODULES		+= systemcmds/top
-MODULES		+= systemcmds/tests
-MODULES		+= systemcmds/nshterm
-MODULES         += systemcmds/auth
-
-#
-# Libraries
-#
-MODULES		+= modules/systemlib
-MODULES		+= modules/systemlib/mixer
-MODULES		+= modules/uORB
-MODULES		+= lib/mathlib/math/filter
-MODULES	        += modules/libtomfastmath
-MODULES         += modules/libtomcrypt
-MODULES		+= lib/conversion
-
-#
-# Transitional support - add commands from the NuttX export archive.
-#
-# In general, these should move to modules over time.
-#
-# Each entry here is <command>.<priority>.<stacksize>.<entrypoint> but we use a helper macro
-# to make the table a bit more readable.
-#
-define _B
-	$(strip $1).$(or $(strip $2),SCHED_PRIORITY_DEFAULT).$(or $(strip $3),CONFIG_PTHREAD_STACK_DEFAULT).$(strip $4)
-endef
-
-#                  command                 priority                   stack  entrypoint
-BUILTIN_COMMANDS := \
-	$(call _B, sercon,                 ,                          2048,  sercon_main                ) \
-	$(call _B, serdis,                 ,                          2048,  serdis_main                )
diff --git a/mk/PX4/config_px4fmu-v2_APM.mk b/mk/PX4/config_px4fmu-v2_APM.mk
index 494b456ac6..489562eb8a 100644
--- a/mk/PX4/config_px4fmu-v2_APM.mk
+++ b/mk/PX4/config_px4fmu-v2_APM.mk
@@ -1,82 +1,9 @@
 #
 # Makefile for the px4fmu-v2_APM configuration
 #
+include $(SKETCHBOOK)/mk/PX4/px4_common.mk
 
-#
-# Use the configuration's ROMFS.
-#
-ROMFS_ROOT	 = $(SKETCHBOOK)/mk/PX4/ROMFS
-
-MODULES		+= $(APM_MODULE_DIR)
-
-#
-# Board support modules
-#
-MODULES		+= drivers/device
-MODULES		+= drivers/stm32
-MODULES		+= drivers/stm32/adc
-MODULES		+= drivers/stm32/tone_alarm
-MODULES		+= drivers/led
-MODULES		+= drivers/px4fmu
-MODULES		+= drivers/px4io
-MODULES		+= drivers/boards/px4fmu-v2
-MODULES		+= drivers/rgbled
 MODULES		+= drivers/lsm303d
 MODULES		+= drivers/l3gd20
-MODULES		+= drivers/mpu6000
-MODULES		+= drivers/hmc5883
-MODULES		+= drivers/ms5611
-MODULES		+= drivers/mb12xx
-MODULES		+= drivers/ll40ls
-MODULES		+= drivers/gps
-MODULES		+= drivers/hil
-#MODULES	+= drivers/hott_telemetry
-MODULES		+= drivers/blinkm
-#MODULES	+= modules/sensors
-MODULES		+= drivers/airspeed
-MODULES		+= drivers/ets_airspeed
-MODULES		+= drivers/meas_airspeed
-MODULES		+= drivers/mkblctrl
+MODULES		+= drivers/boards/px4fmu-v2
 
-#
-# System commands
-#
-MODULES		+= systemcmds/bl_update
-MODULES		+= systemcmds/boardinfo
-MODULES		+= systemcmds/mixer
-MODULES		+= systemcmds/perf
-MODULES		+= systemcmds/pwm
-MODULES		+= systemcmds/reboot
-MODULES		+= systemcmds/top
-MODULES		+= systemcmds/tests
-MODULES		+= systemcmds/nshterm
-MODULES		+= systemcmds/auth
-MODULES         += systemcmds/mtd
-
-#
-# Library modules
-#
-MODULES		+= modules/systemlib
-MODULES		+= modules/systemlib/mixer
-MODULES		+= modules/uORB
-MODULES		+= lib/mathlib/math/filter
-MODULES	        += modules/libtomfastmath
-MODULES         += modules/libtomcrypt
-MODULES		+= lib/conversion
-
-#
-# Transitional support - add commands from the NuttX export archive.
-#
-# In general, these should move to modules over time.
-#
-# Each entry here is <command>.<priority>.<stacksize>.<entrypoint> but we use a helper macro
-# to make the table a bit more readable.
-#
-define _B
-	$(strip $1).$(or $(strip $2),SCHED_PRIORITY_DEFAULT).$(or $(strip $3),CONFIG_PTHREAD_STACK_DEFAULT).$(strip $4)
-endef
-
-#                  command                 priority                   stack  entrypoint
-BUILTIN_COMMANDS := \
-	$(call _B, sercon,                 ,                          2048,  sercon_main                ) \
-	$(call _B, serdis,                 ,                          2048,  serdis_main                )