Page MenuHomeFreeBSD
Files F108083777

D43905.diff
No OneTemporary
Actions

D43905.diff
View Options

diff --git a/stand/common/gfx_fb_stub.c b/stand/common/gfx_fb_stub.c
deleted file mode 100644
--- 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
--- a/stand/kboot/kboot/Makefile
+++ b/stand/kboot/kboot/Makefile
@@ -21,7 +21,6 @@
SRCS= \
bootinfo.c \
conf.c \
- gfx_fb_stub.c \
hostcons.c \
hostdisk.c \
hostfs.c \
@@ -32,7 +31,6 @@
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
--- a/stand/powerpc/ofw/Makefile
+++ b/stand/powerpc/ofw/Makefile
@@ -17,9 +17,7 @@
# 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
--- a/stand/uboot/Makefile
+++ b/stand/uboot/Makefile
@@ -46,10 +46,9 @@
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
--- a/stand/userboot/userboot/Makefile
+++ b/stand/userboot/userboot/Makefile
@@ -31,7 +31,6 @@
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 @@
.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

File Metadata

Mime Type
text/plain
Expires
Wed, Jan 22, 6:01 AM (20 h, 12 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16025788
Default Alt Text
D43905.diff (4 KB)

Event Timeline