diff options
| author | wdenk | 2003-12-07 21:39:28 +0000 |
|---|---|---|
| committer | wdenk | 2003-12-07 21:39:28 +0000 |
| commit | b028f7151379c5bb6814099fbbccb31d8b07b891 (patch) | |
| tree | 6b96f658b7b8f2f3ecd21b0e102b01aea1998d74 /cpu | |
| parent | b4676a25e2feb15826d960f4a216c3c429d2de75 (diff) | |
* Patch by Yuli Barcohen, 3 Dec 2003:
"revive" U-Boot support for old Motorola MPC860ADS board
* Patch by Cam(ilo?), 03 Dec 2003:
make examples build even with broken Montavista objcopy
* Patch by Pavel Bartusek, 27 Nov 2003:
fix conversion problem with "bootretry" evironment variable
Diffstat (limited to 'cpu')
| -rw-r--r-- | cpu/mpc8xx/cpu_init.c | 4 | ||||
| -rw-r--r-- | cpu/mpc8xx/serial.c | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/cpu/mpc8xx/cpu_init.c b/cpu/mpc8xx/cpu_init.c index dbf5db018ba..8f06dd1ab91 100644 --- a/cpu/mpc8xx/cpu_init.c +++ b/cpu/mpc8xx/cpu_init.c @@ -145,9 +145,7 @@ void cpu_init_f (volatile immap_t * immr) defined(CONFIG_R360MPI) || \ defined(CONFIG_RPXCLASSIC) || \ defined(CONFIG_RPXLITE) || \ - defined(CONFIG_SPD823TS) || \ - defined(CONFIG_MPC86xADS) || \ - (defined(CONFIG_MPC860T) && defined(CONFIG_FADS)) + defined(CONFIG_SPD823TS) memctl->memc_br0 = CFG_BR0_PRELIM; #endif diff --git a/cpu/mpc8xx/serial.c b/cpu/mpc8xx/serial.c index 5ca4d905533..faea3c36f3c 100644 --- a/cpu/mpc8xx/serial.c +++ b/cpu/mpc8xx/serial.c @@ -153,7 +153,7 @@ int serial_init (void) # endif #endif -#if defined(CONFIG_FADS) +#if defined(CONFIG_FADS) || defined(CONFIG_ADS) /* Enable RS232 */ #if defined(CONFIG_8xx_CONS_SMC1) *((uint *) BCSR1) &= ~BCSR1_RS232EN_1; |