d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

loader: fix powerpc build with gfx_fb

Browse Source 
Need to add stub data and gfx functions to make linking happy.
This commit is contained in:
Toomas Soome 2021-01-04 16:51:58 +00:00
parent e24d4e72c0
commit b2a8d7a9b5
4 changed files with 164 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
stand/powerpc/kboot/Makefile
View File

@ -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"

78
stand/powerpc/kboot/gfx_fb.c Normal file
View File

@ -0,0 +1,78 @@
/*-
* 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>
__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);
}

5
stand/powerpc/ofw/Makefile
View File

@ -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"

78
stand/powerpc/ofw/gfx_fb.c Normal file
View File

@ -0,0 +1,78 @@
/*-
* 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>
__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);
}