From d52fb7e3d135704334bd6f97f3444e824665b76f Mon Sep 17 00:00:00 2001 From: Wolfgang Denk Date: Sat, 11 Mar 2006 22:53:33 +0100 Subject: [PATCH] Some code cleanup for GCC 4.x --- CHANGELOG | 2 ++ board/at91rm9200dk/at45.c | 2 +- board/at91rm9200dk/flash.c | 4 +--- board/cmc_pu2/load_sernum_ethaddr.c | 4 ++-- board/delta/nand.c | 6 ++--- board/lart/flash.c | 2 +- board/lpd7a40x/flash.c | 3 +-- board/netstar/crcek | Bin 36168 -> 35971 bytes board/netstar/eeprom | Bin 72374 -> 40842 bytes board/netstar/flash.c | 2 +- board/netstar/nand.c | 2 ++ board/shannon/flash.c | 2 +- common/env_nand.c | 12 +++++----- cpu/arm920t/at91rm9200/i2c.c | 4 ++-- drivers/dataflash.c | 9 ++++---- drivers/lan91c96.c | 16 ++++++------- drivers/lan91c96.h | 2 +- drivers/nand/nand_base.c | 5 ++-- drivers/smc91111.c | 29 +++++++++++++++--------- drivers/smc91111.h | 2 +- include/asm-arm/arch-arm720t/s3c4510b.h | 2 -- lib_arm/armlinux.c | 4 ++-- lib_arm/board.c | 8 ++++--- rtc/rs5c372.c | 4 ++-- 24 files changed, 67 insertions(+), 59 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index df48e47af4..964e2b1f55 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,6 +2,8 @@ Changes since U-Boot 1.1.4: ====================================================================== +* Some code cleanup for GCC 4.x + * Fixes to support environment in NAND flash; enable NAND flash based environment for delta board. diff --git a/board/at91rm9200dk/at45.c b/board/at91rm9200dk/at45.c index 3c00132164..f886fe4820 100644 --- a/board/at91rm9200dk/at45.c +++ b/board/at91rm9200dk/at45.c @@ -593,7 +593,7 @@ int AT91F_DataFlashRead( if (AT91F_DataFlashWaitReady(pDataFlash->pDataFlashDesc, AT91C_TIMEOUT_WRDY) != DATAFLASH_OK) return -1; - if (AT91F_DataFlashContinuousRead (pDataFlash, addr, buffer, SizeToRead) != DATAFLASH_OK) + if (AT91F_DataFlashContinuousRead (pDataFlash, addr, (uchar *)buffer, SizeToRead) != DATAFLASH_OK) return -1; size -= SizeToRead; diff --git a/board/at91rm9200dk/flash.c b/board/at91rm9200dk/flash.c index f6228ef03e..0513d61d73 100644 --- a/board/at91rm9200dk/flash.c +++ b/board/at91rm9200dk/flash.c @@ -393,8 +393,7 @@ outahere: * Copy memory to flash */ -volatile static int write_word (flash_info_t * info, ulong dest, - ulong data) +static int write_word (flash_info_t * info, ulong dest, ulong data) { volatile u16 *addr = (volatile u16 *) dest; ulong result; @@ -409,7 +408,6 @@ volatile static int write_word (flash_info_t * info, ulong dest, if ((result & data) != data) return ERR_NOT_ERASED; - /* * Disable interrupts which might cause a timeout * here. Remember that our exception vectors are diff --git a/board/cmc_pu2/load_sernum_ethaddr.c b/board/cmc_pu2/load_sernum_ethaddr.c index 94aa30df96..354566c05d 100644 --- a/board/cmc_pu2/load_sernum_ethaddr.c +++ b/board/cmc_pu2/load_sernum_ethaddr.c @@ -69,8 +69,8 @@ int i2c_read (unsigned char chip, unsigned int addr, int alen, void load_sernum_ethaddr (void) { struct manufacturer_data data; - unsigned char serial [9]; - unsigned char ethaddr[18]; + char ethaddr[18]; + char serial [9]; unsigned short chksum; unsigned char *p; unsigned short i, is, id; diff --git a/board/delta/nand.c b/board/delta/nand.c index 50def59090..c4df6e57eb 100644 --- a/board/delta/nand.c +++ b/board/delta/nand.c @@ -229,7 +229,7 @@ static void wait_us(unsigned long us) } } -static void dfc_clear_nddb() +static void dfc_clear_nddb(void) { NDCR &= ~NDCR_ND_RUN; wait_us(CFG_NAND_OTHER_TO); @@ -263,7 +263,7 @@ static unsigned long dfc_wait_event(unsigned long event) } /* we don't always wan't to do this */ -static void dfc_new_cmd() +static void dfc_new_cmd(void) { int retry = 0; unsigned long status; @@ -398,7 +398,7 @@ static void dfc_cmdfunc(struct mtd_info *mtd, unsigned command, return; } -static void dfc_gpio_init() +static void dfc_gpio_init(void) { DFC_DEBUG2("Setting up DFC GPIO's.\n"); diff --git a/board/lart/flash.c b/board/lart/flash.c index 5232ed2586..28c4531c02 100644 --- a/board/lart/flash.c +++ b/board/lart/flash.c @@ -348,7 +348,7 @@ outahere: * Copy memory to flash */ -volatile static int write_word (flash_info_t *info, ulong dest, ulong data) +static int write_word (flash_info_t *info, ulong dest, ulong data) { vu_long *addr = (vu_long *)dest; ulong result; diff --git a/board/lpd7a40x/flash.c b/board/lpd7a40x/flash.c index 2dfe37656f..d18720e5b2 100644 --- a/board/lpd7a40x/flash.c +++ b/board/lpd7a40x/flash.c @@ -351,8 +351,7 @@ outahere: * Copy memory to flash */ -volatile static int write_word (flash_info_t * info, ulong dest, - ulong data) +static int write_word (flash_info_t * info, ulong dest, ulong data) { vu_long *addr = (vu_long *) dest; ulong result; diff --git a/board/netstar/crcek b/board/netstar/crcek index 9593f893c816f4a2db8e3ec8db9eca91d04c2edb..491cceb2ed1cd8bf38ee7531dcee46fcf99bc3e3 100755 GIT binary patch delta 619 zc-lKLi>Y}g(*yQV>cJJK4%mvPti}$EYUC3 zP0G(N(J#+0%ATCwZa;ZVyY=K3?IDv>I#e`ufCex!AV5Yd1H&Gm04tQw0>nH(Y&3ae zhcIL8Y&v^po-vi&FISQcH?U d5{vYci;`2b^@15x5+_IXOk+|>nf$&d5&%fHXcqtg delta 760 zc-m{8$#h~C(*yQqc#_|K4;`FDJ{~^OUz5r zFV#)T&o7yr)o#yHoK##qd3n3-xSGczE73ee`L$%-Aqlh_HaHfpb$yuFV^+=`wjpSrtMB=kBeEjc;#z&W*h{j()K>cbUeFHASSkJHp zNQJ;vF)|zhk^xBki$F34iGK@7CLr;j0m%Y{fei0~WCW7@e<10D#ODA9GmKx)$RG^l zcpxc|0kRWV5qvcuKLv?z3gpWmsdoUfGg=`$0iX}P(fE;Q{8XeM5pV$-kd3CG9F1R( z#&1L8cTYC$Hc~}PUiwM-iA5>;d8sAEC5c7)$wkSj*?Pf~P1}|2iBXxsV3VAmn+sH> dkdv90YR6!cRGOJnqMMm#H+fR`w8`2%5dewnjC=q9 diff --git a/board/netstar/eeprom b/board/netstar/eeprom index c30c98b72ce1d09c84f4e7b821cf1f4dfeac0386..e075eb4efd3c7fea6520d703cfb10274487482a6 100755 GIT binary patch literal 40842 zc-rk)d301o*01V4=}xC1Ax4(5LBK$^1|uSfCXf{ZWMdK0PH#y%^hPfPFb+tFAfqUT zAS#faK^$}(3?zZD1;mWPj3W@j61LD;MixgR!;IpVx%K+>>rTTr$8XNeA9GIq&Z$@T zSNGPfTUD>C?(1b~+36T#4PwDVF$hE5EJ{`+L4CCv+C&H?AtkiOpePi<=+ScWNLG+i zE={v`a&rfeg!M@I==1g9Y}1DVqG^zIUYoO7QWai?{Rxyn;|4oS~Sh(`n=@SudCUI1B#4JvV2oJRiDzTA*E?{7AXU%g#wdt{sL+SY3Q zma(fZ$lqzaxa1etPG4Ew*78Pd_U@2_+Me~PgTs`Xo@(zeSv=I9qo@_9y6?&IUh&1nM69>r10`^tWkEyew(qt#JYw3oYx0?6`!6KlIq*TJ z>D*Y?{PwitVP`HrHRbh3Z{xvQLIzlkQwqZcXf$T{8D~Lo^>viZ9yzTFS*mqJ z@PUTiqHSG=Y94NFy!xAC;>AgKQ25&IAseDM%02tTN|(h?GE3et>DS@;y1(4cU9do_ zF%3SaGE~k$+FO6E7MY&gh6jCgTe4zKbNJssX{$BlT-($CdSlbC%2)6Gp?%0DZC3pG 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 literal 72374 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 g>W$uKrQ_Cj!&~H9Uq&d`#u%QeRs#zVS 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, v_mac, 6); /* update global address to match env (allows env changing) */ - smc_set_mac_addr (v_mac); /* use old function to update smc default */ + smc_set_mac_addr ((unsigned char *)v_mac); /* use old function to update smc default */ PRINTK("Using MAC Address %02X:%02X:%02X:%02X:%02X:%02X\n", v_mac[0], v_mac[1], v_mac[2], v_mac[3], v_mac[4], v_mac[5]); return (0); @@ -946,7 +946,7 @@ int smc_get_ethaddr (bd_t * bd) * Note, this has omly been tested for the OMAP730 P2. */ -int get_rom_mac (char *v_rom_mac) +int get_rom_mac (unsigned char *v_rom_mac) { #ifdef HARDCODE_MAC /* used for testing or to supress run time warnings */ char hw_mac_addr[] = { 0x02, 0x80, 0xad, 0x20, 0x31, 0xb8 }; diff --git a/drivers/lan91c96.h b/drivers/lan91c96.h index b7d7455b9d..7d33a821f3 100644 --- a/drivers/lan91c96.h +++ b/drivers/lan91c96.h @@ -51,7 +51,7 @@ * in order to override the default mac address. */ -void smc_set_mac_addr(const char *addr); +void smc_set_mac_addr(const unsigned char *addr); /* I want some simple types */ diff --git a/drivers/nand/nand_base.c b/drivers/nand/nand_base.c index d91d90bfec..e0b406041f 100644 --- a/drivers/nand/nand_base.c +++ b/drivers/nand/nand_base.c @@ -897,7 +897,7 @@ static int nand_write_page (struct mtd_info *mtd, struct nand_chip *this, int pa int i, status; u_char ecc_code[32]; int eccmode = oobsel->useecc ? this->eccmode : NAND_ECC_NONE; - int *oob_config = oobsel->eccpos; + uint *oob_config = oobsel->eccpos; int datidx = 0, eccidx = 0, eccsteps = this->eccsteps; int eccbytes = 0; @@ -1119,7 +1119,8 @@ static int nand_read_ecc (struct mtd_info *mtd, loff_t from, size_t len, u_char ecc_calc[32]; u_char ecc_code[32]; int eccmode, eccsteps; - int *oob_config, datidx; + unsigned *oob_config; + int datidx; int blockcheck = (1 << (this->phys_erase_shift - this->page_shift)) - 1; int eccbytes; int compareecc = 1; diff --git a/drivers/smc91111.c b/drivers/smc91111.c index 060da8ff2a..84e243ddd5 100644 --- a/drivers/smc91111.c +++ b/drivers/smc91111.c @@ -210,7 +210,7 @@ static int smc_rcv(void); . If an EEPROM is present it really should be consulted. */ int smc_get_ethaddr(bd_t *bd); -int get_rom_mac(char *v_rom_mac); +int get_rom_mac(uchar *v_rom_mac); /* ------------------------------------------------------------ @@ -276,17 +276,23 @@ static inline void SMC_outb(byte value, dword offset) static inline void SMC_insw(dword offset, volatile uchar* buf, dword len) { + volatile word *p = (volatile word *)buf; + while (len-- > 0) { - *((word*)buf)++ = SMC_inw(offset); - barrier(); *((volatile u32*)(0xc0000000)); + *p++ = SMC_inw(offset); + barrier(); + *((volatile u32*)(0xc0000000)); } } static inline void SMC_outsw(dword offset, uchar* buf, dword len) { + volatile word *p = (volatile word *)buf; + while (len-- > 0) { - SMC_outw(*((word*)buf)++, offset); - barrier(); *(volatile u32*)(0xc0000000); + SMC_outw(*p++, offset); + barrier(); + *(volatile u32*)(0xc0000000); } } #endif /* CONFIG_SMC_USE_IOFUNCS */ @@ -298,7 +304,7 @@ static char unsigned smc_mac_addr[6] = {0x02, 0x80, 0xad, 0x20, 0x31, 0xb8}; * the default mac address. */ -void smc_set_mac_addr(const char *addr) { +void smc_set_mac_addr(const unsigned char *addr) { int i; for (i=0; i < sizeof(smc_mac_addr); i++){ @@ -1524,7 +1530,8 @@ int smc_get_ethaddr (bd_t * bd) { int env_size, rom_valid, env_present = 0, reg; char *s = NULL, *e, *v_mac, es[] = "11:22:33:44:55:66"; - uchar s_env_mac[64], v_env_mac[6], v_rom_mac[6]; + char s_env_mac[64]; + uchar v_env_mac[6], v_rom_mac[6]; env_size = getenv_r ("ethaddr", s_env_mac, sizeof (s_env_mac)); if ((env_size > 0) && (env_size < sizeof (es))) { /* exit if env is bad */ @@ -1547,7 +1554,7 @@ int smc_get_ethaddr (bd_t * bd) if (!env_present) { /* if NO env */ if (rom_valid) { /* but ROM is valid */ - v_mac = v_rom_mac; + v_mac = (char *)v_rom_mac; sprintf (s_env_mac, "%02X:%02X:%02X:%02X:%02X:%02X", v_mac[0], v_mac[1], v_mac[2], v_mac[3], v_mac[4], v_mac[5]); @@ -1557,7 +1564,7 @@ int smc_get_ethaddr (bd_t * bd) return (-1); } } else { /* good env, don't care ROM */ - v_mac = v_env_mac; /* always use a good env over a ROM */ + v_mac = (char *)v_env_mac; /* always use a good env over a ROM */ } if (env_present && rom_valid) { /* if both env and ROM are good */ @@ -1577,13 +1584,13 @@ int smc_get_ethaddr (bd_t * bd) } } memcpy (bd->bi_enetaddr, v_mac, 6); /* update global address to match env (allows env changing) */ - smc_set_mac_addr (v_mac); /* use old function to update smc default */ + smc_set_mac_addr ((uchar *)v_mac); /* use old function to update smc default */ PRINTK("Using MAC Address %02X:%02X:%02X:%02X:%02X:%02X\n", v_mac[0], v_mac[1], v_mac[2], v_mac[3], v_mac[4], v_mac[5]); return (0); } -int get_rom_mac (char *v_rom_mac) +int get_rom_mac (uchar *v_rom_mac) { #ifdef HARDCODE_MAC /* used for testing or to supress run time warnings */ char hw_mac_addr[] = { 0x02, 0x80, 0xad, 0x20, 0x31, 0xb8 }; diff --git a/drivers/smc91111.h b/drivers/smc91111.h index cf08582fbf..c3c33672ab 100644 --- a/drivers/smc91111.h +++ b/drivers/smc91111.h @@ -49,7 +49,7 @@ * in order to override the default mac address. */ -void smc_set_mac_addr(const char *addr); +void smc_set_mac_addr (const unsigned char *addr); /* I want some simple types */ diff --git a/include/asm-arm/arch-arm720t/s3c4510b.h b/include/asm-arm/arch-arm720t/s3c4510b.h index 517b1ada99..73a3b6d856 100644 --- a/include/asm-arm/arch-arm720t/s3c4510b.h +++ b/include/asm-arm/arch-arm720t/s3c4510b.h @@ -267,8 +267,6 @@ struct _irq_handler { void (*m_func)( void *data); }; -extern struct _irq_handler IRQ_HANDLER[]; - #endif #endif /* __S3C4510_h */ diff --git a/lib_arm/armlinux.c b/lib_arm/armlinux.c index ca630b377e..dba2ff7085 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 c73cf0c38f..76639081ed 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; diff --git a/rtc/rs5c372.c b/rtc/rs5c372.c index 87f38c42bb..b56808b8ba 100644 --- a/rtc/rs5c372.c +++ b/rtc/rs5c372.c @@ -73,7 +73,7 @@ static unsigned bcd2bin (uchar c); static int setup_done = 0; static int -rs5c372_readram(char *buf, int len) +rs5c372_readram(unsigned char *buf, int len) { int ret; @@ -128,7 +128,7 @@ rs5c372_enable(void) } static void -rs5c372_convert_to_time(struct rtc_time *dt, char *buf) +rs5c372_convert_to_time(struct rtc_time *dt, unsigned char *buf) { /* buf[0] is register 15 */ dt->tm_sec = bcd2bin(buf[1]); -- 2.47.2