git: 23d9b5c9febf - main - loader: Remove gfx_fb_stub.c, it's no longer needed

From: Warner Losh <imp_at_FreeBSD.org>
Date: Fri, 16 Feb 2024 04:00:27 UTC
The branch main has been updated by imp:

URL: https://cgit.FreeBSD.org/src/commit/?id=23d9b5c9febf4b02957d01bc46ee75530b0dcb4a

commit 23d9b5c9febf4b02957d01bc46ee75530b0dcb4a
Author:     Warner Losh <imp@FreeBSD.org>
AuthorDate: 2024-02-16 03:53:39 +0000
Commit:     Warner Losh <imp@FreeBSD.org>
CommitDate: 2024-02-16 03:59:23 +0000

    loader: Remove gfx_fb_stub.c, it's no longer needed
    
    Now that we draw in the gfx bindings for all our interpreters only when
    graphics support is compiled in, we can eliminate this from all the
    loaders that don't have graphics support.
    
    Sponsored by:           Netflix
    Reviewed by:            kevans, jhb
    Differential Revision:  https://reviews.freebsd.org/D43905
---
 stand/common/gfx_fb_stub.c       | 76 ----------------------------------------
 stand/kboot/kboot/Makefile       |  2 --
 stand/powerpc/ofw/Makefile       |  4 +--
 stand/uboot/Makefile             |  3 +-
 stand/userboot/userboot/Makefile |  2 --
 5 files changed, 2 insertions(+), 85 deletions(-)

diff --git a/stand/common/gfx_fb_stub.c b/stand/common/gfx_fb_stub.c
deleted file mode 100644
index a4ebdeb8c388..000000000000
--- a/stand/common/gfx_fb_stub.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/*-
- * Copyright 2021 Toomas Soome <tsoome@freebsd.org>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-/*
- * Generic gfx stubs.
- */
-
-#include <sys/types.h>
-#include <pnglite.h>
-#include "bootstrap.h"
-#include "gfx_fb.h"
-
-font_list_t fonts = STAILQ_HEAD_INITIALIZER(fonts);
-teken_gfx_t gfx_state = { 0 };
-
-void
-gfx_fb_setpixel(uint32_t x __unused, uint32_t y __unused)
-{
-}
-
-void
-gfx_fb_drawrect(uint32_t x1 __unused, uint32_t y1 __unused,
-    uint32_t x2 __unused, uint32_t y2 __unused, uint32_t fill __unused)
-{
-}
-
-void
-gfx_term_drawrect(uint32_t x1 __unused, uint32_t y1 __unused,
-    uint32_t x2 __unused, uint32_t y2 __unused)
-{
-}
-
-void
-gfx_fb_line(uint32_t x0 __unused, uint32_t y0 __unused,
-    uint32_t x1 __unused, uint32_t y1 __unused, uint32_t w __unused)
-{
-}
-
-void
-gfx_fb_bezier(uint32_t x0 __unused, uint32_t y0 __unused,
-    uint32_t x1 __unused, uint32_t y1 __unused, uint32_t x2 __unused,
-    uint32_t y2 __unused, uint32_t w __unused)
-{
-}
-
-int
-gfx_fb_putimage(png_t *png __unused, uint32_t ux1 __unused,
-    uint32_t uy1 __unused, uint32_t ux2 __unused, uint32_t uy2 __unused,
-    uint32_t flags __unused)
-{
-	return (1);
-}
diff --git a/stand/kboot/kboot/Makefile b/stand/kboot/kboot/Makefile
index 055027b85eb2..2e68a9ba9214 100644
--- a/stand/kboot/kboot/Makefile
+++ b/stand/kboot/kboot/Makefile
@@ -21,7 +21,6 @@ INSTALLFLAGS=	-b
 SRCS=	\
 		bootinfo.c \
 		conf.c \
-		gfx_fb_stub.c \
 		hostcons.c \
 		hostdisk.c \
 		hostfs.c \
@@ -32,7 +31,6 @@ SRCS=	\
 		util.c \
 		vers.c
 
-CFLAGS.gfx_fb_stub.c += -I${SRCTOP}/contrib/pnglite -I${SRCTOP}/sys/teken
 .if ${MK_LOADER_ZFS} != "no"
 CFLAGS+=	-I${ZFSSRC}
 CFLAGS+=        -I${SYSDIR}/contrib/openzfs/include
diff --git a/stand/powerpc/ofw/Makefile b/stand/powerpc/ofw/Makefile
index 3e4c92220fac..b7cbbd9fca00 100644
--- a/stand/powerpc/ofw/Makefile
+++ b/stand/powerpc/ofw/Makefile
@@ -17,9 +17,7 @@ INSTALLFLAGS=	-b
 
 # Architecture-specific loader code
 SRCS=		conf.c vers.c main.c elf_freebsd.c ppc64_elf_freebsd.c start.c
-SRCS+=		ucmpdi2.c gfx_fb_stub.c
-
-CFLAGS.gfx_fb_stub.c += -I${SRCTOP}/contrib/pnglite -I${SRCTOP}/sys/teken
+SRCS+=		ucmpdi2.c
 
 .include	"${BOOTSRC}/fdt.mk"
 .if ${MK_FDT} == "yes"
diff --git a/stand/uboot/Makefile b/stand/uboot/Makefile
index 83ac5949cbb3..4405f09408bf 100644
--- a/stand/uboot/Makefile
+++ b/stand/uboot/Makefile
@@ -46,10 +46,9 @@ LDFLAGS+=	-Wl,-znotext
 
 SRCS+=		main.c vers.c
 SRCS+=		copy.c devicename.c elf_freebsd.c glue.c
-SRCS+=		net.c reboot.c time.c gfx_fb_stub.c
+SRCS+=		net.c reboot.c time.c
 SRCS+=		uboot_console.c uboot_disk.c uboot_fdt.c uboot_module.c
 
-CFLAGS.gfx_fb_stub.c += -I${SRCTOP}/contrib/pnglite -I${SRCTOP}/sys/teken
 CFLAGS.glue.c+=	-DHAVE_MEMCPY -I${SRCTOP}/sys/contrib/zlib
 
 CFLAGS+=	-I${BOOTSRC}/common
diff --git a/stand/userboot/userboot/Makefile b/stand/userboot/userboot/Makefile
index d652f2b53968..15ac8701e4d4 100644
--- a/stand/userboot/userboot/Makefile
+++ b/stand/userboot/userboot/Makefile
@@ -31,7 +31,6 @@ SRCS+=		main.c
 SRCS+=		userboot_cons.c
 SRCS+=		userboot_disk.c
 SRCS+=		vers.c
-SRCS+=		gfx_fb_stub.c
 
 CFLAGS+=	-Wall
 CFLAGS+=	-I${BOOTSRC}/userboot
@@ -43,7 +42,6 @@ CFLAGS.main.c+=	-I${SYSDIR}/contrib/openzfs/include/os/freebsd/zfs
 .endif
 
 CWARNFLAGS.main.c += -Wno-implicit-function-declaration
-CFLAGS.gfx_fb_stub.c += -I${SRCTOP}/contrib/pnglite -I${SRCTOP}/sys/teken
 
 NEWVERSWHAT=	"User boot ${LOADER_INTERP}" ${MACHINE_CPUARCH}
 VERSION_FILE=	${.CURDIR}/../userboot/version