diff options
Diffstat (limited to 'common')
| -rw-r--r-- | common/clock.c | 7 | ||||
| -rw-r--r-- | common/dlmalloc.c | 5 | ||||
| -rw-r--r-- | common/parser.c | 4 |
3 files changed, 7 insertions, 9 deletions
diff --git a/common/clock.c b/common/clock.c index 1383f8be32..636d30ba21 100644 --- a/common/clock.c +++ b/common/clock.c @@ -57,8 +57,6 @@ uint32_t clocksource_hz2mult(uint32_t hz, uint32_t shift_constant) int is_timeout(uint64_t start_ns, uint64_t time_offset_ns) { -// if (ctrlc ()) -// return -1; if (start_ns + time_offset_ns < get_time_ns()) return 1; @@ -66,14 +64,11 @@ int is_timeout(uint64_t start_ns, uint64_t time_offset_ns) return 0; } -int udelay(unsigned long usecs) +void udelay(unsigned long usecs) { uint64_t start = get_time_ns(); while(!is_timeout(start, usecs * 1000)); -// if (ctrlc ()) -// return -1; - return 0; } void mdelay(unsigned long msecs) diff --git a/common/dlmalloc.c b/common/dlmalloc.c index fe3b86da42..a22fee530a 100644 --- a/common/dlmalloc.c +++ b/common/dlmalloc.c @@ -609,11 +609,12 @@ static mbinptr av_[NAV * 2 + 2] = { /* Other static bookkeeping data */ /* variables holding tunable values */ - +#ifndef __U_BOOT__ static unsigned long trim_threshold = DEFAULT_TRIM_THRESHOLD; -static unsigned long top_pad = DEFAULT_TOP_PAD; static unsigned int n_mmaps_max = DEFAULT_MMAP_MAX; static unsigned long mmap_threshold = DEFAULT_MMAP_THRESHOLD; +#endif +static unsigned long top_pad = DEFAULT_TOP_PAD; /* The first value returned from sbrk */ static char* sbrk_base = (char*)(-1); diff --git a/common/parser.c b/common/parser.c index 23f2a377a9..5e6bf3cde2 100644 --- a/common/parser.c +++ b/common/parser.c @@ -1,5 +1,6 @@ #include <common.h> #include <command.h> +#include <environment.h> int parse_line (char *line, char *argv[]) { @@ -114,7 +115,8 @@ static void process_macros (const char *input, char *output) case 2: /* Waiting for ) */ if (c == ')' || c == '}') { int i; - char envname[CONFIG_CBSIZE], *envval; + char envname[CONFIG_CBSIZE]; + const char *envval; int envcnt = input - varname_start - 1; /* Varname # of chars */ /* Get the varname */ |