diff options
| author | Stefan Roese <sr@denx.de> | 2007-02-20 10:58:04 +0100 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2007-02-20 10:58:04 +0100 |
| commit | 90b0cf47eb23e5f3461d3d957f6898386907fd99 (patch) | |
| tree | 4acaab40f79d89c08cad928fdf52cad3a93dbdec /cpu | |
| parent | 4745acaa1a603b67f6b9b7970365ebadd7d6586f (diff) | |
| parent | eb867a76238fb38e952c37871b16d0d7fd61c95f (diff) | |
| download | u-boot-imx-90b0cf47eb23e5f3461d3d957f6898386907fd99.zip u-boot-imx-90b0cf47eb23e5f3461d3d957f6898386907fd99.tar.gz u-boot-imx-90b0cf47eb23e5f3461d3d957f6898386907fd99.tar.bz2 | |
Merge with /home/stefan/git/u-boot/denx-merge-sr
Diffstat (limited to 'cpu')
| -rw-r--r-- | cpu/mpc5xxx/fec.c | 8 | ||||
| -rw-r--r-- | cpu/pxa/mmc.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/cpu/mpc5xxx/fec.c b/cpu/mpc5xxx/fec.c index 71c1bfa..e639234 100644 --- a/cpu/mpc5xxx/fec.c +++ b/cpu/mpc5xxx/fec.c @@ -880,10 +880,10 @@ int mpc5xxx_fec_initialize(bd_t * bis) fec->rbdBase = (FEC_RBD *)(FEC_BD_BASE + FEC_TBD_NUM * sizeof(FEC_TBD)); #if defined(CONFIG_CANMB) || defined(CONFIG_HMI1001) || \ defined(CONFIG_ICECUBE) || defined(CONFIG_INKA4X0) || \ - defined(CONFIG_MCC200) || defined(CONFIG_O2DNT) || \ - defined(CONFIG_PM520) || defined(CONFIG_TOP5200) || \ - defined(CONFIG_TQM5200) || defined(CONFIG_V38B) || \ - defined(CONFIG_UC101) + defined(CONFIG_MCC200) || defined(CONFIG_MOTIONPRO) || \ + defined(CONFIG_O2DNT) || defined(CONFIG_PM520) || \ + defined(CONFIG_TOP5200) || defined(CONFIG_TQM5200) || \ + defined(CONFIG_UC101) || defined(CONFIG_V38B) # ifndef CONFIG_FEC_10MBIT fec->xcv_type = MII100; # else diff --git a/cpu/pxa/mmc.c b/cpu/pxa/mmc.c index f7020ee..0fbaa16 100644 --- a/cpu/pxa/mmc.c +++ b/cpu/pxa/mmc.c @@ -37,7 +37,7 @@ static block_dev_desc_t mmc_dev; block_dev_desc_t * mmc_get_dev(int dev) { - return ((block_dev_desc_t *)&mmc_dev); + return (dev == 0) ? &mmc_dev : NULL; } /* @@ -363,7 +363,7 @@ mmc_write(uchar *src, ulong dst, int size) ulong /****************************************************/ -mmc_bread(int dev_num, ulong blknr, ulong blkcnt, ulong *dst) +mmc_bread(int dev_num, ulong blknr, ulong blkcnt, void *dst) /****************************************************/ { int mmc_block_size = MMC_BLOCK_SIZE; |