19 files changed, 96 insertions, 24 deletions
diff --git a/apps/interpreters/micropython/Makefile b/apps/interpreters/micropython/Makefile
index e4b1b7f05..fec76d913 100644
--- a/apps/interpreters/micropython/Makefile
+++ b/apps/interpreters/micropython/Makefile
@@ -69,13 +69,13 @@ CROSS_COMPILE ?= $(CROSSDEV)
 
 QSTR_DEFS = qstrdefsport.h
 
-# include py core make definitions
+# Include py core make definitions
 
 -include $(MICROPTHYON_SRCDIR)/py.mk
 
-# c99 is needed for micropython
+# c99 is needed for Micro Python
 
-CFLAGS+=-std=c99 -Wno-shadow -Wno-strict-prototypes
+CFLAGS += -std=c99 -Wno-shadow -Wno-strict-prototypes
 
 INC =  -I. -I$(WD) -I$(MICROPYTHON_UNPACKDIR) -I$(PY_SRC) -I$(BUILD)
 
diff --git a/misc/Obsoleted/ChangeLog b/misc/Obsoleted/ChangeLog
index 511e2224a..c5ab47bd1 100644
--- a/misc/Obsoleted/ChangeLog
+++ b/misc/Obsoleted/ChangeLog
@@ -49,4 +49,19 @@ ChangeLog
 
   REMOVAL PATCH
     misc/Obsoleted/Patches/Remove-stm32f100rc_generic-2014-11-10.patch
