diff options
| author | Wolfgang Denk <wd@denx.de> | 2007-11-17 00:38:34 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2007-11-17 00:38:34 +0100 |
| commit | ee1f5e3bfe2e52e1d8795ccce0acd7927536f6f5 (patch) | |
| tree | dbaf911052ee72330ed763cb00d4cc56a1fa57b6 | |
| parent | a08ded4e6392b5d0d11a1fce4aaf88e4a7474e8d (diff) | |
| parent | 64bf555465c7926be13e1046ac0d0f05ac72829c (diff) | |
Merge branch 'master' of /home/wd/git/u-boot/work
| -rw-r--r-- | board/purple/flash.c | 2 | ||||
| -rw-r--r-- | common/cmd_ide.c | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/board/purple/flash.c b/board/purple/flash.c index 7522580808d..1baae35eb88 100644 --- a/board/purple/flash.c +++ b/board/purple/flash.c @@ -299,7 +299,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"; diff --git a/common/cmd_ide.c b/common/cmd_ide.c index bb064eaa04a..27cecac4eed 100644 --- a/common/cmd_ide.c +++ b/common/cmd_ide.c @@ -1136,9 +1136,9 @@ static void ide_ident (block_dev_desc_t *dev_desc) input_swap_data (device, iobuf, ATA_SECTORWORDS); - ident_cpy (dev_desc->revision, iop->fw_rev, sizeof(dev_desc->revision)); - ident_cpy (dev_desc->vendor, iop->model, sizeof(dev_desc->vendor)); - ident_cpy (dev_desc->product, iop->serial_no, sizeof(dev_desc->product)); + ident_cpy ((unsigned char*)dev_desc->revision, iop->fw_rev, sizeof(dev_desc->revision)); + ident_cpy ((unsigned char*)dev_desc->vendor, iop->model, sizeof(dev_desc->vendor)); + ident_cpy ((unsigned char*)dev_desc->product, iop->serial_no, sizeof(dev_desc->product)); #ifdef __LITTLE_ENDIAN /* * firmware revision and model number have Big Endian Byte @@ -1953,9 +1953,9 @@ static void atapi_inquiry(block_dev_desc_t * dev_desc) return; /* copy device ident strings */ - ident_cpy(dev_desc->vendor,&iobuf[8],8); - ident_cpy(dev_desc->product,&iobuf[16],16); - ident_cpy(dev_desc->revision,&iobuf[32],5); + ident_cpy((unsigned char*)dev_desc->vendor,&iobuf[8],8); + ident_cpy((unsigned char*)dev_desc->product,&iobuf[16],16); + ident_cpy((unsigned char*)dev_desc->revision,&iobuf[32],5); dev_desc->lun=0; dev_desc->lba=0; |