From nobody Tue Apr 16 20:12:48 2024 X-Original-To: dev-commits-src-branches@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 4VJwFY1XQPz5H0F9; Tue, 16 Apr 2024 20:12:49 +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 4VJwFX6w1Bz4tBS; Tue, 16 Apr 2024 20:12:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713298369; 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=OIx5rf7pBcp+sCgMmsVwCm88YkHFuz8cPyZZvgcXBS0=; b=E3eK4CibwrngcrDRWhy24b4IRVewyuWoE0XuENP5MiE6dAeQe1vVB2ulmk5B4gXDlhgfBp 49uxwnS43kfK/iPtpmAhcqwRPeJDfhHPLi6op7RcL84OBkNPiMcrI69cw4EHzhZSHhd8vr C97132BjTTv6c1NR4c3OY1/pl2KSF4lZ/4OTI/+rj5uVi5b4gdL5196Pk0+tSqLurCS19y NMI6rkIslOyOusQrW9UTKZjwTpDmD/zFczqgfAQo1aNR7v6rLd+jl6cpG2s4dnIGdDYGr0 xWjpgMoJ7pRS7f1mFno0AkaqmuttotKsoagbfs7euiqxJDJNaAnpsDdSoO2NDg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713298369; a=rsa-sha256; cv=none; b=LSDYCvEuCBbbWQoOh8oelmBveZjyZnefZFfKqz/bgvZJy/bJyg775CZsV77AeSTlMh69yf N5kygh0p6x8mawRJUUSMIuEr3Hvojl3uGViuDVcEBxnHuEhdnItd5yayJQeEn04ElfnCy5 2aydetgS1e6xGAM6Ad2q+SWCVAWNY3OFIjVKEIfI483tSE0CT+LP2EuCwymI1KCZqg1qXn MNQjNIv3UoQ7XZNsib2g9Qkhgo4cNE1Qq8CTiipO0twZ/d6/148L6VSwpjvnZyC1p/awYW MpR0xpPANbQospmdOeIBEeMYFnlizXneOLIpSoyY52F1tmUygwj3IqhlHWq+MA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713298369; 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=OIx5rf7pBcp+sCgMmsVwCm88YkHFuz8cPyZZvgcXBS0=; b=RKM+y7UcEpi8WNN9ShyeM1mqqL0hNY6Y/NapvI/pcPhBy7fOjWmUa9pRDVLc4NBJMdMpYb qkg9Zeag8Vk/RKWc1OXn5mMOVa9VSbU3kfz8hgiPVCNR72FbF7wKecmobF+FHt+RUnCXl/ ElAvWRCauGfDGLJl6ZloZGLsrjDbpQ4V6u/YF/Ady3jpetSTadFRt/V5eC+4Z/NvPHzglz 36JvYadu9d0Mu4ohbgUHbrGjGfjDZiqcAoVVHEkILh+dHveKxuHywY4fI3J5f28tOCsNUP qTXQeZgkcYesx9dPkpvEQ1r5v/3FhMgg8IKJX2YoibW2W9FTSAHYXk84H7SfOg== 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 4VJwFX6V4DzxY1; Tue, 16 Apr 2024 20:12:48 +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 43GKCmE0037943; Tue, 16 Apr 2024 20:12:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43GKCmbe037940; Tue, 16 Apr 2024 20:12:48 GMT (envelope-from git) Date: Tue, 16 Apr 2024 20:12:48 GMT Message-Id: <202404162012.43GKCmbe037940@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: e55748d65b74 - stable/14 - loader: Remove gfx_fb_stub.c, it's no longer needed List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: e55748d65b746a4ae14e20cdf471398581d3b08a Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=e55748d65b746a4ae14e20cdf471398581d3b08a commit e55748d65b746a4ae14e20cdf471398581d3b08a Author: Warner Losh AuthorDate: 2024-02-16 03:53:39 +0000 Commit: Warner Losh CommitDate: 2024-04-16 19:54:24 +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 (cherry picked from commit 23d9b5c9febf4b02957d01bc46ee75530b0dcb4a) --- 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