diff options
| author | Stefan Roese <sr@denx.de> | 2007-07-16 13:28:47 +0200 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2007-07-16 13:28:47 +0200 |
| commit | 8f085e324ad89423314b1a529a0dd5d85c8397ad (patch) | |
| tree | a165c33f92619a488756edc3261a53468c8b55b6 /cpu | |
| parent | 8848ec858f74ed6dab06fb6d5ddc933e0a1328bf (diff) | |
| parent | 3a6cab844cf74f76639d795e0be8717e02c86af7 (diff) | |
| download | talos-obmc-uboot-8f085e324ad89423314b1a529a0dd5d85c8397ad.tar.gz talos-obmc-uboot-8f085e324ad89423314b1a529a0dd5d85c8397ad.zip | |
Merge with git://www.denx.de/git/u-boot.git
Diffstat (limited to 'cpu')
| -rw-r--r-- | cpu/mpc5xxx/fec.c | 21 | ||||
| -rw-r--r-- | cpu/ppc4xx/44x_spd_ddr.c | 2 |
2 files changed, 15 insertions, 8 deletions
diff --git a/cpu/mpc5xxx/fec.c b/cpu/mpc5xxx/fec.c index 813636655b..3d99d5c1ec 100644 --- a/cpu/mpc5xxx/fec.c +++ b/cpu/mpc5xxx/fec.c @@ -889,13 +889,20 @@ int mpc5xxx_fec_initialize(bd_t * bis) fec->eth = (ethernet_regs *)MPC5XXX_FEC; fec->tbdBase = (FEC_TBD *)FEC_BD_BASE; 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_JUPITER) || defined(CONFIG_MCC200) || \ - defined(CONFIG_MOTIONPRO)|| defined(CONFIG_O2DNT) || \ - defined(CONFIG_PM520) || defined(CONFIG_TOP5200) || \ - defined(CONFIG_TQM5200) || defined(CONFIG_UC101) || \ - defined(CONFIG_V38B) +#if defined(CONFIG_CANMB) || \ + defined(CONFIG_CM1_QP1) || \ + defined(CONFIG_HMI1001) || \ + defined(CONFIG_ICECUBE) || \ + defined(CONFIG_INKA4X0) || \ + defined(CONFIG_JUPITER) || \ + 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/ppc4xx/44x_spd_ddr.c b/cpu/ppc4xx/44x_spd_ddr.c index 0b0c55a44f..e5f296eb06 100644 --- a/cpu/ppc4xx/44x_spd_ddr.c +++ b/cpu/ppc4xx/44x_spd_ddr.c @@ -1016,7 +1016,7 @@ static int short_mem_test(void) */ for (i = 0; i < NUMMEMTESTS; i++) { for (j = 0; j < NUMMEMWORDS; j++) { -//printf("bank enabled base:%x\n", &membase[j]); + /* printf("bank enabled base:%x\n", &membase[j]); */ membase[j] = test[i][j]; ppcDcbf((unsigned long)&(membase[j])); } |
