Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add ifdef NWSDISPLAY > 0 around rascons_* functions usage, 

otherwise implementation is not available, which breaks macppc MAMBO config.

potentially better solution to provide empty implementation, comments welcome.
This commit is contained in:
andvar 2023-09-23 21:26:16 +00:00
parent cbc1d2c479
commit 6d5a047a6e
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/arch/powerpc/oea/ofw_autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ofw_autoconf.c,v 1.25 2022/12/14 13:19:04 macallan Exp $ */
/* $NetBSD: ofw_autoconf.c,v 1.26 2023/09/23 21:26:16 andvar Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
* Copyright (C) 1995, 1996 TooLs GmbH.
@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ofw_autoconf.c,v 1.25 2022/12/14 13:19:04 macallan Exp $");
__KERNEL_RCSID(0, "$NetBSD: ofw_autoconf.c,v 1.26 2023/09/23 21:26:16 andvar Exp $");
#ifdef ofppc
#include "gtpci.h"
@ -82,7 +82,9 @@ static void canonicalize_bootpath(void);
void
cpu_configure(void)
{
#if NWSDISPLAY > 0
rascons_add_rom_font();
#endif
init_interrupt();
canonicalize_bootpath();

6
sys/arch/powerpc/oea/ofwoea_machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ofwoea_machdep.c,v 1.62 2021/12/05 07:13:48 msaitoh Exp $ */
/* $NetBSD: ofwoea_machdep.c,v 1.63 2023/09/23 21:26:16 andvar Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ofwoea_machdep.c,v 1.62 2021/12/05 07:13:48 msaitoh Exp $");
__KERNEL_RCSID(0, "$NetBSD: ofwoea_machdep.c,v 1.63 2023/09/23 21:26:16 andvar Exp $");
#include "ksyms.h"
#include "wsdisplay.h"
@ -270,7 +270,9 @@ ofwoea_initppc(u_int startkernel, u_int endkernel, char *args)
restore_ofmap();
#if NWSDISPLAY > 0
rascons_finalize();
#endif
#if NKSYMS || defined(DDB) || defined(MODULAR)
ksyms_addsyms_elf((int)((uintptr_t)endsym - (uintptr_t)startsym), startsym, endsym);