- 
-\ No newline at end of file
+
+2015-01-14: Removed support for the px4fmu-v2_upstream board configuration
+
+  REASON
+    This is not the official configuration for the PX4 board and has led
+    to confusion by NuttX users.  The board configuration also requires
+    some ongoing maintenance and customization to support ongoing PX4
+    testing and evaluation.  It is best retained the PX4 repositories
+    where it can be properly maintained and not in the upstream NuttX
+    repository.
+
+  NEW HOME
+    misc/Obsoleted/configs/px4fmu-v2_upstream
+
+  REMOVAL PATCH
+    misc/Obsoleted/Patches/Remove-stm32f100rc_generic-2014-11-10.patch
diff --git a/misc/Obsoleted/Patches/Remove-px4fmu-v2_upstream-2015-01-14.patch b/misc/Obsoleted/Patches/Remove-px4fmu-v2_upstream-2015-01-14.patch
new file mode 100644
index 000000000..d0da4cb6e
--- /dev/null
+++ b/misc/Obsoleted/Patches/Remove-px4fmu-v2_upstream-2015-01-14.patch
@@ -0,0 +1,77 @@
+diff --git a/apps/interpreters/micropython/Makefile b/apps/interpreters/micropython/Makefile
+index e4b1b7f..fec76d9 100644
+--- a/apps/interpreters/micropython/Makefile
++++ b/apps/interpreters/micropython/Makefile
+@@ -69,13 +69,13 @@ CROSS_COMPILE ?= $(CROSSDEV)
+ 
+ QSTR_DEFS = qstrdefsport.h
+ 
+-# include py core make definitions
++# Include py core make definitions
+ 
+ -include $(MICROPTHYON_SRCDIR)/py.mk
+ 
+-# c99 is needed for micropython
++# c99 is needed for Micro Python
+ 
+-CFLAGS+=-std=c99 -Wno-shadow -Wno-strict-prototypes
++CFLAGS += -std=c99 -Wno-shadow -Wno-strict-prototypes
+ 
+ INC =  -I. -I$(WD) -I$(MICROPYTHON_UNPACKDIR) -I$(PY_SRC) -I$(BUILD)
+ 
+diff --git a/nuttx/configs/Kconfig b/nuttx/configs/Kconfig
+index 33ad22b..de74568 100644
+--- a/nuttx/configs/Kconfig
++++ b/nuttx/configs/Kconfig
+@@ -559,16 +559,6 @@ config ARCH_BOARD_PIRELLI_DPL10
+ 		This directory contains the board support for Pirelli dpl10 phones.  The
+ 		additions were made by Craig Comstock (with help form Alan Carvalho de Assis).
+ 
+-config ARCH_BOARD_PX4FMU_V2
+-	bool "PX4FMU v2"
+-	depends on ARCH_CHIP_STM32F427V
+-	---help---
+-		This is a minimal configuration that supports low-level test of the
+-		PX4FMU v2 in the NuttX source tree.  If you are using PX4, you
+-		probably don't want this configuration.  You probably want the
+-		latest supported configuration available from the PX4 GIT
+-		repositories.
+-
+ config ARCH_BOARD_NUCLEO_F401RE
+ 	bool "STM32F401 Nucleo F401RE"
+ 	depends on ARCH_CHIP_STM32F401RE
+@@ -1095,7 +1085,6 @@ config ARCH_BOARD
+ 	default "pic32-starterkit"         if ARCH_BOARD_PIC32_STARTERKIT
+ 	default "pic32mx7mmb"              if ARCH_BOARD_PIC32MX7MMB
+ 	default "pirelli_dpl10"            if ARCH_BOARD_PIRELLI_DPL10
+-	default "px4fmu-v2_upstream"       if ARCH_BOARD_PX4FMU_V2
+ 	default "nucleo-f4x1re"            if ARCH_BOARD_NUCLEO_F401RE || ARCH_BOARD_NUCLEO_F411RE
+ 	default "qemu-i486"                if ARCH_BOARD_QEMU_I486
+ 	default "rgmp"                     if ARCH_BOARD_RGMP
+@@ -1359,9 +1348,6 @@ endif
+ if ARCH_BOARD_NUCLEO_F401RE || ARCH_BOARD_NUCLEO_F411RE
+ source "configs/nucleo-f4x1re/Kconfig"
+ endif
+-if ARCH_BOARD_PX4FMU_V2
+-source "configs/px4fmu-v2_upstream/Kconfig"
+-endif
+ if ARCH_BOARD_QEMU_I486
+ source "configs/qemu-i486/Kconfig"
+ endif
+diff --git a/nuttx/configs/README.txt b/nuttx/configs/README.txt
+index 9d09fe7..2092bab 100644
+--- a/nuttx/configs/README.txt
++++ b/nuttx/configs/README.txt
+@@ -454,12 +454,6 @@ configs/pirelli_dpl10
+   It is a variant of the compal_e88 config with the small changes for the
+   differences in the board.
+ 
+-config/px4fmu-v2_upstream
+-  This is a minimal configuration that supports low-level test of the
+-  PX4FMU v2 in the NuttX source tree.  If you are using PX4, you probably
+-  don't want this configuration.  You probably want the latest supported
+-  configuration available from the PX4 GIT repositories.
+-
+ configs/qemu-i486
+   Port of NuttX to QEMU in i486 mode.  This port will also run on real i486
+   hardwared (Google the Bifferboard).
diff --git a/nuttx/configs/px4fmu-v2_upstream/Kconfig b/misc/Obsoleted/configs/px4fmu-v2_upstream/Kconfig
index ae2bf3130..ae2bf3130 100644
--- a/nuttx/configs/px4fmu-v2_upstream/Kconfig
+++ b/misc/Obsoleted/configs/px4fmu-v2_upstream/Kconfig
diff --git a/nuttx/configs/px4fmu-v2_upstream/include/board.h b/misc/Obsoleted/configs/px4fmu-v2_upstream/include/board.h
index a2748429a..a2748429a 100644
--- a/nuttx/configs/px4fmu-v2_upstream/include/board.h
+++ b/misc/Obsoleted/configs/px4fmu-v2_upstream/include/board.h
diff --git a/nuttx/configs/px4fmu-v2_upstream/nsh/Make.defs b/misc/Obsoleted/configs/px4fmu-v2_upstream/nsh/Make.defs
index 923a19e74..923a19e74 100644
--- a/nuttx/configs/px4fmu-v2_upstream/nsh/Make.defs
+++ b/misc/Obsoleted/configs/px4fmu-v2_upstream/nsh/Make.defs
diff --git a/nuttx/configs/px4fmu-v2_upstream/nsh/defconfig b/misc/Obsoleted/configs/px4fmu-v2_upstream/nsh/defconfig
index a0d62ebda..a0d62ebda 100644
--- a/nuttx/configs/px4fmu-v2_upstream/nsh/defconfig
+++ b/misc/Obsoleted/configs/px4fmu-v2_upstream/nsh/defconfig
diff --git a/nuttx/configs/px4fmu-v2_upstream/nsh/setenv.sh b/misc/Obsoleted/configs/px4fmu-v2_upstream/nsh/setenv.sh
index 01f62bbe1..01f62bbe1 100755
--- a/nuttx/configs/px4fmu-v2_upstream/nsh/setenv.sh
+++ b/misc/Obsoleted/configs/px4fmu-v2_upstream/nsh/setenv.sh
diff --git a/nuttx/configs/px4fmu-v2_upstream/px4fmu-v2_upstream.prototype b/misc/Obsoleted/configs/px4fmu-v2_upstream/px4fmu-v2_upstream.prototype
index 5109b77d1..5109b77d1 100644
--- a/nuttx/configs/px4fmu-v2_upstream/px4fmu-v2_upstream.prototype
+++ b/misc/Obsoleted/configs/px4fmu-v2_upstream/px4fmu-v2_upstream.prototype
diff --git a/nuttx/configs/px4fmu-v2_upstream/scripts/ld.script b/misc/Obsoleted/configs/px4fmu-v2_upstream/scripts/ld.script
index 1017c649a..1017c649a 100644
--- a/nuttx/configs/px4fmu-v2_upstream/scripts/ld.script
+++ b/misc/Obsoleted/configs/px4fmu-v2_upstream/scripts/ld.script
diff --git a/nuttx/configs/px4fmu-v2_upstream/src/Makefile b/misc/Obsoleted/configs/px4fmu-v2_upstream/src/Makefile
index a17688420..a17688420 100644
--- a/nuttx/configs/px4fmu-v2_upstream/src/Makefile
+++ b/misc/Obsoleted/configs/px4fmu-v2_upstream/src/Makefile
diff --git a/nuttx/configs/px4fmu-v2_upstream/src/board_config.h b/misc/Obsoleted/configs/px4fmu-v2_upstream/src/board_config.h
index 246fa7fd4..246fa7fd4 100644
--- a/nuttx/configs/px4fmu-v2_upstream/src/board_config.h
+++ b/misc/Obsoleted/configs/px4fmu-v2_upstream/src/board_config.h
diff --git a/nuttx/configs/px4fmu-v2_upstream/src/px4fmu2_init.c b/misc/Obsoleted/configs/px4fmu-v2_upstream/src/px4fmu2_init.c
index e2813c89f..e2813c89f 100644
--- a/nuttx/configs/px4fmu-v2_upstream/src/px4fmu2_init.c
+++ b/misc/Obsoleted/configs/px4fmu-v2_upstream/src/px4fmu2_init.c
diff --git a/nuttx/configs/px4fmu-v2_upstream/src/px4fmu2_led.c b/misc/Obsoleted/configs/px4fmu-v2_upstream/src/px4fmu2_led.c
index 84f2fa850..84f2fa850 100644
--- a/nuttx/configs/px4fmu-v2_upstream/src/px4fmu2_led.c
+++ b/misc/Obsoleted/configs/px4fmu-v2_upstream/src/px4fmu2_led.c
diff --git a/nuttx/configs/px4fmu-v2_upstream/src/px4fmu_can.c b/misc/Obsoleted/configs/px4fmu-v2_upstream/src/px4fmu_can.c
index 2e3813400..2e3813400 100644
--- a/nuttx/configs/px4fmu-v2_upstream/src/px4fmu_can.c
+++ b/misc/Obsoleted/configs/px4fmu-v2_upstream/src/px4fmu_can.c
diff --git a/nuttx/configs/px4fmu-v2_upstream/src/px4fmu_spi.c b/misc/Obsoleted/configs/px4fmu-v2_upstream/src/px4fmu_spi.c
index 89d936f35..89d936f35 100644
--- a/nuttx/configs/px4fmu-v2_upstream/src/px4fmu_spi.c
+++ b/misc/Obsoleted/configs/px4fmu-v2_upstream/src/px4fmu_spi.c
diff --git a/nuttx/configs/px4fmu-v2_upstream/src/px4fmu_usb.c b/misc/Obsoleted/configs/px4fmu-v2_upstream/src/px4fmu_usb.c
index 42b6acef0..42b6acef0 100644
--- a/nuttx/configs/px4fmu-v2_upstream/src/px4fmu_usb.c
+++ b/misc/Obsoleted/configs/px4fmu-v2_upstream/src/px4fmu_usb.c
diff --git a/nuttx/configs/Kconfig b/nuttx/configs/Kconfig
index 33ad22ba8..de745686d 100644
--- a/nuttx/configs/Kconfig
+++ b/nuttx/configs/Kconfig
@@ -559,16 +559,6 @@ config ARCH_BOARD_PIRELLI_DPL10
 		This directory contains the board support for Pirelli dpl10 phones.  The
 		additions were made by Craig Comstock (with help form Alan Carvalho de Assis).
 
