Skip to contentSkip to conversation

m68k/head.S: CONSOLE_DEBUG should depend on CONFIG_FONT_SUPPORT

PATCH In review Geert Uytterhoeven 2 participants 2 messages May 27, 2014 m68k architecture

lore
Share & tools
lore

Geert Uytterhoeven

author maintainer
#0 lore raw

PATCH 1/1 m68k/head.S: CONSOLE_DEBUG should depend on CONFIG_FONT_SUPPORT

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.

---
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(-)
arch/m68k/kernel/head.S +1 -1
index 673dcaf0a55c..dbb118e1a4e0 100644
@@ -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
Signature · 1 line
1.9.1
#1 lore raw
Quoted 5 lines · 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

Thanks for fixing this.