summaryrefslogtreecommitdiff
path: root/lib_arm
diff options
context:
space:
mode:
authorWolfgang Denk <wd@pollux.denx.de>2006-03-11 22:53:33 +0100
committerWolfgang Denk <wd@pollux.denx.de>2006-03-11 22:53:33 +0100
commitd52fb7e3d135704334bd6f97f3444e824665b76f (patch)
treee1e91e323b603533acda1c1de53388c588e3753c /lib_arm
parent4367a01036bdb67e7fc3000cedba7195fbdee304 (diff)
downloadu-boot-imx-d52fb7e3d135704334bd6f97f3444e824665b76f.zip
u-boot-imx-d52fb7e3d135704334bd6f97f3444e824665b76f.tar.gz
u-boot-imx-d52fb7e3d135704334bd6f97f3444e824665b76f.tar.bz2
Some code cleanup for GCC 4.x
Diffstat (limited to 'lib_arm')
-rw-r--r--lib_arm/armlinux.c4
-rw-r--r--lib_arm/board.c8
2 files changed, 7 insertions, 5 deletions
diff --git a/lib_arm/armlinux.c b/lib_arm/armlinux.c
index ca630b3..dba2ff7 100644
--- a/lib_arm/armlinux.c
+++ b/lib_arm/armlinux.c
@@ -124,7 +124,7 @@ void do_bootm_linux (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
checksum = ntohl (hdr->ih_hcrc);
hdr->ih_hcrc = 0;
- if (crc32 (0, (char *) data, len) != checksum) {
+ if (crc32 (0, (unsigned char *) data, len) != checksum) {
printf ("Bad Header Checksum\n");
SHOW_BOOT_PROGRESS (-11);
do_reset (cmdtp, flag, argc, argv);
@@ -148,7 +148,7 @@ void do_bootm_linux (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
ulong csum = 0;
printf (" Verifying Checksum ... ");
- csum = crc32 (0, (char *) data, len);
+ csum = crc32 (0, (unsigned char *) data, len);
if (csum != ntohl (hdr->ih_dcrc)) {
printf ("Bad Data CRC\n");
SHOW_BOOT_PROGRESS (-12);
diff --git a/lib_arm/board.c b/lib_arm/board.c
index c73cf0c..7663908 100644
--- a/lib_arm/board.c
+++ b/lib_arm/board.c
@@ -121,7 +121,7 @@ void *sbrk (ptrdiff_t increment)
static int init_baudrate (void)
{
- uchar tmp[64]; /* long enough for environment variables */
+ char tmp[64]; /* long enough for environment variables */
int i = getenv_r ("baudrate", tmp, sizeof (tmp));
gd->bd->bi_baudrate = gd->baudrate = (i > 0)
? (int) simple_strtoul (tmp, NULL, 10)
@@ -235,9 +235,11 @@ init_fnc_t *init_sequence[] = {
void start_armboot (void)
{
- ulong size;
init_fnc_t **init_fnc_ptr;
char *s;
+#ifndef CFG_NO_FLASH
+ ulong size;
+#endif
#if defined(CONFIG_VFD) || defined(CONFIG_LCD)
unsigned long addr;
#endif
@@ -320,7 +322,7 @@ void start_armboot (void)
int i;
ulong reg;
char *s, *e;
- uchar tmp[64];
+ char tmp[64];
i = getenv_r ("ethaddr", tmp, sizeof (tmp));
s = (i > 0) ? tmp : NULL;