diff options
| author | Matthew McClintock <msm@freescale.com> | 2006-10-11 15:13:01 -0500 |
|---|---|---|
| committer | Matthew McClintock <msm@freescale.com> | 2006-10-11 15:13:01 -0500 |
| commit | 7376eb87aaa601f728f9b8e5e9cd2711a67f529e (patch) | |
| tree | e7fd7c42b85dccbeb3ab29710d165ef37ea0ac5d /common | |
| parent | 88c8f4921fc47fb0eb2384b16586f1bd7f275be7 (diff) | |
| download | u-boot-imx-7376eb87aaa601f728f9b8e5e9cd2711a67f529e.zip u-boot-imx-7376eb87aaa601f728f9b8e5e9cd2711a67f529e.tar.gz u-boot-imx-7376eb87aaa601f728f9b8e5e9cd2711a67f529e.tar.bz2 | |
* Fix a bunch of compiler warnings for gcc 4.0
Signed-off-by: Matthew McClintock <msm@freescale.com>
Diffstat (limited to 'common')
| -rw-r--r-- | common/cmd_bootm.c | 2 | ||||
| -rw-r--r-- | common/ft_build.c | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index 04bce76..b785b9e 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -623,7 +623,7 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag, /* Look for a '-' which indicates to ignore the ramdisk argument */ if (argc >= 3 && strcmp(argv[2], "-") == 0) { debug ("Skipping initrd\n"); - data = 0; + len = data = 0; } else #endif diff --git a/common/ft_build.c b/common/ft_build.c index b5937e3..c6a018d 100644 --- a/common/ft_build.c +++ b/common/ft_build.c @@ -87,9 +87,9 @@ static int lookup_string(struct ft_cxt *cxt, const char *name) p = cxt->p; while (p < cxt->p_end) { - if (strcmp(p, name) == 0) + if (strcmp((char *)p, name) == 0) return p - cxt->p; - p += strlen(p) + 1; + p += strlen((char *)p) + 1; } return -1; @@ -143,9 +143,9 @@ void ft_init_cxt(struct ft_cxt *cxt, void *blob) cxt->p_rsvmap += SIZE_OF_RSVMAP_ENTRY; } - cxt->p_start = (char*)bph + bph->off_dt_struct; - cxt->p_end = (char *)bph + bph->totalsize; - cxt->p = (char *)bph + bph->off_dt_strings; + cxt->p_start = (u8 *)bph + bph->off_dt_struct; + cxt->p_end = (u8 *)bph + bph->totalsize; + cxt->p = (u8 *)bph + bph->off_dt_strings; } /* add a reserver physical area to the rsvmap */ |