public inbox for linux-m68k@lists.linux-m68k.org
 help / color / mirror / Atom feed
* [PATCH] m68k/head.S: CONSOLE_DEBUG should depend on CONFIG_FONT_SUPPORT
@ 2014-05-27  7:41 Geert Uytterhoeven
  2014-05-27  9:50 ` Finn Thain
  0 siblings, 1 reply; 2+ messages in thread
From: Geert Uytterhoeven @ 2014-05-27  7:41 UTC (permalink / raw)
  To: Finn Thain; +Cc: linux-m68k, Geert Uytterhoeven

allmodconfig:

arch/m68k/kernel/head.o: In function `debug_cons_nputs':
(.init.text+0x1500): undefined reference to `font_vga_8x8'
make[3]: *** [vmlinux] Error 1

CONFIG_FONT_8x8=y, but CONFIG_FRAMEBUFFER_CONSOLE=m and
CONFIG_FONT_SUPPORT=m, causing the font to be modular.

Introduced by commit 0ff3cc858e74436c2234183ea2dd200474cba09a ("m68k:
Multi-platform EARLY_PRINTK"), which dropped a dependency on
CONFIG_FRAMEBUFFER_CONSOLE (FRAMEBUFFER_CONSOLE selects FONT_SUPPORT).

Make CONSOLE_DEBUG depend on CONFIG_FONT_SUPPORT to fix this.

Reported-by: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
To be folded into "m68k: Multi-platform EARLY_PRINTK" in m68k-queue and
for-3.16.

 arch/m68k/kernel/head.S | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/m68k/kernel/head.S b/arch/m68k/kernel/head.S
index 673dcaf0a55c..dbb118e1a4e0 100644
--- a/arch/m68k/kernel/head.S
+++ b/arch/m68k/kernel/head.S
@@ -273,7 +273,7 @@
 
 #ifdef CONFIG_EARLY_PRINTK
 #  define SERIAL_DEBUG
-#  ifdef CONFIG_MAC
+#  if defined(CONFIG_MAC) && defined(CONFIG_FONT_SUPPORT)
 #    define CONSOLE_DEBUG
 #  endif
 #endif
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] m68k/head.S: CONSOLE_DEBUG should depend on CONFIG_FONT_SUPPORT
  2014-05-27  7:41 [PATCH] m68k/head.S: CONSOLE_DEBUG should depend on CONFIG_FONT_SUPPORT Geert Uytterhoeven
@ 2014-05-27  9:50 ` Finn Thain
  0 siblings, 0 replies; 2+ messages in thread
From: Finn Thain @ 2014-05-27  9:50 UTC (permalink / raw)
  To: Geert Uytterhoeven; +Cc: linux-m68k


On Tue, 27 May 2014, Geert Uytterhoeven wrote:

> allmodconfig:
> 
> arch/m68k/kernel/head.o: In function `debug_cons_nputs':
> (.init.text+0x1500): undefined reference to `font_vga_8x8'
> make[3]: *** [vmlinux] Error 1

Thanks for fixing this.

-- 

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2014-05-27  9:50 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-05-27  7:41 [PATCH] m68k/head.S: CONSOLE_DEBUG should depend on CONFIG_FONT_SUPPORT Geert Uytterhoeven
2014-05-27  9:50 ` Finn Thain

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox