From ce2fa29fe3f0abeb01482e9932078f3cb25378a6 Mon Sep 17 00:00:00 2001
From: px4dev <px4@purgatory.org>
Date: Sat, 3 Aug 2013 10:06:34 -0700
Subject: Add a missing module -> module makefile dependency

---
 makefiles/firmware.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'makefiles/firmware.mk')

diff --git a/makefiles/firmware.mk b/makefiles/firmware.mk
index f1c1b496a..3ad13088b 100644
--- a/makefiles/firmware.mk
+++ b/makefiles/firmware.mk
@@ -385,7 +385,7 @@ define BUILTIN_DEF
 endef
 
 # Don't generate until modules have updated their command files
-$(BUILTIN_CSRC):	$(GLOBAL_DEPS) $(MODULE_OBJS) $(BUILTIN_COMMAND_FILES)
+$(BUILTIN_CSRC):	$(GLOBAL_DEPS) $(MODULE_OBJS) $(MODULE_MKFILES) $(BUILTIN_COMMAND_FILES)
 	@$(ECHO) "CMDS:    $@"
 	$(Q) $(ECHO) '/* builtin command list - automatically generated, do not edit */' > $@
 	$(Q) $(ECHO) '#include <nuttx/config.h>' >> $@
-- 
cgit v1.2.3


From 5e2d67617369474406d86d4eae5ba9a24d5cbb9f Mon Sep 17 00:00:00 2001
From: px4dev <px4@purgatory.org>
Date: Mon, 12 Aug 2013 21:57:11 -0700
Subject: Remove our depdenency on CONFIG_ARCH_BOARD_* coming from
 <nuttx/config.h>

---
 makefiles/board_px4fmu-v1.mk | 1 +
 makefiles/board_px4io-v1.mk  | 1 +
 makefiles/firmware.mk        | 4 ++++
 3 files changed, 6 insertions(+)

(limited to 'makefiles/firmware.mk')

diff --git a/makefiles/board_px4fmu-v1.mk b/makefiles/board_px4fmu-v1.mk
index 837069644..4d692e31a 100644
--- a/makefiles/board_px4fmu-v1.mk
+++ b/makefiles/board_px4fmu-v1.mk
@@ -6,5 +6,6 @@
 # Configure the toolchain
 #
 CONFIG_ARCH			 = CORTEXM4F
+CONFIG_BOARD			 = PX4FMU_V1
 
 include $(PX4_MK_DIR)/toolchain_gnu-arm-eabi.mk
diff --git a/makefiles/board_px4io-v1.mk b/makefiles/board_px4io-v1.mk
index b0eb2dae7..1872a4124 100644
--- a/makefiles/board_px4io-v1.mk
+++ b/makefiles/board_px4io-v1.mk
@@ -6,5 +6,6 @@
 # Configure the toolchain
 #
 CONFIG_ARCH			 = CORTEXM3
+CONFIG_BOARD			 = PX4IO_V1
 
 include $(PX4_MK_DIR)/toolchain_gnu-arm-eabi.mk
diff --git a/makefiles/firmware.mk b/makefiles/firmware.mk
index 3ad13088b..0d742c37d 100644
--- a/makefiles/firmware.mk
+++ b/makefiles/firmware.mk
@@ -154,6 +154,10 @@ $(error Config $(CONFIG) references board $(BOARD), but no board definition file
 endif
 export BOARD
 include $(BOARD_FILE)
+ifeq ($(CONFIG_BOARD),)
+$(error Board config for $(BOARD) does not define CONFIG_BOARD)
+endif
+EXTRADEFINES		+= -DCONFIG_ARCH_BOARD_$(CONFIG_BOARD)
 $(info %  BOARD               = $(BOARD))
 
 #
-- 
cgit v1.2.3


From 56d355414cbfef92b39af6830932e7f1487b03b9 Mon Sep 17 00:00:00 2001
From: px4dev <px4@purgatory.org>
Date: Tue, 13 Aug 2013 00:34:11 -0700
Subject: Fix handling of board config files. Treat CONFIG_BOARD like
 CONFIG_ARCH in the toolchain configuration.

---
 makefiles/firmware.mk               | 5 +----
 makefiles/module.mk                 | 3 ++-
 makefiles/toolchain_gnu-arm-eabi.mk | 7 +++++++
 3 files changed, 10 insertions(+), 5 deletions(-)

(limited to 'makefiles/firmware.mk')

diff --git a/makefiles/firmware.mk b/makefiles/firmware.mk
index 0d742c37d..ecff77db9 100644
--- a/makefiles/firmware.mk
+++ b/makefiles/firmware.mk
@@ -153,11 +153,8 @@ ifeq ($(BOARD_FILE),)
 $(error Config $(CONFIG) references board $(BOARD), but no board definition file found)
 endif
 export BOARD
+export BOARD_FILE
 include $(BOARD_FILE)
-ifeq ($(CONFIG_BOARD),)
-$(error Board config for $(BOARD) does not define CONFIG_BOARD)
-endif
-EXTRADEFINES		+= -DCONFIG_ARCH_BOARD_$(CONFIG_BOARD)
 $(info %  BOARD               = $(BOARD))
 
 #
diff --git a/makefiles/module.mk b/makefiles/module.mk
index 9e4cbafc9..9c1a828cc 100644
--- a/makefiles/module.mk
+++ b/makefiles/module.mk
@@ -98,6 +98,7 @@
 #
 # CONFIG
 # BOARD
+# BOARD_FILE
 # MODULE_WORK_DIR
 # MODULE_OBJ
 # MODULE_MK
@@ -117,7 +118,7 @@ $(info %% MODULE_MK           = $(MODULE_MK))
 #
 # Get the board/toolchain config
 #
-include $(PX4_MK_DIR)/board_$(BOARD).mk
+include $(BOARD_FILE)
 
 #
 # Get the module's config
diff --git a/makefiles/toolchain_gnu-arm-eabi.mk b/makefiles/toolchain_gnu-arm-eabi.mk
index 3f4d3371a..9fd2dd516 100644
--- a/makefiles/toolchain_gnu-arm-eabi.mk
+++ b/makefiles/toolchain_gnu-arm-eabi.mk
@@ -85,6 +85,13 @@ ifeq ($(ARCHCPUFLAGS),)
 $(error Must set CONFIG_ARCH to one of CORTEXM4F, CORTEXM4 or CORTEXM3)
 endif
 
+# Set the board flags
+#
+ifeq ($(CONFIG_BOARD),)
+$(error Board config does not define CONFIG_BOARD)
+endif
+ARCHDEFINES		+= -DCONFIG_ARCH_BOARD_$(CONFIG_BOARD)
+
 # optimisation flags
 #
 ARCHOPTIMIZATION	 = $(MAXOPTIMIZATION) \
-- 
cgit v1.2.3