From nobody Fri Feb 16 04:00:27 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TbdWJ2Cqxz59ZGk; Fri, 16 Feb 2024 04:00:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TbdWJ0BgYz4HNW; Fri, 16 Feb 2024 04:00:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708056028; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=puoDqWPSMZ9KdgUk03lczYLaPDXictUrUlnXIH7sx+E=; b=m/U0l9uysUfCTH9pgtpObT1hDVOCuokphYqfFnIFWes4CnmzAsbow9qMZd2CH6SfPXSZVY VEjdsxq2hYdnXrwa/Cr+LOqxtCVhsRGAuLavSGd4/wABokAcDhk7xpaQ93mBG8MhNulPvJ YEo8KGIPhS3m7y+L6ST7eicDO4U3xjlJQ/8sznkhCQ5skmUKSLiijhTO7rdztEc3QlxUlr Wr67ngpn9LtkpYRElqLo56ZaTAbbMUDcbObxin77PPzJiFiYcBNlun16F4Xa5KP4UMEPWQ Aow1IwHb1BHastFwndwc9pfNqoQIUnloTULnKyeVuWXrOBxLJHnAkQKwxBxJgg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708056028; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=puoDqWPSMZ9KdgUk03lczYLaPDXictUrUlnXIH7sx+E=; b=cjUImclHv3m8IhMQMTOYidoyz5NgbHV7xZHqJREo4D+Kwbl2YzPIXgT5KFBJauqN71CFjq ykytw7It3gptmuwoCmbJE93HN8wHH56alO7Nol7Pt/1y8tNZnpwB1roaq/3EMwMsSBA9Yn l5o0UaEvt+fNasxwKtTypcH1qxP3aZVxOEM9zijgtjH+vQL/7WNR3oYSZfLG822ibM2VGm BNR3m008X0y5aItF9IKaSeZV5Xfp6eSRYhiwc1QEALmheqdY93jxB3/tCxWxVhu2C9ALLY +CkMJO8oSU0jLWyaFfhmoaw3E3DHhOH1TIsUvAAweZbKVu+/4VJH7j6axDfg5w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708056028; a=rsa-sha256; cv=none; b=CtPE0FD8XEnPfFny8IxH6+trX3Vc9LhvYzzxKZy7/gQ/2kDSJPuJqJcuVlDkGVwjiUsD4P uq328xw3bWlRzUuWdzjWEXF3vZK18K5IAYGJXT1d09brYZ+oaYoW1Ub5de1FGYaGXsY5u0 Vc90Ls5AK54sTl7Y8Bzbd3UvcFg8wj0XSQ5hqGrng0SgmhXd+O1ocWO/P9cxAqNNV83i1/ zKkkF96io21osYXmyfKmcS8043/Xw6VFOYpY2E+HboLAbmpfDUhH79JBoeI7vyYvwOz7VM CgmPoVGIk4k6aaXcpvFYayYcpaNBYiCxKUv3QSxFjfDFmYFgZmKscqxl9u2GSw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TbdWH6HTzz18Pm; Fri, 16 Feb 2024 04:00:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41G40RZg019053; Fri, 16 Feb 2024 04:00:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41G40RiK019050; Fri, 16 Feb 2024 04:00:27 GMT (envelope-from git) Date: Fri, 16 Feb 2024 04:00:27 GMT Message-Id: <202402160400.41G40RiK019050@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 23d9b5c9febf - main - loader: Remove gfx_fb_stub.c, it's no longer needed List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 23d9b5c9febf4b02957d01bc46ee75530b0dcb4a Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=23d9b5c9febf4b02957d01bc46ee75530b0dcb4a commit 23d9b5c9febf4b02957d01bc46ee75530b0dcb4a Author: Warner Losh AuthorDate: 2024-02-16 03:53:39 +0000 Commit: Warner Losh 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 - * 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 -/* - * Generic gfx stubs. - */ - -#include -#include -#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