summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
Diffstat (limited to 'common')
-rw-r--r--common/cmd_sf.c2
-rw-r--r--common/cmd_yaffs2.c2
-rw-r--r--common/dlmalloc.c7
3 files changed, 2 insertions, 9 deletions
diff --git a/common/cmd_sf.c b/common/cmd_sf.c
index 11a491df769..27d6e39a18d 100644
--- a/common/cmd_sf.c
+++ b/common/cmd_sf.c
@@ -53,7 +53,7 @@ static int sf_parse_len_arg(char *arg, ulong *len)
return -1;
if (round_up_len && flash->sector_size > 0)
- *len = ROUND(len_arg - 1, flash->sector_size);
+ *len = ROUND(len_arg, flash->sector_size);
else
*len = len_arg;
diff --git a/common/cmd_yaffs2.c b/common/cmd_yaffs2.c
index 7c01ea2a251..0e22d90e7a0 100644
--- a/common/cmd_yaffs2.c
+++ b/common/cmd_yaffs2.c
@@ -66,7 +66,7 @@ int do_ywr (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
ulong value = simple_strtoul(argv[2], NULL, 16);
ulong numValues = simple_strtoul(argv[3], NULL, 16);
- printf ("Writing value (%x) %x times to %s... ", value, numValues, filename);
+ printf ("Writing value (%lx) %lx times to %s... ", value, numValues, filename);
cmd_yaffs_write_file(filename,value,numValues);
diff --git a/common/dlmalloc.c b/common/dlmalloc.c
index e9bab09b8ea..f2080c64bae 100644
--- a/common/dlmalloc.c
+++ b/common/dlmalloc.c
@@ -286,13 +286,6 @@ extern "C" {
*/
-#ifdef DEBUG
-#include <assert.h>
-#else
-#define assert(x) ((void)0)
-#endif
-
-
/*
INTERNAL_SIZE_T is the word-size used for internal bookkeeping
of chunk sizes. On a 64-bit machine, you can reduce malloc