提交 52020d2b 编写于 作者: A Andy Whitcroft 提交者: 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: NAndy Whitcroft <apw@shadowen.org>
Signed-off-by: NPaul Mackerras <paulus@samba.org>
上级 2bf6a8fa
......@@ -171,9 +171,12 @@ int udbg_adb_init(int force_btext)
udbg_adb_old_getc_poll = udbg_getc_poll;
/* Check if our early init was already called */
if (udbg_adb_old_putc == udbg_adb_putc ||
udbg_adb_old_putc == btext_drawchar)
if (udbg_adb_old_putc == udbg_adb_putc)
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 */
udbg_putc = udbg_adb_putc;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册