From cb21aced5e90dd1e0a0b079e8d93528f543285fb Mon Sep 17 00:00:00 2001
From: David Sidrane <david_s5@nscdg.com>
Date: Mon, 31 Jul 2017 13:22:53 -1000
Subject: [PATCH] PX4 System: Upstream NuttX defconfig changes

   was:CONFIG_STM32_STM32F40XX is:CONFIG_STM32_STM32F4XXX
---
 src/platforms/px4_micro_hal.h        | 2 +-
 src/systemcmds/bl_update/bl_update.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/platforms/px4_micro_hal.h b/src/platforms/px4_micro_hal.h
index cba7220e3b..1a945553d0 100644
--- a/src/platforms/px4_micro_hal.h
+++ b/src/platforms/px4_micro_hal.h
@@ -48,7 +48,7 @@ __BEGIN_DECLS
 #    if defined(CONFIG_ARCH_CHIP_STM32)
 #      include <stm32.h>
 #      define PX4_FLASH_BASE  STM32_FLASH_BASE
-#      if defined(CONFIG_STM32_STM32F40XX)
+#      if defined(CONFIG_STM32_STM32F4XXX)
 #        include <stm32_bbsram.h>
 #        define PX4_BBSRAM_SIZE STM32_BBSRAM_SIZE
 #        define PX4_BBSRAM_GETDESC_IOCTL STM32_BBSRAM_GETDESC_IOCTL
diff --git a/src/systemcmds/bl_update/bl_update.c b/src/systemcmds/bl_update/bl_update.c
index febbf14883..3a87bed9ba 100644
--- a/src/systemcmds/bl_update/bl_update.c
+++ b/src/systemcmds/bl_update/bl_update.c
@@ -59,7 +59,7 @@
 
 __EXPORT int bl_update_main(int argc, char *argv[]);
 
-#if defined (CONFIG_STM32_STM32F40XX)
+#if defined (CONFIG_STM32_STM32F4XXX)
 static int setopt(void);
 
 static void print_usage(const char *reason)
@@ -81,7 +81,7 @@ static void print_usage(const char *reason)
 int
 bl_update_main(int argc, char *argv[])
 {
-#if !defined (CONFIG_STM32_STM32F40XX)
+#if !defined (CONFIG_STM32_STM32F4XXX)
 	PX4_ERR("Not supported on this HW");
 	return 1;
 }
@@ -243,4 +243,4 @@ setopt(void)
 	PX4_ERR("option bits setting failed; readback 0x%04x", *optcr);
 	return 1;
 }
-#endif // CONFIG_STM32_STM32F40XX
+#endif // CONFIG_STM32_STM32F4XXX