summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorMarian Balakowicz <m8@semihalf.com>2006-06-30 18:19:42 +0200
committerMarian Balakowicz <m8@semihalf.com>2006-06-30 18:19:42 +0200
commitf6e5739a68131998a5ae8aa0cf56a0316f810200 (patch)
tree010b89799af2478323c7f1cc04665b51b5cc4e50 /common
parentf73e73ba0e422e6f79030d77286dd57becaee16f (diff)
parent6c5879f380be38d85fef0d3aba3353358f4b2ff4 (diff)
downloadu-boot-imx-f6e5739a68131998a5ae8aa0cf56a0316f810200.zip
u-boot-imx-f6e5739a68131998a5ae8aa0cf56a0316f810200.tar.gz
u-boot-imx-f6e5739a68131998a5ae8aa0cf56a0316f810200.tar.bz2
Merge: Add support for AMCC 440SPe CPU based eval board (Yucca).
Diffstat (limited to 'common')
-rw-r--r--common/cmd_bdinfo.c5
-rw-r--r--common/serial.c6
2 files changed, 8 insertions, 3 deletions
diff --git a/common/cmd_bdinfo.c b/common/cmd_bdinfo.c
index 04fa4fa..256e4bc 100644
--- a/common/cmd_bdinfo.c
+++ b/common/cmd_bdinfo.c
@@ -61,11 +61,12 @@ int do_bdinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
print_num ("bootflags", bd->bi_bootflags );
#if defined(CONFIG_405GP) || defined(CONFIG_405CR) || \
defined(CONFIG_405EP) || defined(CONFIG_XILINX_ML300) || \
- defined(CONFIG_440EP) || defined(CONFIG_440GR)
+ defined(CONFIG_440EP) || defined(CONFIG_440GR) || \
+ defined(CONFIG_440SP)
print_str ("procfreq", strmhz(buf, bd->bi_procfreq));
print_str ("plb_busfreq", strmhz(buf, bd->bi_plb_busfreq));
#if defined(CONFIG_405GP) || defined(CONFIG_405EP) || defined(CONFIG_XILINX_ML300) || \
- defined(CONFIG_440EP) || defined(CONFIG_440GR)
+ defined(CONFIG_440EP) || defined(CONFIG_440GR) || defined(CONFIG_440SPE)
print_str ("pci_busfreq", strmhz(buf, bd->bi_pci_busfreq));
#endif
#else /* ! CONFIG_405GP, CONFIG_405CR, CONFIG_405EP, CONFIG_XILINX_ML300, CONFIG_440EP CONFIG_440GR */
diff --git a/common/serial.c b/common/serial.c
index 7b29951..38057d2 100644
--- a/common/serial.c
+++ b/common/serial.c
@@ -42,7 +42,11 @@ 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_MPC5xxx)
- return &serial0_device;
+#if defined(CONFIG_UART1_CONSOLE)
+ return &serial1_device;
+#else
+ return &serial0_device;
+#endif
#else
#error No default console
#endif