Re: [GIT PULL] EFI changes

[Matt Fleming <matt-HNK1S37rvNbeXh+fF434Mdi2O/JbrIOy@public.gmane.org>]

On Mon, 28 Oct, at 12:17:41PM, Ingo Molnar wrote:
> 
> * Matt Fleming <matt-HNK1S37rvNbeXh+fF434Mdi2O/JbrIOy@public.gmane.org> wrote:
> 
> > Guys, do you think we could get the EFI earlyprintk support into the
> > 'x86/efi' branch for the upcoming merge window? I know it's quite late
> > in the game but since it's a new feature it shouldn't introduce any kind
> > of regression and is a much needed feature.
> > 
> > The following changes since commit c158c3bf59951bbb44bd7ccca9e6665dfd1617c5:
> > 
> >   boot, efi: Remove redundant memset() (2013-10-04 20:07:47 +0100)
> > 
> > are available in the git repository at:
> > 
> >   git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi.git tags/efi-next
> > 
> > for you to fetch changes up to 32c9e70fc3912c3b9c7d53ce016960ce99ff93d4:
> > 
> >   x86/efi: Add EFI framebuffer earlyprintk support (2013-10-27 21:18:48 +0000)
> 
> This breaks on x86-64 allmodconfig with:
> 
> arch/x86/built-in.o: In function `early_efi_setup':
> early_printk.c:(.init.text+0x27e9f): undefined reference to `get_default_font'

Ooops! The following patch fixes it. Would you like me to squash this
with the top commit on 'efi-next', retag and resend the pull request?

---

diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug
index b6fe388..0f3621e 100644
--- a/arch/x86/Kconfig.debug
+++ b/arch/x86/Kconfig.debug
@@ -61,7 +61,8 @@ config EARLY_PRINTK_DBGP
 
 config EARLY_PRINTK_EFI
 	bool "Early printk via the EFI framebuffer"
-	depends on EFI && EARLY_PRINTK && FONT_SUPPORT
+	depends on EFI && EARLY_PRINTK
+	select FONT_SUPPORT
 	---help---
 	  Write kernel log output directly into the EFI framebuffer.
 
-- 
Matt Fleming, Intel Open Source Technology Center