Commit b0d46fe5 authored by Paul Mackerras's avatar Paul Mackerras

PPC32: remove some compiler warnings, xmon update

parent 237f483c
...@@ -195,17 +195,20 @@ map_boot_text(void) ...@@ -195,17 +195,20 @@ map_boot_text(void)
{ {
unsigned long base, offset, size; unsigned long base, offset, size;
boot_infos_t *bi = &disp_bi; boot_infos_t *bi = &disp_bi;
unsigned char *vbase;
/* By default, we are no longer mapped */
boot_text_mapped = 0;
if (bi->dispDeviceBase == 0) if (bi->dispDeviceBase == 0)
return; return;
base = ((unsigned long) bi->dispDeviceBase) & 0xFFFFF000UL; base = ((unsigned long) bi->dispDeviceBase) & 0xFFFFF000UL;
offset = ((unsigned long) bi->dispDeviceBase) - base; offset = ((unsigned long) bi->dispDeviceBase) - base;
size = bi->dispDeviceRowBytes * bi->dispDeviceRect[3] + offset size = bi->dispDeviceRowBytes * bi->dispDeviceRect[3] + offset
+ bi->dispDeviceRect[0]; + bi->dispDeviceRect[0];
bi->logicalDisplayBase = ioremap(base, size); vbase = ioremap(base, size);
if (bi->logicalDisplayBase == 0) if (vbase == 0)
return; return;
bi->logicalDisplayBase += offset; bi->logicalDisplayBase = vbase + offset;
boot_text_mapped = 1; boot_text_mapped = 1;
} }
......
...@@ -288,8 +288,6 @@ void __init MMU_init(void) ...@@ -288,8 +288,6 @@ void __init MMU_init(void)
ppc_md.progress("MMU:exit", 0x211); ppc_md.progress("MMU:exit", 0x211);
#ifdef CONFIG_BOOTX_TEXT #ifdef CONFIG_BOOTX_TEXT
/* By default, we are no longer mapped */
boot_text_mapped = 0;
/* Must be done last, or ppc_md.progress will die. */ /* Must be done last, or ppc_md.progress will die. */
map_boot_text(); map_boot_text();
#endif #endif
......
...@@ -32,6 +32,7 @@ unsigned int TXRDY, RXRDY, DLAB; ...@@ -32,6 +32,7 @@ unsigned int TXRDY, RXRDY, DLAB;
extern void xmon_printf(const char *fmt, ...); extern void xmon_printf(const char *fmt, ...);
static int xmon_expect(const char *str, unsigned int timeout); static int xmon_expect(const char *str, unsigned int timeout);
static int use_serial;
static int use_screen; static int use_screen;
static int via_modem; static int via_modem;
static int xmon_use_sccb; static int xmon_use_sccb;
...@@ -116,13 +117,12 @@ xmon_map_scc(void) ...@@ -116,13 +117,12 @@ xmon_map_scc(void)
#ifdef CONFIG_ALL_PPC #ifdef CONFIG_ALL_PPC
volatile unsigned char *base; volatile unsigned char *base;
use_screen = 0;
if (_machine == _MACH_Pmac) { if (_machine == _MACH_Pmac) {
struct device_node *np; struct device_node *np;
unsigned long addr; unsigned long addr;
#ifdef CONFIG_BOOTX_TEXT #ifdef CONFIG_BOOTX_TEXT
if (!machine_is_compatible("iMac")) { if (!use_screen && !use_serial
&& !machine_is_compatible("iMac")) {
/* see if there is a keyboard in the device tree /* see if there is a keyboard in the device tree
with a parent of type "adb" */ with a parent of type "adb" */
for (np = find_devices("keyboard"); np; np = np->next) for (np = find_devices("keyboard"); np; np = np->next)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment