| Message ID | 20240307180742.900068-1-andreas@gaisler.com |
|---|---|
| State | New |
| Headers | show |
| Series | lib/fonts: Allow Sparc console 8x16 font for sparc64 early boot text console | expand |
* Andreas Larsson (andreas@gaisler.com) wrote: > Allow FONT_SUN8x16 when EARLYFB is enabled for sparc64, even when > FRAMEBUFFER_CONSOLE is not to avoid the following warning for this case > > WARNING: unmet direct dependencies detected for FONT_SUN8x16 > Depends on [n]: FONT_SUPPORT [=y] && (FRAMEBUFFER_CONSOLE [=n] && (FONTS [=n] || SPARC [=y]) || BOOTX_TEXT) > Selected by [y]: > - EARLYFB [=y] && SPARC64 [=y] > > by allowing it in the same manner as is done for powerpc in commit > 0ebc7feae79a ("powerpc: Use shared font data"). Yeh that looks like it should do it; I was hoping there was a way to make that line simpler, but hey, thanks for fixing it. Reviewed-by: Dr. David Alan Gilbert <linux@treblig.org> > Signed-off-by: Andreas Larsson <andreas@gaisler.com> > Fixes: 0f1991949d9b ("sparc: Use shared font data") > Reported-by: kernel test robot <lkp@intel.com> > Closes: https://lore.kernel.org/oe-kbuild-all/202402241539.epQT43nI-lkp@intel.com/ > Cc: "Dr. David Alan Gilbert" <linux@treblig.org> > Cc: Michael Ellerman <mpe@ellerman.id.au> > Cc: Sam Ravnborg <sam@ravnborg.org> > Cc: Randy Dunlap <rdunlap@infradead.org> > Cc: "David S. Miller" <davem@davemloft.net> > --- > The commit this fixes can be found on my for-next branch from > https://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc.git/ > --- > lib/fonts/Kconfig | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/lib/fonts/Kconfig b/lib/fonts/Kconfig > index 7ee468ef21ec6..7e945fdcbf115 100644 > --- a/lib/fonts/Kconfig > +++ b/lib/fonts/Kconfig > @@ -98,7 +98,8 @@ config FONT_10x18 > > config FONT_SUN8x16 > bool "Sparc console 8x16 font" > - depends on (FRAMEBUFFER_CONSOLE && (FONTS || SPARC)) || BOOTX_TEXT > + depends on (FRAMEBUFFER_CONSOLE && (FONTS || SPARC)) || \ > + BOOTX_TEXT || EARLYFB > help > This is the high resolution console font for Sun machines. Say Y. > > > base-commit: 626db6ee8ee1edac206610db407114aa83b53fd3 > -- > 2.34.1 >
On 2024-03-07 19:07, Andreas Larsson wrote: > Allow FONT_SUN8x16 when EARLYFB is enabled for sparc64, even when > FRAMEBUFFER_CONSOLE is not to avoid the following warning for this case > > WARNING: unmet direct dependencies detected for FONT_SUN8x16 > Depends on [n]: FONT_SUPPORT [=y] && (FRAMEBUFFER_CONSOLE [=n] && (FONTS [=n] || SPARC [=y]) || BOOTX_TEXT) > Selected by [y]: > - EARLYFB [=y] && SPARC64 [=y] > > by allowing it in the same manner as is done for powerpc in commit > 0ebc7feae79a ("powerpc: Use shared font data"). > > Signed-off-by: Andreas Larsson <andreas@gaisler.com> > Fixes: 0f1991949d9b ("sparc: Use shared font data") > Reported-by: kernel test robot <lkp@intel.com> > Closes: https://lore.kernel.org/oe-kbuild-all/202402241539.epQT43nI-lkp@intel.com/ > Cc: "Dr. David Alan Gilbert" <linux@treblig.org> > Cc: Michael Ellerman <mpe@ellerman.id.au> > Cc: Sam Ravnborg <sam@ravnborg.org> > Cc: Randy Dunlap <rdunlap@infradead.org> > Cc: "David S. Miller" <davem@davemloft.net> Picking this up to my for-next. Cheers, Andreas
diff --git a/lib/fonts/Kconfig b/lib/fonts/Kconfig index 7ee468ef21ec6..7e945fdcbf115 100644 --- a/lib/fonts/Kconfig +++ b/lib/fonts/Kconfig @@ -98,7 +98,8 @@ config FONT_10x18 config FONT_SUN8x16 bool "Sparc console 8x16 font" - depends on (FRAMEBUFFER_CONSOLE && (FONTS || SPARC)) || BOOTX_TEXT + depends on (FRAMEBUFFER_CONSOLE && (FONTS || SPARC)) || \ + BOOTX_TEXT || EARLYFB help This is the high resolution console font for Sun machines. Say Y.
Allow FONT_SUN8x16 when EARLYFB is enabled for sparc64, even when FRAMEBUFFER_CONSOLE is not to avoid the following warning for this case WARNING: unmet direct dependencies detected for FONT_SUN8x16 Depends on [n]: FONT_SUPPORT [=y] && (FRAMEBUFFER_CONSOLE [=n] && (FONTS [=n] || SPARC [=y]) || BOOTX_TEXT) Selected by [y]: - EARLYFB [=y] && SPARC64 [=y] by allowing it in the same manner as is done for powerpc in commit 0ebc7feae79a ("powerpc: Use shared font data"). Signed-off-by: Andreas Larsson <andreas@gaisler.com> Fixes: 0f1991949d9b ("sparc: Use shared font data") Reported-by: kernel test robot <lkp@intel.com> Closes: https://lore.kernel.org/oe-kbuild-all/202402241539.epQT43nI-lkp@intel.com/ Cc: "Dr. David Alan Gilbert" <linux@treblig.org> Cc: Michael Ellerman <mpe@ellerman.id.au> Cc: Sam Ravnborg <sam@ravnborg.org> Cc: Randy Dunlap <rdunlap@infradead.org> Cc: "David S. Miller" <davem@davemloft.net> --- The commit this fixes can be found on my for-next branch from https://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc.git/ --- lib/fonts/Kconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) base-commit: 626db6ee8ee1edac206610db407114aa83b53fd3