git: b2a8d7a9b52d - main - loader: fix powerpc build with gfx_fb
Toomas Soome
tsoome at FreeBSD.org
Mon Jan 4 16:58:05 UTC 2021
The branch main has been updated by tsoome:
URL: https://cgit.FreeBSD.org/src/commit/?id=b2a8d7a9b52d588338ded70cb101899e32c1d352
commit b2a8d7a9b52d588338ded70cb101899e32c1d352
Author: Toomas Soome <tsoome at FreeBSD.org>
AuthorDate: 2021-01-04 16:51:58 +0000
Commit: Toomas Soome <tsoome at FreeBSD.org>
CommitDate: 2021-01-04 16:57:58 +0000
loader: fix powerpc build with gfx_fb
Need to add stub data and gfx functions to make linking happy.
---
stand/powerpc/kboot/Makefile | 5 ++-
stand/powerpc/kboot/gfx_fb.c | 78 ++++++++++++++++++++++++++++++++++++++++++++
stand/powerpc/ofw/Makefile | 5 ++-
stand/powerpc/ofw/gfx_fb.c | 78 ++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 164 insertions(+), 2 deletions(-)
diff --git a/stand/powerpc/kboot/Makefile b/stand/powerpc/kboot/Makefile
index 671db88a14a9..8b632ae3d076 100644
--- a/stand/powerpc/kboot/Makefile
+++ b/stand/powerpc/kboot/Makefile
@@ -19,7 +19,10 @@ INSTALLFLAGS= -b
# Architecture-specific loader code
SRCS= conf.c vers.c main.c ppc64_elf_freebsd.c
SRCS+= host_syscall.S hostcons.c hostdisk.c kerneltramp.S kbootfdt.c
-SRCS+= ucmpdi2.c
+SRCS+= ucmpdi2.c gfx_fb.c
+
+CFLAGS.gfx_fb.c += -I${SRCTOP}/contrib/pnglite
+CFLAGS.gfx_fb.c += -I${SRCTOP}/sys/teken
.include "${BOOTSRC}/fdt.mk"
diff --git a/stand/powerpc/kboot/gfx_fb.c b/stand/powerpc/kboot/gfx_fb.c
new file mode 100644
index 000000000000..318e45225e06
--- /dev/null
+++ b/stand/powerpc/kboot/gfx_fb.c
@@ -0,0 +1,78 @@
+/*-
+ * Copyright 2021 Toomas Soome <tsoome at 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>
+__FBSDID("$FreeBSD$");
+
+/*
+ * powerpc specific 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/powerpc/ofw/Makefile b/stand/powerpc/ofw/Makefile
index b247b8b73e2d..a35a7c7c56bf 100644
--- a/stand/powerpc/ofw/Makefile
+++ b/stand/powerpc/ofw/Makefile
@@ -18,7 +18,10 @@ 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
+SRCS+= ucmpdi2.c gfx_fb.c
+
+CFLAGS.gfx_fb.c += -I${SRCTOP}/contrib/pnglite
+CFLAGS.gfx_fb.c += -I${SRCTOP}/sys/teken
.include "${BOOTSRC}/fdt.mk"
.if ${MK_FDT} == "yes"
diff --git a/stand/powerpc/ofw/gfx_fb.c b/stand/powerpc/ofw/gfx_fb.c
new file mode 100644
index 000000000000..318e45225e06
--- /dev/null
+++ b/stand/powerpc/ofw/gfx_fb.c
@@ -0,0 +1,78 @@
+/*-
+ * Copyright 2021 Toomas Soome <tsoome at 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>
+__FBSDID("$FreeBSD$");
+
+/*
+ * powerpc specific 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);
+}
More information about the dev-commits-src-all
mailing list