Merge remote-tracking branch 'upstream/master' into dev_ros

Conflicts:
	.gitmodules

src/systemcmds/bl_update/bl_update.c

@@ -52,6 +52,8 @@
 #include "systemlib/systemlib.h"
 #include "systemlib/err.h"
 
+#define BL_FILE_SIZE_LIMIT	16384
+
 __EXPORT int bl_update_main(int argc, char *argv[]);
 
 static void setopt(void);
@@ -72,12 +74,12 @@ bl_update_main(int argc, char *argv[])
 
 	struct stat s;
 
-	if (stat(argv[1], &s) < 0)
+	if (!stat(argv[1], &s))
 		err(1, "stat %s", argv[1]);
 
 	/* sanity-check file size */
-	if (s.st_size > 16384)
-		errx(1, "%s: file too large", argv[1]);
+	if (s.st_size > BL_FILE_SIZE_LIMIT)
+		errx(1, "%s: file too large (limit: %u, actual: %d)", argv[1], BL_FILE_SIZE_LIMIT, s.st_size);
 
 	uint8_t *buf = malloc(s.st_size);
 

src/systemcmds/mixer/module.mk

@@ -41,3 +41,6 @@ SRCS		 = mixer.cpp
 MODULE_STACKSIZE = 4096
 
 MAXOPTIMIZATION	 = -Os
+
+EXTRACXXFLAGS = -Wframe-larger-than=2048
+

src/systemcmds/mtd/module.mk

@@ -6,3 +6,6 @@ MODULE_COMMAND	 = mtd
 SRCS		 = mtd.c 24xxxx_mtd.c
 
 MAXOPTIMIZATION	 = -Os
+
+EXTRACFLAGS	= -Wno-error
+

src/systemcmds/param/param.c

@@ -212,7 +212,7 @@ static void
 do_show(const char* search_string)
 {
 	printf(" + = saved, * = unsaved\n");
-	param_foreach(do_show_print, search_string, false);
+	param_foreach(do_show_print, (char *)search_string, false);
 
 	exit(0);
 }

src/systemcmds/tests/module.mk

@@ -34,3 +34,6 @@ SRCS			 = test_adc.c \
 			   test_conv.cpp \
 			   test_mount.c \
 			   test_mtd.c
+
+EXTRACXXFLAGS = -Wframe-larger-than=2500
+