-config ARCH_BOARD_PX4FMU_V2
-	bool "PX4FMU v2"
-	depends on ARCH_CHIP_STM32F427V
-	---help---
-		This is a minimal configuration that supports low-level test of the
-		PX4FMU v2 in the NuttX source tree.  If you are using PX4, you
-		probably don't want this configuration.  You probably want the
-		latest supported configuration available from the PX4 GIT
-		repositories.
-
 config ARCH_BOARD_NUCLEO_F401RE
 	bool "STM32F401 Nucleo F401RE"
 	depends on ARCH_CHIP_STM32F401RE
@@ -1095,7 +1085,6 @@ config ARCH_BOARD
 	default "pic32-starterkit"         if ARCH_BOARD_PIC32_STARTERKIT
 	default "pic32mx7mmb"              if ARCH_BOARD_PIC32MX7MMB
 	default "pirelli_dpl10"            if ARCH_BOARD_PIRELLI_DPL10
-	default "px4fmu-v2_upstream"       if ARCH_BOARD_PX4FMU_V2
 	default "nucleo-f4x1re"            if ARCH_BOARD_NUCLEO_F401RE || ARCH_BOARD_NUCLEO_F411RE
 	default "qemu-i486"                if ARCH_BOARD_QEMU_I486
 	default "rgmp"                     if ARCH_BOARD_RGMP
