From b74d4e2ba76d1fa3d6d099b63192b180b1af0a39 Mon Sep 17 00:00:00 2001
From: Lorenz Meier <lm@inf.ethz.ch>
Date: Mon, 7 Jul 2014 16:59:44 +0200
Subject: [PATCH 1/2] Added NuttX submodule

---
 .gitignore  | 1 -
 .gitmodules | 3 +++
 NuttX       | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)
 create mode 160000 NuttX

diff --git a/.gitignore b/.gitignore
index afd63e06a0..8b09e4783f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,7 +29,6 @@ mavlink/include/mavlink/v0.9/
 /nuttx-configs/px4io-v1/src/.depend
 /nuttx-configs/px4io-v1/src/Make.dep
 /nuttx-configs/px4io-v1/src/libboard.a
-/NuttX
 /Documentation/doxy.log
 /Documentation/html/
 /Documentation/doxygen*objdb*tmp
diff --git a/.gitmodules b/.gitmodules
index c5116c1cb8..fe2d8713a7 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "mavlink/include/mavlink/v1.0"]
 	path = mavlink/include/mavlink/v1.0
 	url = https://github.com/mavlink/c_library.git
+[submodule "NuttX"]
+	path = NuttX
+	url = git://github.com/PX4/NuttX.git
diff --git a/NuttX b/NuttX
new file mode 160000
index 0000000000..2a94cc8e5b
--- /dev/null
+++ b/NuttX
@@ -0,0 +1 @@
+Subproject commit 2a94cc8e5babb7d5661aedc09201239d39644332

From 6c5c6ba9ee6cfff9ea748f812902922a5c7addba Mon Sep 17 00:00:00 2001
From: Lorenz Meier <lm@inf.ethz.ch>
Date: Mon, 7 Jul 2014 17:03:07 +0200
Subject: [PATCH 2/2] Add proper NuttX submodule checks

---
 Makefile                  | 10 ++++++----
 Tools/check_submodules.sh |  8 ++++++++
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 0a85622512..7ea74eaae2 100644
--- a/Makefile
+++ b/Makefile
@@ -104,7 +104,7 @@ DESIRED_FIRMWARES 	 = $(foreach config,$(CONFIGS),$(IMAGE_DIR)$(config).px4)
 STAGED_FIRMWARES	 = $(foreach config,$(KNOWN_CONFIGS),$(IMAGE_DIR)$(config).px4)
 FIRMWARES		 = $(foreach config,$(KNOWN_CONFIGS),$(BUILD_DIR)$(config).build/firmware.px4)
 
-all:			$(DESIRED_FIRMWARES)
+all:			checksubmodules $(DESIRED_FIRMWARES)
 
 #
 # Copy FIRMWARES into the image directory.
@@ -210,9 +210,11 @@ menuconfig:
 endif
 
 $(NUTTX_SRC):
-	@$(ECHO) ""
-	@$(ECHO) "NuttX sources missing - clone https://github.com/PX4/NuttX.git and try again."
-	@$(ECHO) ""
+	$(Q) if [ -d $(NUTTX_SRC) ]; then ./Tools/check_submodules.sh; else echo ""; echo ""; echo "NuttX submodule missing, doing auto checkout"; git submodule init; git submodule update; fi
+
+.PHONY: checksubmodules
+checksubmodules:
+	$(Q) if [ -d $(MAVLINK_SRC) ]; then ./Tools/check_submodules.sh; else echo ""; echo ""; echo "MAVLink submodule missing, doing auto checkout"; git submodule init; git submodule update; fi
 
 #
 # Testing targets
diff --git a/Tools/check_submodules.sh b/Tools/check_submodules.sh
index 52ea7a1466..c431e82252 100755
--- a/Tools/check_submodules.sh
+++ b/Tools/check_submodules.sh
@@ -7,4 +7,12 @@ else
 	exit 1
 fi
 
+STATUSRETVAL=$(git status --porcelain | grep -i "M NuttX")
+if [ "$STATUSRETVAL" == "" ]; then
+	echo "checked NuttX submodule, correct version found"
+else
+	echo "NuttX sub repo not at correct version. Try 'git submodule update'"
+	exit 1
+fi
+
 exit 0