Commit 52020d2b authored by Andy Whitcroft's avatar Andy Whitcroft Committed by Paul Mackerras

[PATCH] powerpc: powermac adb fix dependency on btext_drawchar

udbg_adb_init() has become dependent on btext_drawchar, even when
BOOTX_TEXT support is not selected.  This leads to the error below.
Make the check dependant on BOOTX_TEXT.

      LD      .tmp_vmlinux1
    arch/powerpc/platforms/built-in.o(.toc1+0xa40): undefined
					reference to `btext_drawchar'
Signed-off-by: default avatarAndy Whitcroft <apw@shadowen.org>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 2bf6a8fa
...@@ -171,9 +171,12 @@ int udbg_adb_init(int force_btext) ...@@ -171,9 +171,12 @@ int udbg_adb_init(int force_btext)
udbg_adb_old_getc_poll = udbg_getc_poll; udbg_adb_old_getc_poll = udbg_getc_poll;
/* Check if our early init was already called */ /* Check if our early init was already called */
if (udbg_adb_old_putc == udbg_adb_putc || if (udbg_adb_old_putc == udbg_adb_putc)
udbg_adb_old_putc == btext_drawchar)
udbg_adb_old_putc = NULL; udbg_adb_old_putc = NULL;
#ifdef CONFIG_BOOTX_TEXT
if (udbg_adb_old_putc == btext_drawchar)
udbg_adb_old_putc = NULL;
#endif
/* Set ours as output */ /* Set ours as output */
udbg_putc = udbg_adb_putc; udbg_putc = udbg_adb_putc;
......
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