git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[pandora-kernel.git]
/
arch
/
powerpc
/
kernel
/
udbg.c
diff --git
a/arch/powerpc/kernel/udbg.c
b/arch/powerpc/kernel/udbg.c
index
d723070
..
fc9af47
100644
(file)
--- a/
arch/powerpc/kernel/udbg.c
+++ b/
arch/powerpc/kernel/udbg.c
@@
-18,6
+18,7
@@
#include <asm/udbg.h>
void (*udbg_putc)(char c);
#include <asm/udbg.h>
void (*udbg_putc)(char c);
+void (*udbg_flush)(void);
int (*udbg_getc)(void);
int (*udbg_getc_poll)(void);
int (*udbg_getc)(void);
int (*udbg_getc_poll)(void);
@@
-54,9
+55,16
@@
void __init udbg_early_init(void)
#elif defined(CONFIG_PPC_EARLY_DEBUG_44x)
/* PPC44x debug */
udbg_init_44x_as1();
#elif defined(CONFIG_PPC_EARLY_DEBUG_44x)
/* PPC44x debug */
udbg_init_44x_as1();
+#elif defined(CONFIG_PPC_EARLY_DEBUG_40x)
+ /* PPC40x debug */
+ udbg_init_40x_realmode();
#elif defined(CONFIG_PPC_EARLY_DEBUG_CPM)
udbg_init_cpm();
#endif
#elif defined(CONFIG_PPC_EARLY_DEBUG_CPM)
udbg_init_cpm();
#endif
+
+#ifdef CONFIG_PPC_EARLY_DEBUG
+ console_loglevel = 10;
+#endif
}
/* udbg library, used by xmon et al */
}
/* udbg library, used by xmon et al */
@@
-69,6
+77,9
@@
void udbg_puts(const char *s)
while ((c = *s++) != '\0')
udbg_putc(c);
}
while ((c = *s++) != '\0')
udbg_putc(c);
}
+
+ if (udbg_flush)
+ udbg_flush();
}
#if 0
else {
}
#if 0
else {
@@
-91,6
+102,9
@@
int udbg_write(const char *s, int n)
}
}
}
}
+ if (udbg_flush)
+ udbg_flush();
+
return n - remain;
}
return n - remain;
}
@@
-147,8
+161,8
@@
static void udbg_console_write(struct console *con, const char *s,
static struct console udbg_console = {
.name = "udbg",
.write = udbg_console_write,
static struct console udbg_console = {
.name = "udbg",
.write = udbg_console_write,
- .flags = CON_PRINTBUFFER | CON_ENABLED | CON_BOOT,
- .index =
-1
,
+ .flags = CON_PRINTBUFFER | CON_ENABLED | CON_BOOT
| CON_ANYTIME
,
+ .index =
0
,
};
static int early_console_initialized;
};
static int early_console_initialized;