diff options
| author | wdenk <wdenk> | 2004-08-01 22:48:16 +0000 |
|---|---|---|
| committer | wdenk <wdenk> | 2004-08-01 22:48:16 +0000 |
| commit | 281e00a3be453a169d854f824a460359d10f92bb (patch) | |
| tree | 43dab398f1d6f601bb44df108427f7e0c611d68d /include/commproc.h | |
| parent | cfca5e604d5692f081cc1a9185ca5dc6dc77599d (diff) | |
| download | blackbird-obmc-uboot-281e00a3be453a169d854f824a460359d10f92bb.tar.gz blackbird-obmc-uboot-281e00a3be453a169d854f824a460359d10f92bb.zip | |
* Code cleanup
* Patch by Sascha Hauer, 28 Jun:
- add generic support for Motorola i.MX architecture
- add support for mx1ads, mx1fs2 and scb9328 boards
* Patches by Marc Leeman, 23 Jul 2004:
- Add define for the PCI/Memory Buffer Configuration Register
- corrected comments in cpu/mpc824x/cpu_init.c
* Add support for multiple serial interfaces
(for example to allow modem dial-in / dial-out)
Diffstat (limited to 'include/commproc.h')
| -rw-r--r-- | include/commproc.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/commproc.h b/include/commproc.h index f87620ebf1..83119717a9 100644 --- a/include/commproc.h +++ b/include/commproc.h @@ -74,9 +74,10 @@ #define CPM_I2C_BASE 0x0820 #define CPM_SPI_BASE 0x0840 #define CPM_FEC_BASE 0x0860 -#define CPM_WLKBD_BASE 0x0880 +#define CPM_SERIAL2_BASE 0x0880 #define CPM_SCC_BASE 0x0900 #define CPM_POST_BASE 0x0980 +#define CPM_WLKBD_BASE 0x0a00 #endif @@ -1041,7 +1042,7 @@ typedef struct scc_enet { /*** LWMON **********************************************************/ -#if defined(CONFIG_LWMON) && !defined(CONFIG_8xx_CONS_SCC2) +#if defined(CONFIG_LWMON) /* Bits in parallel I/O port registers that have to be set/cleared * to configure the pins for SCC2 use. */ |
