svn commit: r368373 - in head/sys: conf dev/syscons

[Michal Meloun]

Author: mmel
Date: Sat Dec  5 19:44:00 2020
New Revision: 368373
URL: https://svnweb.freebsd.org/changeset/base/368373

Log:
  Remove remaning definition of GFB_<foo> options.
  They are not used in source files.
  This fixes build of some arm boards after r368159.
  
  Reported by: mjg

Modified:
  head/sys/conf/options.mips
  head/sys/conf/options.powerpc
  head/sys/dev/syscons/scgfbrndr.c

Modified: head/sys/conf/options.mips
==============================================================================
--- head/sys/conf/options.mips	Sat Dec  5 14:53:24 2020	(r368372)
+++ head/sys/conf/options.mips	Sat Dec  5 19:44:00 2020	(r368373)
@@ -66,10 +66,6 @@ CFE_CONSOLE	opt_global.h
 CFE_ENV		opt_global.h
 CFE_ENV_SIZE	opt_global.h
 
-GFB_DEBUG		opt_gfb.h
-GFB_NO_FONT_LOADING	opt_gfb.h
-GFB_NO_MODE_CHANGE	opt_gfb.h
-
 NOFPU		opt_global.h
 
 TICK_USE_YAMON_FREQ	opt_global.h

Modified: head/sys/conf/options.powerpc
==============================================================================
--- head/sys/conf/options.powerpc	Sat Dec  5 14:53:24 2020	(r368372)
+++ head/sys/conf/options.powerpc	Sat Dec  5 19:44:00 2020	(r368373)
@@ -15,10 +15,6 @@ FPU_EMU
 
 COMPAT_FREEBSD32	opt_global.h
 
-GFB_DEBUG		opt_gfb.h
-GFB_NO_FONT_LOADING	opt_gfb.h
-GFB_NO_MODE_CHANGE	opt_gfb.h
-
 MOEA64_STATS		opt_pmap.h
 AMIGAONE		opt_platform.h
 MIKROTIK		opt_platform.h

Modified: head/sys/dev/syscons/scgfbrndr.c
==============================================================================
--- head/sys/dev/syscons/scgfbrndr.c	Sat Dec  5 14:53:24 2020	(r368372)
+++ head/sys/dev/syscons/scgfbrndr.c	Sat Dec  5 19:44:00 2020	(r368373)
@@ -32,7 +32,6 @@
 __FBSDID("$FreeBSD$");
 
 #include "opt_syscons.h"
-#include "opt_gfb.h"
 #ifdef __powerpc__
 #include "opt_ofwfb.h"
 #endif