diff options
author | Wolfgang Denk <wd@denx.de> | 2009-07-07 20:54:12 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2009-07-07 20:54:12 +0200 |
commit | 73e1140b4929c92f7715bbc64ee8553815bb43aa (patch) | |
tree | 337677f8f62440561b93dca1053f6105c2c880c2 /common/serial.c | |
parent | 98ab14e858bf60306d0aa3f0df5a7a5f88264aff (diff) | |
parent | afb0b1315c048ce2b1f35f0183b8b118ad0c14e1 (diff) | |
download | u-boot-imx-73e1140b4929c92f7715bbc64ee8553815bb43aa.zip u-boot-imx-73e1140b4929c92f7715bbc64ee8553815bb43aa.tar.gz u-boot-imx-73e1140b4929c92f7715bbc64ee8553815bb43aa.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Diffstat (limited to 'common/serial.c')
-rw-r--r-- | common/serial.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/common/serial.c b/common/serial.c index dd80e7c..5d0a73c 100644 --- a/common/serial.c +++ b/common/serial.c @@ -40,7 +40,8 @@ struct serial_device *__default_serial_console (void) return &serial_scc_device; #elif defined(CONFIG_405GP) || defined(CONFIG_405CR) || defined(CONFIG_440) \ || defined(CONFIG_405EP) || defined(CONFIG_405EZ) || defined(CONFIG_405EX) \ - || defined(CONFIG_MPC5xxx) + || defined(CONFIG_MPC5xxx) || defined(CONFIG_MPC83xx) \ + || defined(CONFIG_MPC85xx) || defined(CONFIG_MPC86xx) #if defined(CONFIG_CONS_INDEX) && defined(CONFIG_SYS_NS16550_SERIAL) #if (CONFIG_CONS_INDEX==1) return &eserial1_device; |