Commit 77ddac94 authored by Wolfgang Denk's avatar Wolfgang Denk
Browse files

Cleanup for GCC-4.x

parent 17a8b276
......@@ -2,6 +2,8 @@
Changes for U-Boot 1.1.4:
======================================================================
* Cleanup for GCC-4.x
* Add documentation for Open Firmware Flat Tree and usage.
Patch by Pantelis Antoniou, 13 Oct 2005
......
......@@ -169,7 +169,7 @@ int board_early_init_f (void)
int checkboard (void)
{
unsigned char *s = getenv ("serial#");
char *s = getenv ("serial#");
if (!s || strncmp (s, "ELPT860", 7))
printf ("### No HW ID - assuming ELPT860\n");
......@@ -253,7 +253,7 @@ long int initdram (int board_type)
* try 8 column mode
*/
size8 = dram_size (CFG_MAMR_8COL,
(ulong *) SDRAM_BASE1_PRELIM, SDRAM_MAX_SIZE);
SDRAM_BASE1_PRELIM, SDRAM_MAX_SIZE);
udelay (1000);
......@@ -261,7 +261,7 @@ long int initdram (int board_type)
* try 9 column mode
*/
size9 = dram_size (CFG_MAMR_9COL,
(ulong *) SDRAM_BASE1_PRELIM, SDRAM_MAX_SIZE);
SDRAM_BASE1_PRELIM, SDRAM_MAX_SIZE);
if (size8 < size9) { /* leave configuration at 9 columns */
size_b0 = size9;
......
......@@ -526,7 +526,7 @@ flash_get_size (int portwidth, vu_long * addr, flash_info_t * info)
int flash_erase (flash_info_t * info, int s_first, int s_last)
{
volatile unsigned char *addr = (char *) (info->start[0]);
volatile unsigned char *addr = (uchar *) (info->start[0]);
int flag, prot, sect, l_sect;
ulong start, now, last;
......@@ -696,7 +696,7 @@ int flash_erase (flash_info_t * info, int s_first, int s_last)
for (sect = s_first; sect <= s_last; sect++) {
int sector_size = info->size / info->sector_count;
addr = (char *) (info->start[sect]);
addr = (uchar *) (info->start[sect]);
memset ((void *) addr, 0, sector_size);
}
return 0;
......@@ -752,7 +752,7 @@ int flash_erase (flash_info_t * info, int s_first, int s_last)
/* Start erase on unprotected sectors */
for (sect = s_first; sect <= s_last; sect++) {
if (info->protect[sect] == 0) { /* not protected */
addr = (char *) (info->start[sect]);
addr = (uchar *) (info->start[sect]);
flash_cmd (info->portwidth, addr, 0, 0x30);
l_sect = sect;
}
......@@ -893,7 +893,7 @@ int write_buff (flash_info_t * info, uchar * src, ulong addr, ulong cnt)
/* broken for 2x16: TODO */
static int write_word (flash_info_t * info, ulong dest, ulong data)
{
volatile unsigned char *addr = (char *) (info->start[0]);
volatile unsigned char *addr = (uchar *) (info->start[0]);
ulong start;
int flag, i;
ulong mask;
......@@ -926,7 +926,7 @@ static int write_word (flash_info_t * info, ulong dest, ulong data)
CHIP_CMD_RST);
/* 1st cycle of word/byte program */
/* write 0x40 to the location to program */
flash_cmd (info->portwidth, (char *) dest, 0,
flash_cmd (info->portwidth, (uchar *) dest, 0,
CHIP_CMD_PROG);
/* 2nd cycle of word/byte program */
/* write the data to the destination address */
......
......@@ -168,7 +168,7 @@ static uchar i2c_select_device (uchar dev_addr, uchar read, int ten_bit)
static uchar i2c_get_data (uchar * return_data, int len)
{
unsigned int data, status;
unsigned int data, status = 0;
int count = 0;
DP (puts ("i2c_get_data\n"));
......
......@@ -610,7 +610,7 @@ unsigned long long pattern[] = {
int mem_test_data (void)
{
unsigned long long *pmem = (unsigned long long *) CFG_MEMTEST_START;
unsigned long long temp64;
unsigned long long temp64 = 0;
int num_patterns = sizeof (pattern) / sizeof (pattern[0]);
int i;
unsigned int hi, lo;
......@@ -717,7 +717,7 @@ int mem_march (volatile unsigned long long *base,
unsigned long long wmask, short read, short write)
{
unsigned int i;
unsigned long long temp;
unsigned long long temp = 0;
unsigned int hitemp, lotemp, himask, lomask;
for (i = 0; i < size; i++) {
......
......@@ -267,8 +267,9 @@ void mv6436x_eth_initialize (bd_t * bis)
dev->send = (void *) db64360_eth_transmit;
dev->recv = (void *) db64360_eth_poll;
dev->priv = (void *) ethernet_private =
calloc (sizeof (*ethernet_private), 1);
ethernet_private = calloc (sizeof (*ethernet_private), 1);
dev->priv = (void *) ethernet_private;
if (!ethernet_private) {
printf ("%s: %s allocation failure, %s\n",
__FUNCTION__, dev->name,
......@@ -281,8 +282,8 @@ void mv6436x_eth_initialize (bd_t * bis)
memcpy (ethernet_private->port_mac_addr, dev->enetaddr, 6);
/* set pointer to memory for stats data structure etc... */
ethernet_private->port_private = (void *) port_private =
calloc (sizeof (*ethernet_private), 1);
port_private = calloc (sizeof (*ethernet_private), 1);
ethernet_private->port_private = (void *)port_private;
if (!port_private) {
printf ("%s: %s allocation failure, %s\n",
__FUNCTION__, dev->name,
......
......@@ -610,7 +610,7 @@ unsigned long long pattern[] = {
int mem_test_data (void)
{
unsigned long long *pmem = (unsigned long long *) CFG_MEMTEST_START;
unsigned long long temp64;
unsigned long long temp64 = 0;
int num_patterns = sizeof (pattern) / sizeof (pattern[0]);
int i;
unsigned int hi, lo;
......@@ -717,7 +717,7 @@ int mem_march (volatile unsigned long long *base,
unsigned long long wmask, short read, short write)
{
unsigned int i;
unsigned long long temp;
unsigned long long temp = 0;
unsigned int hitemp, lotemp, himask, lomask;
for (i = 0; i < size; i++) {
......
......@@ -267,8 +267,8 @@ void mv6446x_eth_initialize (bd_t * bis)
dev->send = (void *) db64460_eth_transmit;
dev->recv = (void *) db64460_eth_poll;
dev->priv = (void *) ethernet_private =
calloc (sizeof (*ethernet_private), 1);
ethernet_private = calloc (sizeof (*ethernet_private), 1);
dev->priv = (void *)ethernet_private;
if (!ethernet_private) {
printf ("%s: %s allocation failure, %s\n",
__FUNCTION__, dev->name,
......@@ -281,8 +281,8 @@ void mv6446x_eth_initialize (bd_t * bis)
memcpy (ethernet_private->port_mac_addr, dev->enetaddr, 6);
/* set pointer to memory for stats data structure etc... */
ethernet_private->port_private = (void *) port_private =
calloc (sizeof (*ethernet_private), 1);
port_private = calloc (sizeof (*ethernet_private), 1);
ethernet_private->port_private = (void *)port_private;
if (!port_private) {
printf ("%s: %s allocation failure, %s\n",
__FUNCTION__, dev->name,
......
......@@ -114,8 +114,8 @@ void board_get_enetaddr (uchar * enet)
i2c_init (CFG_I2C_SPEED, CFG_I2C_SLAVE);
/* Read 256 bytes in EEPROM */
i2c_read (0x54, 0, 1, buff, 128);
i2c_read (0x54, 128, 1, buff + 128, 128);
i2c_read (0x54, 0, 1, (uchar *)buff, 128);
i2c_read (0x54, 128, 1, (uchar *)buff + 128, 128);
/* Retrieve MAC address in buffer (key EA) */
for (cp = buff;;) {
......@@ -123,7 +123,7 @@ void board_get_enetaddr (uchar * enet)
cp += 3;
/* Read MAC address */
for (i = 0; i < 6; i++, cp += 2) {
enet[i] = aschex_to_byte (cp);
enet[i] = aschex_to_byte ((unsigned char *)cp);
}
}
/* Scan to the end of the record */
......@@ -200,7 +200,7 @@ long int initdram (int board_type)
* try 10 column mode
*/
size10 = dram_size (CFG_MAMR_10COL, (ulong *) SDRAM_BASE_PRELIM,
size10 = dram_size (CFG_MAMR_10COL, SDRAM_BASE_PRELIM,
SDRAM_MAX_SIZE);
return (size10);
......
......@@ -137,7 +137,7 @@ long int initdram (int board_type)
* try 10 column mode
*/
size10 = dram_size (CFG_MAMR_10COL, (ulong *) SDRAM_BASE_PRELIM,
size10 = dram_size (CFG_MAMR_10COL, SDRAM_BASE_PRELIM,
SDRAM_MAX_SIZE);
return (size10);
......
......@@ -142,7 +142,7 @@ long int initdram (int board_type)
* try 9 column mode
*/
size9 = dram_size (CFG_MAMR_9COL, (ulong *)SDRAM_BASE_PRELIM, SDRAM_MAX_SIZE);
size9 = dram_size (CFG_MAMR_9COL, SDRAM_BASE_PRELIM, SDRAM_MAX_SIZE);
/*
* Final mapping:
......
......@@ -93,7 +93,7 @@ const uint sdram_table[] =
int checkboard (void)
{
unsigned char *s = getenv ("serial#");
char *s = getenv ("serial#");
puts ("Board: RRvision ");
......@@ -157,7 +157,7 @@ long int initdram (int board_type)
* try 8 column mode
*/
size8 = dram_size (CFG_MAMR_8COL,
(ulong *)SDRAM_BASE2_PRELIM,
SDRAM_BASE2_PRELIM,
SDRAM_MAX_SIZE);
udelay (1000);
......@@ -166,7 +166,7 @@ long int initdram (int board_type)
* try 9 column mode
*/
size9 = dram_size (CFG_MAMR_9COL,
(ulong *) SDRAM_BASE2_PRELIM,
SDRAM_BASE2_PRELIM,
SDRAM_MAX_SIZE);
if (size8 < size9) { /* leave configuration at 9 columns */
......
......@@ -42,7 +42,7 @@ int board_early_init_f(void)
*/
int checkboard(void)
{
unsigned char *s = getenv("serial#");
char *s = getenv("serial#");
puts("Board: Bubinga - AMCC PPC405EP Evaluation Board");
......
......@@ -91,7 +91,7 @@ int board_early_init_f(void)
int checkboard(void)
{
sys_info_t sysinfo;
unsigned char *s = getenv("serial#");
char *s = getenv("serial#");
get_sys_info(&sysinfo);
......
......@@ -187,7 +187,7 @@ int board_early_init_f (void)
int checkboard (void)
{
sys_info_t sysinfo;
unsigned char *s = getenv ("serial#");
char *s = getenv ("serial#");
get_sys_info (&sysinfo);
......
......@@ -67,7 +67,7 @@ int board_early_init_f(void)
*/
int checkboard(void)
{
unsigned char *s = getenv("serial#");
char *s = getenv("serial#");
uint pvr = get_pvr();
if (pvr == PVR_405GPR_RB) {
......
......@@ -181,7 +181,7 @@ void flash_print_info (flash_info_t *info)
int i;
uchar *boottype;
uchar *bootletter;
uchar *fmt;
char *fmt;
uchar botbootletter[] = "B";
uchar topbootletter[] = "T";
uchar botboottype[] = "bottom boot sector";
......
......@@ -174,7 +174,7 @@ unsigned update_flash (unsigned char *buf)
switch ((*buf) & 0x3) {
case TRY_WORKING:
printf ("found 3 and converted it to 2\n");
write_flash (buf, (*buf) & 0xFE);
write_flash ((char *)buf, (*buf) & 0xFE);
*((unsigned char *)0xFF800000) = 0xF0;
udelay (100);
printf ("buf [%#010x] %#010x\n", buf, (*buf));
......
......@@ -91,7 +91,7 @@ const uint sdram_table[] =
int checkboard (void)
{
unsigned char *s = getenv ("serial#");
unsigned char *s = (unsigned char *)getenv ("serial#");
puts ("Board: TTTech C2MON ");
......@@ -155,7 +155,7 @@ long int initdram (int board_type)
* try 8 column mode
*/
size8 = dram_size (CFG_MAMR_8COL,
(ulong *)SDRAM_BASE2_PRELIM,
SDRAM_BASE2_PRELIM,
SDRAM_MAX_SIZE);
udelay (1000);
......@@ -164,7 +164,7 @@ long int initdram (int board_type)
* try 9 column mode
*/
size9 = dram_size (CFG_MAMR_9COL,
(ulong *) SDRAM_BASE2_PRELIM,
SDRAM_BASE2_PRELIM,
SDRAM_MAX_SIZE);
if (size8 < size9) { /* leave configuration at 9 columns */
......
......@@ -133,7 +133,7 @@ int checkboard (void)
/* ------------------------------------------------------------------------- */
int misc_init_r (void)
{
unsigned char *s, *e;
char *s, *e;
image_header_t *hdr;
time_t timestamp;
struct rtc_time tm;
......@@ -146,7 +146,7 @@ int misc_init_r (void)
#define FACTORY_SETTINGS 0xFFFC0000
if ((s = getenv ("ethaddr")) == NULL) {
e = (unsigned char *) (FACTORY_SETTINGS);
e = (char *) (FACTORY_SETTINGS);
if (*(e + 0) != '0'
|| *(e + 1) != '0'
|| *(e + 2) != ':'
......@@ -314,7 +314,7 @@ static u8 *dhcp_env_update (u8 thing, u8 * pop)
{
setenv (Things[thing].envname, Things[thing].dhcpvalue);
}
return (Things[thing].dhcpvalue);
return ((u8 *)(Things[thing].dhcpvalue));
}
/* ------------------------------------------------------------------------- */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment