diff options
| author | Wolfgang Denk <wd@pollux.denx.de> | 2005-10-13 16:45:02 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@pollux.denx.de> | 2005-10-13 16:45:02 +0200 |
| commit | 77ddac9480d63a80b6bb76d7ee4dcc2d1070867e (patch) | |
| tree | e9563b2f28ea59062b90bb5712f141e8e9798aee /cpu/mpc8220 | |
| parent | 17a8b276ba2b3499b75cd60b0b5289dbbea7967b (diff) | |
| download | u-boot-imx-77ddac9480d63a80b6bb76d7ee4dcc2d1070867e.zip u-boot-imx-77ddac9480d63a80b6bb76d7ee4dcc2d1070867e.tar.gz u-boot-imx-77ddac9480d63a80b6bb76d7ee4dcc2d1070867e.tar.bz2 | |
Cleanup for GCC-4.x
Diffstat (limited to 'cpu/mpc8220')
| -rw-r--r-- | cpu/mpc8220/fec.c | 2 | ||||
| -rw-r--r-- | cpu/mpc8220/i2c.c | 14 |
2 files changed, 9 insertions, 7 deletions
diff --git a/cpu/mpc8220/fec.c b/cpu/mpc8220/fec.c index e974ab3..d5cd22e 100644 --- a/cpu/mpc8220/fec.c +++ b/cpu/mpc8220/fec.c @@ -330,7 +330,7 @@ static int mpc8220_fec_init (struct eth_device *dev, bd_t * bis) * Set individual address filter for unicast address * and set physical address registers. */ - mpc8220_fec_set_hwaddr (fec, dev->enetaddr); + mpc8220_fec_set_hwaddr (fec, (char *)(dev->enetaddr)); /* * Set multicast address filter diff --git a/cpu/mpc8220/i2c.c b/cpu/mpc8220/i2c.c index e9d0771..62f7c0f 100644 --- a/cpu/mpc8220/i2c.c +++ b/cpu/mpc8220/i2c.c @@ -73,8 +73,10 @@ static int mpc_get_fdr (int); static int mpc_reg_in (volatile u32 * reg) { - return *reg >> 24; + int ret; + ret = *reg >> 24; __asm__ __volatile__ ("eieio"); + return ret; } static void mpc_reg_out (volatile u32 * reg, int val, int mask) @@ -324,7 +326,7 @@ int i2c_read (uchar chip, uint addr, int alen, uchar * buf, int len) goto Done; } - if (send_bytes (chip, &xaddr[4 - alen], alen)) { + if (send_bytes (chip, (char *)&xaddr[4 - alen], alen)) { printf ("i2c_read: send_bytes failed\n"); goto Done; } @@ -335,7 +337,7 @@ int i2c_read (uchar chip, uint addr, int alen, uchar * buf, int len) goto Done; } - if (receive_bytes (chip, buf, len)) { + if (receive_bytes (chip, (char *)buf, len)) { printf ("i2c_read: receive_bytes failed\n"); goto Done; } @@ -368,12 +370,12 @@ int i2c_write (uchar chip, uint addr, int alen, uchar * buf, int len) goto Done; } - if (send_bytes (chip, &xaddr[4 - alen], alen)) { + if (send_bytes (chip, (char *)&xaddr[4 - alen], alen)) { printf ("i2c_write: send_bytes failed\n"); goto Done; } - if (send_bytes (chip, buf, len)) { + if (send_bytes (chip, (char *)buf, len)) { printf ("i2c_write: send_bytes failed\n"); goto Done; } @@ -386,7 +388,7 @@ int i2c_write (uchar chip, uint addr, int alen, uchar * buf, int len) uchar i2c_reg_read (uchar chip, uchar reg) { - char buf; + uchar buf; i2c_read (chip, reg, 1, &buf, 1); |