 @@ -1,14 +1,14 @@
-/*	$NetBSD: obs266_machdep.c,v 1.23 2021/03/30 01:33:50 rin Exp $	*/
+/*	$NetBSD: obs266_machdep.c,v 1.24 2021/03/30 01:47:44 rin Exp $	*/
 /*	Original: md_machdep.c,v 1.3 2005/01/24 18:47:37 shige Exp $	*/
 /*
  * Copyright 2001, 2002 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Eduardo Horvath and Simon Burge for Wasabi Systems, Inc.
+ *
  * 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.
 @@ -58,27 +58,27 @@
  * THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``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 TOOLS GMBH 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>
-__KERNEL_RCSID(0, "$NetBSD: obs266_machdep.c,v 1.23 2021/03/30 01:33:50 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obs266_machdep.c,v 1.24 2021/03/30 01:47:44 rin Exp $");
 #include "opt_compat_netbsd.h"
 #include "opt_ddb.h"
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/ksyms.h>
 #include <sys/mount.h>
 #include <sys/reboot.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/module.h>
 #include <sys/bus.h>
 @@ -121,27 +121,27 @@ __KERNEL_RCSID(0, "$NetBSD: obs266_machd
 #endif	/* NCOM */
 #define	TLB_PG_SIZE 	(16*1024*1024)
 void initppc(vaddr_t, vaddr_t, char *, void *);
 void
 initppc(vaddr_t startkernel, vaddr_t endkernel, char *args, void *info_block)
+{
 	vaddr_t va;
 	u_int memsize;
 	/* Setup board from OpenBIOS */
-	openbios_board_init(info_block, startkernel);
+	openbios_board_init(info_block);
 	memsize = openbios_board_memsize_get();
 	/* Linear map kernel memory */
 	for (va = 0; va < endkernel; va += TLB_PG_SIZE)
 		ppc4xx_tlb_reserve(va, va, TLB_PG_SIZE, TLB_EX);
 	/* Map console after RAM (see pmap_tlbmiss()) */
 	ppc4xx_tlb_reserve(CONADDR, roundup(memsize, TLB_PG_SIZE), TLB_PG_SIZE,
 	    TLB_I | TLB_G);
 	/* Initialize IBM405GPr CPU */
 	ibm40x_memsize_init(memsize, startkernel);
 	ibm4xx_init(startkernel, endkernel, pic_ext_intr);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: openbios.c,v 1.5 2011/06/18 06:41:42 matt Exp $	*/
+/*	$NetBSD: openbios.c,v 1.6 2021/03/30 01:47:45 rin Exp $	*/
 /*
  * Copyright (c) 2004 Shigeyuki Fukushima.
  * 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
 @@ -21,27 +21,27 @@
  * 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 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>
-__KERNEL_RCSID(0, "$NetBSD: openbios.c,v 1.5 2011/06/18 06:41:42 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: openbios.c,v 1.6 2021/03/30 01:47:45 rin Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/cpu.h>
 #include <powerpc/ibm4xx/cpu.h>
 #include <powerpc/ibm4xx/openbios.h>
 /*
  * Board configuration structure from the OpenBIOS.
+ *
  * Supported (XXX):
  *    405GPr 1.2 ROM Monitor (5/25/02)
 @@ -50,27 +50,27 @@ struct board_bios_data {
 	unsigned char	usr_config_ver[4];
 	unsigned char	rom_sw_ver[30];
 	unsigned int	mem_size;
 	unsigned char	mac_address_local[6];
 	unsigned char	mac_address_pci[6];
 	unsigned int	processor_speed;
 	unsigned int	plb_speed;
 	unsigned int	pci_speed;
 };
 static struct board_bios_data board_bios;
 void
-openbios_board_init(void *info_block, u_int startkernel)
+openbios_board_init(void *info_block)
+{
         /* Initialize cache info for memcpy, etc. */
         cpu_probe_cache();
 	/* Save info block */
 	memcpy(&board_bios, info_block, sizeof(board_bios));
+}
 unsigned int
 openbios_board_memsize_get(void)
+{
 	return board_bios.mem_size;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: openbios.h,v 1.2 2005/12/11 12:18:43 christos Exp $	*/
+/*	$NetBSD: openbios.h,v 1.3 2021/03/30 01:47:45 rin Exp $	*/
 /*
  * Copyright (c) 2004 Shigeyuki Fukushima.
  * 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
 @@ -25,19 +25,19 @@
  * 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.
  */
 #ifndef _IBM4XX_OPENBIOS_H_
 #define	_IBM4XX_OPENBIOS_H_
 #include <sys/param.h>
-extern void		openbios_board_init(void *, u_int);
+extern void		openbios_board_init(void *);
 extern unsigned int	openbios_board_memsize_get(void);
 extern void		openbios_board_info_set(void);
 extern void		openbios_board_print(void);
 #endif	/* _IBM4XX_OPENBIOS_H_ */