@@ -1359,9 +1348,6 @@ endif
 if ARCH_BOARD_NUCLEO_F401RE || ARCH_BOARD_NUCLEO_F411RE
 source "configs/nucleo-f4x1re/Kconfig"
 endif
-if ARCH_BOARD_PX4FMU_V2
-source "configs/px4fmu-v2_upstream/Kconfig"
-endif
 if ARCH_BOARD_QEMU_I486
 source "configs/qemu-i486/Kconfig"
 endif
diff --git a/nuttx/configs/README.txt b/nuttx/configs/README.txt
index 9d09fe73f..2092bab59 100644
--- a/nuttx/configs/README.txt
+++ b/nuttx/configs/README.txt
@@ -454,12 +454,6 @@ configs/pirelli_dpl10
   It is a variant of the compal_e88 config with the small changes for the
   differences in the board.
 
-config/px4fmu-v2_upstream
-  This is a minimal configuration that supports low-level test of the
-  PX4FMU v2 in the NuttX source tree.  If you are using PX4, you probably
-  don't want this configuration.  You probably want the latest supported
-  configuration available from the PX4 GIT repositories.
-
 configs/qemu-i486
   Port of NuttX to QEMU in i486 mode.  This port will also run on real i486
   hardwared (Google the Bifferboard).