diff options
| author | wdenk <wdenk> | 2003-07-17 23:16:40 +0000 | 
|---|---|---|
| committer | wdenk <wdenk> | 2003-07-17 23:16:40 +0000 | 
| commit | 2535d60277cc295adf75cd5721dcecd840c69a63 (patch) | |
| tree | a4a7c42580ded1e631658cec4f7a26d8e677a342 /cpu/mpc8xx/scc.c | |
| parent | 945af8d723a29e9b6289d84250745ed0dc16fc81 (diff) | |
| download | olio-uboot-2014.01-2535d60277cc295adf75cd5721dcecd840c69a63.tar.xz olio-uboot-2014.01-2535d60277cc295adf75cd5721dcecd840c69a63.zip | |
* Patch by Martin Krause, 17 Jul 2003:
  add delay to get I2C working with "imm" command and s3c24x0_i2c.c
* Patch by Richard Woodruff, 17 July 03:
  - Fixed bug in OMAP1510 baud rate divisor settings.
* Patch by Nye Liu, 16 July 2003:
  MPC860FADS fixes:
  - add MPC86xADS support (uses MPC86xADS.h)
  - add 866P/T core support (also MPC859T/MPC859DSL/MPC852T)
    o PLPRCR changes
    o BRG changes (EXTAL/XTAL restricted to 10MHz)
    o don't trust gclk() software measurement by default, depend on
      CONFIG_8xx_GCLK_FREQ
  - add DRAM SIMM not installed detection
  - use more "correct" SDRAM initialization sequence
  - allow different SDRAM sizes (8xxADS has 8M)
  - default DER is 0
  - remove unused MAMR defines from FADS860T.h (all done in fads.c)
  - rename MAMR/MBMR defines to be more consistent. Should eventually
    be merged into MxMR to better reflect the PowerQUICC datasheet.
* Patch by Yuli Barcohen, 16 Jul 2003:
  support new Motorola PQ2FADS-ZU evaluation board which replaced
  MPC8260ADS and MPC8266ADS
Diffstat (limited to 'cpu/mpc8xx/scc.c')
| -rw-r--r-- | cpu/mpc8xx/scc.c | 6 | 
1 files changed, 3 insertions, 3 deletions
| diff --git a/cpu/mpc8xx/scc.c b/cpu/mpc8xx/scc.c index d711a6398..e0fae5d5b 100644 --- a/cpu/mpc8xx/scc.c +++ b/cpu/mpc8xx/scc.c @@ -192,9 +192,9 @@ static int scc_init(struct eth_device* dev, bd_t *bis)      volatile immap_t *immr = (immap_t *)CFG_IMMR; -#if defined(CONFIG_FADS) -#if defined(CONFIG_MPC860T) -    /* The FADS860T doesn't use the MODEM_EN or DATA_VOICE signals.	*/ +#ifdef CONFIG_FADS +#if defined(CONFIG_MPC86xADS) || defined(CONFIG_MPC860T) +    /* The MPC86xADS/FADS860T don't use the MODEM_EN or DATA_VOICE signals. */      *((uint *) BCSR4) &= ~BCSR4_ETHLOOP;      *((uint *) BCSR4) |= BCSR4_TFPLDL|BCSR4_TPSQEL;      *((uint *) BCSR1) &= ~BCSR1_ETHEN; |