From bbb47ece9c6167f9cafc8764fa5f4727dce1bed8 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Fri, 28 Nov 2014 08:06:32 +1100 Subject: [PATCH] PX4: use a common makefile for most of v1 and v2 --- mk/PX4/config_px4fmu-v1_APM.mk | 84 +----------------------------- mk/PX4/config_px4fmu-v2_APM.mk | 94 +--------------------------------- mk/PX4/px4_common.mk | 94 ++++++++++++++++++++++++++++++++++ 3 files changed, 97 insertions(+), 175 deletions(-) create mode 100644 mk/PX4/px4_common.mk diff --git a/mk/PX4/config_px4fmu-v1_APM.mk b/mk/PX4/config_px4fmu-v1_APM.mk index d4431d6788..6f17f693a2 100644 --- a/mk/PX4/config_px4fmu-v1_APM.mk +++ b/mk/PX4/config_px4fmu-v1_APM.mk @@ -1,89 +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 - -# Note: auth disabled to keep us under 1MB flash because of STM32 bug -#ifneq ($(wildcard $(PX4_ROOT)/src/systemcmds/auth),) -#MODULES += systemcmds/auth -#endif -#ifneq ($(wildcard $(PX4_ROOT)/src/modules/libtomfastmath),) -#MODULES += modules/libtomfastmath -#MODULES += modules/libtomcrypt -#endif - -# -# Libraries -# -MODULES += modules/systemlib -MODULES += modules/systemlib/mixer -MODULES += modules/uORB -MODULES += lib/mathlib/math/filter -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 ... 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 7656f7de39..cac8901a4d 100644 --- a/mk/PX4/config_px4fmu-v2_APM.mk +++ b/mk/PX4/config_px4fmu-v2_APM.mk @@ -1,102 +1,12 @@ # # 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/px4flow 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 - -# -# 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/mtd -ifneq ($(wildcard $(PX4_ROOT)/src/systemcmds/reflect),) -MODULES += systemcmds/reflect -endif -ifneq ($(wildcard $(PX4_ROOT)/src/systemcmds/motor_test),) -MODULES += systemcmds/motor_test -endif - -# -# Library modules -# -MODULES += modules/systemlib -MODULES += modules/systemlib/mixer -MODULES += modules/uORB -MODULES += lib/mathlib/math/filter - -# Note: auth disabled to keep us under 1MB flash because of STM32 bug -#ifneq ($(wildcard $(PX4_ROOT)/src/systemcmds/auth),) -#MODULES += systemcmds/auth -#endif -#ifneq ($(wildcard $(PX4_ROOT)/src/modules/libtomfastmath),) -#MODULES += modules/libtomfastmath -#MODULES += modules/libtomcrypt -#endif - -MODULES += lib/conversion ifneq ($(wildcard $(SKETCHBOOK)/../uavcan),) MODULES += modules/uavcan MODULES += lib/mathlib -LIBRARIES += lib/mathlib/CMSIS +#LIBRARIES += lib/mathlib/CMSIS endif - -# -# Transitional support - add commands from the NuttX export archive. -# -# In general, these should move to modules over time. -# -# Each entry here is ... 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/px4_common.mk b/mk/PX4/px4_common.mk new file mode 100644 index 0000000000..05a0450110 --- /dev/null +++ b/mk/PX4/px4_common.mk @@ -0,0 +1,94 @@ +# +# common makefile elements for all PX4 boards +# + +# +# 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/px4flow +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 + +# +# 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/mtd +ifneq ($(wildcard $(PX4_ROOT)/src/systemcmds/reflect),) +MODULES += systemcmds/reflect +endif +ifneq ($(wildcard $(PX4_ROOT)/src/systemcmds/motor_test),) +MODULES += systemcmds/motor_test +endif + +# +# Library modules +# +MODULES += modules/systemlib +MODULES += modules/systemlib/mixer +MODULES += modules/uORB +MODULES += lib/mathlib/math/filter + +# Note: auth disabled to keep us under 1MB flash because of STM32 bug +#ifneq ($(wildcard $(PX4_ROOT)/src/systemcmds/auth),) +#MODULES += systemcmds/auth +#endif +#ifneq ($(wildcard $(PX4_ROOT)/src/modules/libtomfastmath),) +#MODULES += modules/libtomfastmath +#MODULES += modules/libtomcrypt +#endif + +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 ... 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 )