[PATCH] powerpc: Unify udbg (#2)
This patch unifies udbg for both ppc32 and ppc64 when building the merged achitecture. xmon now has a single "back end". The powermac udbg stuff gets enriched with some ADB capabilities and btext output. In addition, the early_init callback is now called on ppc32 as well, approx. in the same order as ppc64 regarding device-tree manipulations. The init sequences of ppc32 and ppc64 are getting closer, I'll unify them in a later patch. For now, you can force udbg to the scc using "sccdbg" or to btext using "btextdbg" on powermacs. I'll implement a cleaner way of forcing udbg output to something else than the autodetected OF output device in a later patch. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:

committed by
Paul Mackerras

parent
463ce0e103
commit
51d3082fe6
@@ -61,7 +61,7 @@ extern void pSeries_find_serial_port(void);
|
||||
int vtermno; /* virtual terminal# for udbg */
|
||||
|
||||
#define __ALIGNED__ __attribute__((__aligned__(sizeof(long))))
|
||||
static void udbg_hvsi_putc(unsigned char c)
|
||||
static void udbg_hvsi_putc(char c)
|
||||
{
|
||||
/* packet's seqno isn't used anyways */
|
||||
uint8_t packet[] __ALIGNED__ = { 0xff, 5, 0, 0, c };
|
||||
@@ -112,7 +112,7 @@ static int udbg_hvsi_getc_poll(void)
|
||||
return ch;
|
||||
}
|
||||
|
||||
static unsigned char udbg_hvsi_getc(void)
|
||||
static char udbg_hvsi_getc(void)
|
||||
{
|
||||
int ch;
|
||||
for (;;) {
|
||||
@@ -128,7 +128,7 @@ static unsigned char udbg_hvsi_getc(void)
|
||||
}
|
||||
}
|
||||
|
||||
static void udbg_putcLP(unsigned char c)
|
||||
static void udbg_putcLP(char c)
|
||||
{
|
||||
char buf[16];
|
||||
unsigned long rc;
|
||||
@@ -173,7 +173,7 @@ static int udbg_getc_pollLP(void)
|
||||
return ch;
|
||||
}
|
||||
|
||||
static unsigned char udbg_getcLP(void)
|
||||
static char udbg_getcLP(void)
|
||||
{
|
||||
int ch;
|
||||
for (;;) {
|
||||
|
Reference in New Issue
Block a user