summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorwdenk <wdenk>2004-02-06 21:48:22 +0000
committerwdenk <wdenk>2004-02-06 21:48:22 +0000
commita6cccaea5a4743f4e4fb93a3ae9537e7357c783b (patch)
tree7e4ef47208c164f62c6384e8f76afc073cc14145 /common
parent5e4be00fb037feb6476125d044b98e0e22b70d31 (diff)
downloadu-boot-imx-a6cccaea5a4743f4e4fb93a3ae9537e7357c783b.zip
u-boot-imx-a6cccaea5a4743f4e4fb93a3ae9537e7357c783b.tar.gz
u-boot-imx-a6cccaea5a4743f4e4fb93a3ae9537e7357c783b.tar.bz2
* Patch by Wolter Kamphuis, 15 Dec 2003:
made CONFIG_SILENT_CONSOLE usable on all architectures * Disable date command on TQM866M - there is no RTC on MPC866
Diffstat (limited to 'common')
-rw-r--r--common/cmd_pcmcia.c14
-rw-r--r--common/console.c10
2 files changed, 24 insertions, 0 deletions
diff --git a/common/cmd_pcmcia.c b/common/cmd_pcmcia.c
index 8c17859..53d2227 100644
--- a/common/cmd_pcmcia.c
+++ b/common/cmd_pcmcia.c
@@ -160,6 +160,9 @@ int pcmcia_on (void)
}
#else
+#ifdef CONFIG_BMS2003
+# define BMS2003_FRAM_TIMING (PCMCIA_SHT(2) | PCMCIA_SST(2) | PCMCIA_SL(4))
+#endif
#if defined(CONFIG_LWMON) || defined(CONFIG_NSCU)
# define CFG_PCMCIA_TIMING (PCMCIA_SHT(9) | PCMCIA_SST(3) | PCMCIA_SL(12))
#else
@@ -197,6 +200,17 @@ int pcmcia_on (void)
switch (i) {
#ifdef CONFIG_IDE_8xx_PCCARD
case 4:
+#ifdef CONFIG_BMS2003
+ { /* map FRAM area */
+ win->or = ( PCMCIA_BSIZE_256K
+ | PCMCIA_PPS_8
+ | PCMCIA_PRS_ATTR
+ | slotbit
+ | PCMCIA_PV
+ | BMS2003_FRAM_TIMING );
+ break;
+ }
+#endif
case 0: { /* map attribute memory */
win->or = ( PCMCIA_BSIZE_64M
| PCMCIA_PPS_8
diff --git a/common/console.c b/common/console.c
index 629f60b..1e0ca8d 100644
--- a/common/console.c
+++ b/common/console.c
@@ -191,6 +191,11 @@ void putc (const char c)
{
DECLARE_GLOBAL_DATA_PTR;
+#ifdef CONFIG_SILENT_CONSOLE
+ if (gd->flags & GD_FLG_SILENT)
+ return(0);
+#endif
+
if (gd->flags & GD_FLG_DEVINIT) {
/* Send to the standard output */
fputc (stdout, c);
@@ -204,6 +209,11 @@ void puts (const char *s)
{
DECLARE_GLOBAL_DATA_PTR;
+#ifdef CONFIG_SILENT_CONSOLE
+ if (gd->flags & GD_FLG_SILENT)
+ return;
+#endif
+
if (gd->flags & GD_FLG_DEVINIT) {
/* Send to the standard output */
fputs (stdout, s);