summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2014-01-06 12:09:13 -0600
committerGregory Nutt <gnutt@nuttx.org>2014-01-06 12:09:13 -0600
commitfbae240e88d009856f0f044a2276a92ac3c79596 (patch)
treebbbbd12fbe2aaccaf35c03e28ed46ecd8beb68be
parentb84bf298a88a0e94d3ae0df9f2f12092551c68c7 (diff)
downloadpx4-nuttx-fbae240e88d009856f0f044a2276a92ac3c79596.tar.gz
px4-nuttx-fbae240e88d009856f0f044a2276a92ac3c79596.tar.bz2
px4-nuttx-fbae240e88d009856f0f044a2276a92ac3c79596.zip
mkconfig: Cast RAM size to unsigned to avoid complains about integer overflow in calculatino of CONFIG_RAM_END
-rw-r--r--nuttx/ChangeLog5
-rw-r--r--nuttx/tools/mkconfig.c2
2 files changed, 5 insertions, 2 deletions
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog
index fe563fc57..7ebfac314 100644
--- a/nuttx/ChangeLog
+++ b/nuttx/ChangeLog
@@ -6370,4 +6370,7 @@
Viewtool SSD1289-based LCD (untested on initial checkin) (2013-1-5).
* arch/arm/include/syscall.h and armv7-a/syscall.h: Add the syscall.h
header file needed for the Cortex-A architecture (2014-1-5).
-
+ * arch/arm/src/a1x/a1x_serial.c: Remove bad flow control logic. Add
+ missing interrupt handling logic for UART4-7 (2014-1-6).
+ * nuttx/tools/mkconfig.c: Cast size to unsigned in calculation of
+ CONFIG_RAM_END to avoid complains about integer overflow (2013-1-6).
diff --git a/nuttx/tools/mkconfig.c b/nuttx/tools/mkconfig.c
index 18d91e7c7..431a5cdb5 100644
--- a/nuttx/tools/mkconfig.c
+++ b/nuttx/tools/mkconfig.c
@@ -182,7 +182,7 @@ int main(int argc, char **argv, char **envp)
printf(" * of RAM plus the RAM size.\n");
printf(" */\n\n");
printf("#ifndef CONFIG_RAM_END\n");
- printf("# define CONFIG_RAM_END (CONFIG_RAM_START+CONFIG_RAM_SIZE)\n");
+ printf("# define CONFIG_RAM_END (CONFIG_RAM_START+(unsigned)CONFIG_RAM_SIZE)\n");
printf("#endif\n\n");
printf("#ifndef CONFIG_RAM_VEND\n");
printf("# define CONFIG_RAM_VEND (CONFIG_RAM_VSTART+CONFIG_RAM_SIZE)\n");