CVS commit: src/sys/arch/evbppc/conf
Module Name:src Committed By: rin Date: Sat Jun 26 09:03:46 UTC 2021 Modified Files: src/sys/arch/evbppc/conf: std.explora Log Message: Oops, revert unintentional part of the previous. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbppc/conf/std.explora Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbppc/conf/std.explora diff -u src/sys/arch/evbppc/conf/std.explora:1.8 src/sys/arch/evbppc/conf/std.explora:1.9 --- src/sys/arch/evbppc/conf/std.explora:1.8 Sat Jun 26 09:00:39 2021 +++ src/sys/arch/evbppc/conf/std.explora Sat Jun 26 09:03:46 2021 @@ -1,4 +1,4 @@ -# $NetBSD: std.explora,v 1.8 2021/06/26 09:00:39 rin Exp $ +# $NetBSD: std.explora,v 1.9 2021/06/26 09:03:46 rin Exp $ # # Standard/required options for NetBSD/explora. @@ -28,5 +28,3 @@ options INTSTK=16384 options PPC_CPU_FREQ=6600 # XXX hack for pckbc_cnattach() include "arch/evbppc/conf/files.explora" - -options PPC_PCI_MACHDEP_IMPL=""
CVS commit: src/sys/arch/evbppc/conf
Module Name:src Committed By: rin Date: Sat Jun 26 09:00:39 UTC 2021 Modified Files: src/sys/arch/evbppc/conf: std.explora Log Message: Set VMSWAP_DEFAULT_PLAINTEXT for Explora 450 (IBM_PPC403). (slow CPU & memory shortage) To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbppc/conf/std.explora Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbppc/conf/std.explora diff -u src/sys/arch/evbppc/conf/std.explora:1.7 src/sys/arch/evbppc/conf/std.explora:1.8 --- src/sys/arch/evbppc/conf/std.explora:1.7 Fri Mar 5 06:45:12 2021 +++ src/sys/arch/evbppc/conf/std.explora Sat Jun 26 09:00:39 2021 @@ -1,4 +1,4 @@ -# $NetBSD: std.explora,v 1.7 2021/03/05 06:45:12 rin Exp $ +# $NetBSD: std.explora,v 1.8 2021/06/26 09:00:39 rin Exp $ # # Standard/required options for NetBSD/explora. @@ -9,6 +9,9 @@ include "conf/std" # MI standard option options PPC_IBM4XX # IBM 40x family options PPC_IBM403 # IBM 403GCX +options VMSWAP_DEFAULT_PLAINTEXT # do not encrypt swap by + # default (slow cpu) + # Executable support: options EXEC_ELF32 # (native) ELF32 binary support options EXEC_AOUT # (native) a.out binary support (deprecated) @@ -25,3 +28,5 @@ options INTSTK=16384 options PPC_CPU_FREQ=6600 # XXX hack for pckbc_cnattach() include "arch/evbppc/conf/files.explora" + +options PPC_PCI_MACHDEP_IMPL=""
CVS commit: src/sys/arch/evbppc/conf
Module Name:src Committed By: rin Date: Thu Jun 3 09:09:22 UTC 2021 Modified Files: src/sys/arch/evbppc/conf: DHT Log Message: - Add some more things necessary for ATF. - Add makphy(4) found in recent wm(4) models. - Style. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbppc/conf/DHT Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbppc/conf/DHT diff -u src/sys/arch/evbppc/conf/DHT:1.1 src/sys/arch/evbppc/conf/DHT:1.2 --- src/sys/arch/evbppc/conf/DHT:1.1 Fri Apr 2 07:00:33 2021 +++ src/sys/arch/evbppc/conf/DHT Thu Jun 3 09:09:22 2021 @@ -1,4 +1,4 @@ -# $NetBSD: DHT,v 1.1 2021/04/02 07:00:33 rin Exp $ +# $NetBSD: DHT,v 1.2 2021/06/03 09:09:22 rin Exp $ # # DHT --- DHT Walnut 405GP Evaluation Board # (Digital Home Technologies PCB 01070201 Rev. 1.1) @@ -8,7 +8,7 @@ include "arch/evbppc/conf/std.dht" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "DHT-$Revision: 1.1 $" +#ident "DHT-$Revision: 1.2 $" maxusers 32 @@ -49,7 +49,7 @@ options DIAGNOSTIC # cheap kernel cons options DDB # in-kernel debugger options DDB_HISTORY_SIZE=512 # enable history editing in DDB #options TRAP_PANICWAIT -makeoptions COPY_SYMTAB=1 # size for embedded symbol table +makeoptions COPY_SYMTAB=1 # size for embedded symbol table makeoptions DEBUG="-g" # compile full symbol table @@ -177,6 +177,7 @@ siisata* at pci? dev ? function ? # SiI wm* at pci? dev ? function ? # Intel 82543/82544 gigabit igphy* at mii? phy ? # Intel IGP01E1000 +makphy* at mii? phy ? # Marvell Semiconductor 88E1000 PHYs ukphy* at mii? phy ? # generic unknown PHYs xhci* at pci? dev ? function ? # eXtensible Host Controller @@ -204,7 +205,7 @@ pseudo-device swcrypto # software crypt #pseudo-device cgd # cryptographic disk devices #pseudo-device raid # RAIDframe disk driver #options RAID_AUTOCONFIG # auto-configuration of RAID components -#pseudo-device fss # file system snapshot device +pseudo-device fss # file system snapshot device #pseudo-device md # memory disk device pseudo-device vnd # disk-like interface to files @@ -231,6 +232,7 @@ pseudo-device agr # IEEE 802.3ad link # miscellaneous pseudo-devices pseudo-device pty # pseudo-terminals pseudo-device clockctl # user control of clock subsystem +pseudo-device drvctl # user control of drive subsystem pseudo-device ksyms # /dev/ksyms pseudo-device putter # for puffs and pud
CVS commit: src/sys/arch/evbppc/walnut
Module Name:src Committed By: rin Date: Tue Mar 30 05:18:37 UTC 2021 Modified Files: src/sys/arch/evbppc/walnut: consinit.c Log Message: - G/C unused. - Sort headers. No binary changes. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbppc/walnut/consinit.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbppc/walnut/consinit.c diff -u src/sys/arch/evbppc/walnut/consinit.c:1.9 src/sys/arch/evbppc/walnut/consinit.c:1.10 --- src/sys/arch/evbppc/walnut/consinit.c:1.9 Mon Mar 29 13:59:15 2021 +++ src/sys/arch/evbppc/walnut/consinit.c Tue Mar 30 05:18:37 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: consinit.c,v 1.9 2021/03/29 13:59:15 rin Exp $ */ +/* $NetBSD: consinit.c,v 1.10 2021/03/30 05:18:37 rin Exp $ */ /* * Copyright (c) 1998 @@ -27,17 +27,16 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.9 2021/03/29 13:59:15 rin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.10 2021/03/30 05:18:37 rin Exp $"); #include "opt_kgdb.h" #include -#include -#include #include +#include +#include #include -#include #include "com.h" #if (NCOM > 0) @@ -47,12 +46,6 @@ __KERNEL_RCSID(0, "$NetBSD: consinit.c,v #include #endif -#include - -#ifndef CONSDEVNAME -#define CONSDEVNAME "com" -#endif - #if (NCOM > 0) #ifndef CONADDR #define CONADDR IBM405GP_UART0_BASE
CVS commit: src/sys/arch/evbppc/walnut
Module Name:src Committed By: rin Date: Tue Mar 30 05:14:00 UTC 2021 Modified Files: src/sys/arch/evbppc/walnut: autoconf.c Log Message: - Explicitly include . - Drop unused headers. - Group headers. No binary changes. To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/sys/arch/evbppc/walnut/autoconf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbppc/walnut/autoconf.c diff -u src/sys/arch/evbppc/walnut/autoconf.c:1.25 src/sys/arch/evbppc/walnut/autoconf.c:1.26 --- src/sys/arch/evbppc/walnut/autoconf.c:1.25 Mon Mar 29 13:49:15 2021 +++ src/sys/arch/evbppc/walnut/autoconf.c Tue Mar 30 05:14:00 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: autoconf.c,v 1.25 2021/03/29 13:49:15 rin Exp $ */ +/* $NetBSD: autoconf.c,v 1.26 2021/03/30 05:14:00 rin Exp $ */ /* * Copyright (C) 1995, 1996 Wolfgang Solfrank. @@ -32,20 +32,20 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.25 2021/03/29 13:49:15 rin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.26 2021/03/30 05:14:00 rin Exp $"); #include -#include #include #include -#include #include /* For COM_FREQ */ +#include +#include + #include #include #include -#include /* * List of port-specific devices to attach to the processor local bus.
CVS commit: src/sys/arch/evbppc/walnut
Module Name:src Committed By: rin Date: Tue Mar 30 05:08:16 UTC 2021 Modified Files: src/sys/arch/evbppc/walnut: machdep.c Log Message: - Include tlb.h directly, instead of uvm_extern.h. - Drop unused headers. - Sort and group headers. No binary changes. To generate a diff of this commit: cvs rdiff -u -r1.66 -r1.67 src/sys/arch/evbppc/walnut/machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbppc/walnut/machdep.c diff -u src/sys/arch/evbppc/walnut/machdep.c:1.66 src/sys/arch/evbppc/walnut/machdep.c:1.67 --- src/sys/arch/evbppc/walnut/machdep.c:1.66 Tue Mar 30 02:41:15 2021 +++ src/sys/arch/evbppc/walnut/machdep.c Tue Mar 30 05:08:16 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.66 2021/03/30 02:41:15 rin Exp $ */ +/* $NetBSD: machdep.c,v 1.67 2021/03/30 05:08:16 rin Exp $ */ /* * Copyright 2001, 2002 Wasabi Systems, Inc. @@ -67,64 +67,32 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.66 2021/03/30 02:41:15 rin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.67 2021/03/30 05:08:16 rin Exp $"); -#include "opt_compat_netbsd.h" #include "opt_ddb.h" #include -#include -#include #include -#include #include -#include #include -#include -#include -#include #include -#include -#include -#include #include -#include -#include #include -#include - -#include - -#include #include -#include -#include - #include #include + #include #include #include - #include +#include #include - -#include - -#include -#include #include - -#include "ksyms.h" - -#if defined(DDB) -#include -#include -#endif - +#include #define TLB_PG_SIZE (16*1024*1024)
CVS commit: src/sys/arch/evbppc/obs405
Module Name:src Committed By: rin Date: Tue Mar 30 04:53:13 UTC 2021 Modified Files: src/sys/arch/evbppc/obs405: obs200_autoconf.c obs200_machdep.c Log Message: - Include tlb.h directly, instead of uvm_extern.h. - Explicitly include param.h. - Drop unused headers. - Sort and group headers. No binary changes. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbppc/obs405/obs200_autoconf.c cvs rdiff -u -r1.22 -r1.23 src/sys/arch/evbppc/obs405/obs200_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbppc/obs405/obs200_autoconf.c diff -u src/sys/arch/evbppc/obs405/obs200_autoconf.c:1.9 src/sys/arch/evbppc/obs405/obs200_autoconf.c:1.10 --- src/sys/arch/evbppc/obs405/obs200_autoconf.c:1.9 Mon Mar 29 13:38:31 2021 +++ src/sys/arch/evbppc/obs405/obs200_autoconf.c Tue Mar 30 04:53:13 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: obs200_autoconf.c,v 1.9 2021/03/29 13:38:31 rin Exp $ */ +/* $NetBSD: obs200_autoconf.c,v 1.10 2021/03/30 04:53:13 rin Exp $ */ /* * Copyright 2004 Shigeyuki Fukushima. @@ -33,20 +33,17 @@ * DAMAGE. */ #include -__KERNEL_RCSID(0, "$NetBSD: obs200_autoconf.c,v 1.9 2021/03/29 13:38:31 rin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: obs200_autoconf.c,v 1.10 2021/03/30 04:53:13 rin Exp $"); -#include +#include #include -#include +#include #include #include #include -#include - - /* * Determine device configuration for a machine. */ Index: src/sys/arch/evbppc/obs405/obs200_machdep.c diff -u src/sys/arch/evbppc/obs405/obs200_machdep.c:1.22 src/sys/arch/evbppc/obs405/obs200_machdep.c:1.23 --- src/sys/arch/evbppc/obs405/obs200_machdep.c:1.22 Tue Mar 30 01:33:50 2021 +++ src/sys/arch/evbppc/obs405/obs200_machdep.c Tue Mar 30 04:53:13 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: obs200_machdep.c,v 1.22 2021/03/30 01:33:50 rin Exp $ */ +/* $NetBSD: obs200_machdep.c,v 1.23 2021/03/30 04:53:13 rin Exp $ */ /* Original: machdep.c,v 1.3 2005/01/17 17:24:09 shige Exp */ /* @@ -68,23 +68,17 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: obs200_machdep.c,v 1.22 2021/03/30 01:33:50 rin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: obs200_machdep.c,v 1.23 2021/03/30 04:53:13 rin Exp $"); -#include "opt_compat_netbsd.h" #include "opt_ddb.h" #include +#include +#include #include -#include -#include +#include #include #include -#include -#include -#include -#include - -#include #include #include @@ -95,18 +89,17 @@ __KERNEL_RCSID(0, "$NetBSD: obs200_machd #include #include #include -#include -#include +#include -#include -#include +#include #include - -#include "ksyms.h" +#include #include "com.h" #if (NCOM > 0) #include +#include +#include #ifndef CONADDR #define CONADDR IBM405GP_UART0_BASE
CVS commit: src/sys/arch/evbppc/obs405
Module Name:src Committed By: rin Date: Tue Mar 30 04:41:31 UTC 2021 Modified Files: src/sys/arch/evbppc/obs405: obs600_autoconf.c Log Message: - Explicitly include . - Drop unused headers. - Sort headers. No binary changes. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbppc/obs405/obs600_autoconf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbppc/obs405/obs600_autoconf.c diff -u src/sys/arch/evbppc/obs405/obs600_autoconf.c:1.11 src/sys/arch/evbppc/obs405/obs600_autoconf.c:1.12 --- src/sys/arch/evbppc/obs405/obs600_autoconf.c:1.11 Mon Mar 29 13:38:31 2021 +++ src/sys/arch/evbppc/obs405/obs600_autoconf.c Tue Mar 30 04:41:30 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: obs600_autoconf.c,v 1.11 2021/03/29 13:38:31 rin Exp $ */ +/* $NetBSD: obs600_autoconf.c,v 1.12 2021/03/30 04:41:30 rin Exp $ */ /* * Copyright 2004 Shigeyuki Fukushima. @@ -33,22 +33,20 @@ * DAMAGE. */ #include -__KERNEL_RCSID(0, "$NetBSD: obs600_autoconf.c,v 1.11 2021/03/29 13:38:31 rin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: obs600_autoconf.c,v 1.12 2021/03/30 04:41:30 rin Exp $"); #include "dwctwo.h" -#include +#include #include -#include #include +#include #include #include #include -#include - #if NDWCTWO > 0 #include #include
CVS commit: src/sys/arch/evbppc/obs405
Module Name:src Committed By: rin Date: Tue Mar 30 04:28:50 UTC 2021 Modified Files: src/sys/arch/evbppc/obs405: obs600_machdep.c Log Message: - Include tlb.h directly instead of uvm_extern.h. - Remove unused/duplicated header include. - Sort and group headers. No binary changes. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/arch/evbppc/obs405/obs600_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbppc/obs405/obs600_machdep.c diff -u src/sys/arch/evbppc/obs405/obs600_machdep.c:1.14 src/sys/arch/evbppc/obs405/obs600_machdep.c:1.15 --- src/sys/arch/evbppc/obs405/obs600_machdep.c:1.14 Tue Mar 30 01:33:50 2021 +++ src/sys/arch/evbppc/obs405/obs600_machdep.c Tue Mar 30 04:28:50 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: obs600_machdep.c,v 1.14 2021/03/30 01:33:50 rin Exp $ */ +/* $NetBSD: obs600_machdep.c,v 1.15 2021/03/30 04:28:50 rin Exp $ */ /* Original: md_machdep.c,v 1.3 2005/01/24 18:47:37 shige Exp $ */ /* @@ -68,46 +68,37 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: obs600_machdep.c,v 1.14 2021/03/30 01:33:50 rin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: obs600_machdep.c,v 1.15 2021/03/30 04:28:50 rin Exp $"); -#include "opt_compat_netbsd.h" #include "opt_ddb.h" -#include "opt_modular.h" #include #include +#include #include #include -#include -#include +#include #include #include -#include -#include -#include -#include - -#include #include +#include +#include + #include #include #include -#include +#include + #include #include -#include -#include - -#include - -#include "ksyms.h" - #include "com.h" #if (NCOM > 0) #include +#include +#include #ifndef CONADDR #define CONADDR AMCC405EX_UART0_BASE
CVS commit: src/sys/arch/evbppc/obs405
Module Name:src Committed By: rin Date: Tue Mar 30 04:11:30 UTC 2021 Modified Files: src/sys/arch/evbppc/obs405: obs266_autoconf.c Log Message: - Explicitly include . - G/C headers. - Sort headers. No binary changes. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbppc/obs405/obs266_autoconf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbppc/obs405/obs266_autoconf.c diff -u src/sys/arch/evbppc/obs405/obs266_autoconf.c:1.9 src/sys/arch/evbppc/obs405/obs266_autoconf.c:1.10 --- src/sys/arch/evbppc/obs405/obs266_autoconf.c:1.9 Mon Mar 29 13:38:31 2021 +++ src/sys/arch/evbppc/obs405/obs266_autoconf.c Tue Mar 30 04:11:29 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: obs266_autoconf.c,v 1.9 2021/03/29 13:38:31 rin Exp $ */ +/* $NetBSD: obs266_autoconf.c,v 1.10 2021/03/30 04:11:29 rin Exp $ */ /* * Copyright 2004 Shigeyuki Fukushima. @@ -33,19 +33,17 @@ * DAMAGE. */ #include -__KERNEL_RCSID(0, "$NetBSD: obs266_autoconf.c,v 1.9 2021/03/29 13:38:31 rin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: obs266_autoconf.c,v 1.10 2021/03/30 04:11:29 rin Exp $"); -#include +#include #include -#include +#include #include #include #include -#include - /* * Determine device configuration for a machine. */
CVS commit: src/sys/arch/evbppc/include
Module Name:src Committed By: rin Date: Tue Mar 30 04:08:02 UTC 2021 Modified Files: src/sys/arch/evbppc/include: obs200.h obs266.h obs600.h Log Message: Include for COM_FREQ. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbppc/include/obs200.h \ src/sys/arch/evbppc/include/obs266.h cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbppc/include/obs600.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbppc/include/obs200.h diff -u src/sys/arch/evbppc/include/obs200.h:1.3 src/sys/arch/evbppc/include/obs200.h:1.4 --- src/sys/arch/evbppc/include/obs200.h:1.3 Tue Mar 30 03:45:34 2021 +++ src/sys/arch/evbppc/include/obs200.h Tue Mar 30 04:08:02 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: obs200.h,v 1.3 2021/03/30 03:45:34 rin Exp $ */ +/* $NetBSD: obs200.h,v 1.4 2021/03/30 04:08:02 rin Exp $ */ /* * Copyright 2004 Shigeyuki Fukushima. @@ -36,6 +36,8 @@ #ifndef _EVBPPC_OBS200_H_ #define _EVBPPC_OBS200_H_ +#include + /* * Device Properties for OpenBlockS S/R (IBM405GP 200MHz) */ Index: src/sys/arch/evbppc/include/obs266.h diff -u src/sys/arch/evbppc/include/obs266.h:1.3 src/sys/arch/evbppc/include/obs266.h:1.4 --- src/sys/arch/evbppc/include/obs266.h:1.3 Tue Mar 30 03:45:34 2021 +++ src/sys/arch/evbppc/include/obs266.h Tue Mar 30 04:08:02 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: obs266.h,v 1.3 2021/03/30 03:45:34 rin Exp $ */ +/* $NetBSD: obs266.h,v 1.4 2021/03/30 04:08:02 rin Exp $ */ /* * Copyright 2004 Shigeyuki Fukushima. @@ -36,6 +36,8 @@ #ifndef _EVBPPC_OBS266_H_ #define _EVBPPC_OBS266_H_ +#include + /* * Device Properties for OpenBlockS266 (IBM405GPr 266MHz) */ Index: src/sys/arch/evbppc/include/obs600.h diff -u src/sys/arch/evbppc/include/obs600.h:1.2 src/sys/arch/evbppc/include/obs600.h:1.3 --- src/sys/arch/evbppc/include/obs600.h:1.2 Tue Mar 30 03:45:34 2021 +++ src/sys/arch/evbppc/include/obs600.h Tue Mar 30 04:08:02 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: obs600.h,v 1.2 2021/03/30 03:45:34 rin Exp $ */ +/* $NetBSD: obs600.h,v 1.3 2021/03/30 04:08:02 rin Exp $ */ /* * Copyright (c) 2009 KIYOHARA Takashi * All rights reserved. @@ -28,6 +28,8 @@ #ifndef _EVBPPC_OBS600_H_ #define _EVBPPC_OBS600_H_ +#include + /* * Device Properties for OpenBlockS600 (AMCC 405EX 600MHz) */
CVS commit: src/sys/arch/evbppc/obs405
Module Name:src Committed By: rin Date: Tue Mar 30 04:02:17 UTC 2021 Modified Files: src/sys/arch/evbppc/obs405: obs266_machdep.c Log Message: Sort & group headers. No binary changes. To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/sys/arch/evbppc/obs405/obs266_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbppc/obs405/obs266_machdep.c diff -u src/sys/arch/evbppc/obs405/obs266_machdep.c:1.25 src/sys/arch/evbppc/obs405/obs266_machdep.c:1.26 --- src/sys/arch/evbppc/obs405/obs266_machdep.c:1.25 Tue Mar 30 03:57:03 2021 +++ src/sys/arch/evbppc/obs405/obs266_machdep.c Tue Mar 30 04:02:17 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: obs266_machdep.c,v 1.25 2021/03/30 03:57:03 rin Exp $ */ +/* $NetBSD: obs266_machdep.c,v 1.26 2021/03/30 04:02:17 rin Exp $ */ /* Original: md_machdep.c,v 1.3 2005/01/24 18:47:37 shige Exp $ */ /* @@ -68,38 +68,38 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: obs266_machdep.c,v 1.25 2021/03/30 03:57:03 rin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: obs266_machdep.c,v 1.26 2021/03/30 04:02:17 rin Exp $"); #include "opt_ddb.h" #include +#include +#include #include +#include #include #include -#include -#include -#include #include -#include +#include +#include + #include +#include #include -#include #include #include -#include - -#include -#include -#include -#include +#include #include +#include #include "com.h" #if (NCOM > 0) #include +#include +#include #ifndef CONADDR #define CONADDR IBM405GP_UART0_BASE
CVS commit: src/sys/arch/evbppc/obs405
Module Name:src Committed By: rin Date: Tue Mar 30 03:57:03 UTC 2021 Modified Files: src/sys/arch/evbppc/obs405: obs266_machdep.c Log Message: G/C unused. Use tlb.h directly instead of uvm_extern.h. No binary changes. To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/sys/arch/evbppc/obs405/obs266_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbppc/obs405/obs266_machdep.c diff -u src/sys/arch/evbppc/obs405/obs266_machdep.c:1.24 src/sys/arch/evbppc/obs405/obs266_machdep.c:1.25 --- src/sys/arch/evbppc/obs405/obs266_machdep.c:1.24 Tue Mar 30 01:47:44 2021 +++ src/sys/arch/evbppc/obs405/obs266_machdep.c Tue Mar 30 03:57:03 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: obs266_machdep.c,v 1.24 2021/03/30 01:47:44 rin Exp $ */ +/* $NetBSD: obs266_machdep.c,v 1.25 2021/03/30 03:57:03 rin Exp $ */ /* Original: md_machdep.c,v 1.3 2005/01/24 18:47:37 shige Exp $ */ /* @@ -68,23 +68,17 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: obs266_machdep.c,v 1.24 2021/03/30 01:47:44 rin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: obs266_machdep.c,v 1.25 2021/03/30 03:57:03 rin Exp $"); -#include "opt_compat_netbsd.h" #include "opt_ddb.h" #include #include -#include -#include #include #include #include #include #include -#include - -#include #include @@ -93,6 +87,7 @@ __KERNEL_RCSID(0, "$NetBSD: obs266_machd #include #include #include +#include #include #include @@ -102,8 +97,6 @@ __KERNEL_RCSID(0, "$NetBSD: obs266_machd #include #include -#include "ksyms.h" - #include "com.h" #if (NCOM > 0) #include
CVS commit: src/sys/arch/evbppc/include
Module Name:src Committed By: rin Date: Tue Mar 30 03:45:34 UTC 2021 Modified Files: src/sys/arch/evbppc/include: obs200.h obs266.h obs600.h Removed Files: src/sys/arch/evbppc/include: obs405.h Log Message: G/C . To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbppc/include/obs200.h \ src/sys/arch/evbppc/include/obs266.h cvs rdiff -u -r1.8 -r0 src/sys/arch/evbppc/include/obs405.h cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbppc/include/obs600.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbppc/include/obs200.h diff -u src/sys/arch/evbppc/include/obs200.h:1.2 src/sys/arch/evbppc/include/obs200.h:1.3 --- src/sys/arch/evbppc/include/obs200.h:1.2 Sun Dec 11 12:17:12 2005 +++ src/sys/arch/evbppc/include/obs200.h Tue Mar 30 03:45:34 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: obs200.h,v 1.2 2005/12/11 12:17:12 christos Exp $ */ +/* $NetBSD: obs200.h,v 1.3 2021/03/30 03:45:34 rin Exp $ */ /* * Copyright 2004 Shigeyuki Fukushima. @@ -36,8 +36,6 @@ #ifndef _EVBPPC_OBS200_H_ #define _EVBPPC_OBS200_H_ -#include - /* * Device Properties for OpenBlockS S/R (IBM405GP 200MHz) */ Index: src/sys/arch/evbppc/include/obs266.h diff -u src/sys/arch/evbppc/include/obs266.h:1.2 src/sys/arch/evbppc/include/obs266.h:1.3 --- src/sys/arch/evbppc/include/obs266.h:1.2 Sun Dec 11 12:17:12 2005 +++ src/sys/arch/evbppc/include/obs266.h Tue Mar 30 03:45:34 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: obs266.h,v 1.2 2005/12/11 12:17:12 christos Exp $ */ +/* $NetBSD: obs266.h,v 1.3 2021/03/30 03:45:34 rin Exp $ */ /* * Copyright 2004 Shigeyuki Fukushima. @@ -36,8 +36,6 @@ #ifndef _EVBPPC_OBS266_H_ #define _EVBPPC_OBS266_H_ -#include - /* * Device Properties for OpenBlockS266 (IBM405GPr 266MHz) */ Index: src/sys/arch/evbppc/include/obs600.h diff -u src/sys/arch/evbppc/include/obs600.h:1.1 src/sys/arch/evbppc/include/obs600.h:1.2 --- src/sys/arch/evbppc/include/obs600.h:1.1 Thu Mar 18 14:15:38 2010 +++ src/sys/arch/evbppc/include/obs600.h Tue Mar 30 03:45:34 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: obs600.h,v 1.1 2010/03/18 14:15:38 kiyohara Exp $ */ +/* $NetBSD: obs600.h,v 1.2 2021/03/30 03:45:34 rin Exp $ */ /* * Copyright (c) 2009 KIYOHARA Takashi * All rights reserved. @@ -35,10 +35,4 @@ /* UART Clock */ #define OBS600_COM_FREQ (COM_FREQ * 4) /* UART CLK 7.3728 MHz */ -/* - * extern variables and functions - */ - -#include - #endif /* _EVBPPC_OBS600_H_ */
CVS commit: src/sys/arch/evbppc/explora
Module Name:src Committed By: rin Date: Tue Mar 30 03:20:13 UTC 2021 Modified Files: src/sys/arch/evbppc/explora: machdep.c Log Message: Sort headers. Fix style. No binary changes. To generate a diff of this commit: cvs rdiff -u -r1.50 -r1.51 src/sys/arch/evbppc/explora/machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbppc/explora/machdep.c diff -u src/sys/arch/evbppc/explora/machdep.c:1.50 src/sys/arch/evbppc/explora/machdep.c:1.51 --- src/sys/arch/evbppc/explora/machdep.c:1.50 Tue Mar 30 03:15:53 2021 +++ src/sys/arch/evbppc/explora/machdep.c Tue Mar 30 03:20:13 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.50 2021/03/30 03:15:53 rin Exp $ */ +/* $NetBSD: machdep.c,v 1.51 2021/03/30 03:20:13 rin Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -30,15 +30,15 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.50 2021/03/30 03:15:53 rin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.51 2021/03/30 03:20:13 rin Exp $"); #include "opt_explora.h" #include -#include +#include #include #include -#include +#include #include @@ -78,8 +78,8 @@ initppc(vaddr_t startkernel, vaddr_t end continue; maddr = ((br[i] >> 24) & 0xff) << 20; msize = 1 << (20 + ((br[i] >> 21) & 7)); - if (maddr+msize > size) - size = maddr+msize; + if (maddr + msize > size) + size = maddr + msize; } /*
CVS commit: src/sys/arch/evbppc/explora
Module Name:src Committed By: rin Date: Tue Mar 30 03:04:51 UTC 2021 Modified Files: src/sys/arch/evbppc/explora: machdep.c Log Message: G/C unused. No binary changes (except for __LINE__ for KASSERT). To generate a diff of this commit: cvs rdiff -u -r1.48 -r1.49 src/sys/arch/evbppc/explora/machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbppc/explora/machdep.c diff -u src/sys/arch/evbppc/explora/machdep.c:1.48 src/sys/arch/evbppc/explora/machdep.c:1.49 --- src/sys/arch/evbppc/explora/machdep.c:1.48 Tue Mar 30 02:41:14 2021 +++ src/sys/arch/evbppc/explora/machdep.c Tue Mar 30 03:04:51 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.48 2021/03/30 02:41:14 rin Exp $ */ +/* $NetBSD: machdep.c,v 1.49 2021/03/30 03:04:51 rin Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -30,36 +30,20 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.48 2021/03/30 02:41:14 rin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.49 2021/03/30 03:04:51 rin Exp $"); #include "opt_explora.h" -#include "opt_modular.h" - -#include "ksyms.h" #include #include -#include -#include #include -#include -#include -#include -#include -#include #include #include -#include - -#include #include #include -#include #include -#include -#include #include #include @@ -67,11 +51,6 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v #include #include -#if NKSYMS || defined(DDB) || defined(MODULAR) -#include -#include -#endif - #define TLB_PG_SIZE (16*1024*1024) static const unsigned int cpuspeed = 6600;
CVS commit: src/sys/arch/evbppc
Module Name:src Committed By: rin Date: Tue Mar 30 02:41:15 UTC 2021 Modified Files: src/sys/arch/evbppc/conf: files.obs405 src/sys/arch/evbppc/evbppc: evbppc_machdep.c src/sys/arch/evbppc/explora: machdep.c src/sys/arch/evbppc/virtex: machdep.c src/sys/arch/evbppc/walnut: machdep.c Removed Files: src/sys/arch/evbppc/obs405: obs405_machdep.c Log Message: Move common global variables, i.e., phys_map, machine, and machine_arch to evbppc/evbppc_machdep.c (bad naming; used only for 4xx boards). To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/sys/arch/evbppc/conf/files.obs405 cvs rdiff -u -r1.13 -r1.14 src/sys/arch/evbppc/evbppc/evbppc_machdep.c cvs rdiff -u -r1.47 -r1.48 src/sys/arch/evbppc/explora/machdep.c cvs rdiff -u -r1.6 -r0 src/sys/arch/evbppc/obs405/obs405_machdep.c cvs rdiff -u -r1.28 -r1.29 src/sys/arch/evbppc/virtex/machdep.c cvs rdiff -u -r1.65 -r1.66 src/sys/arch/evbppc/walnut/machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbppc/conf/files.obs405 diff -u src/sys/arch/evbppc/conf/files.obs405:1.22 src/sys/arch/evbppc/conf/files.obs405:1.23 --- src/sys/arch/evbppc/conf/files.obs405:1.22 Mon Mar 29 13:38:31 2021 +++ src/sys/arch/evbppc/conf/files.obs405 Tue Mar 30 02:41:14 2021 @@ -1,11 +1,10 @@ -# $NetBSD: files.obs405,v 1.22 2021/03/29 13:38:31 rin Exp $ +# $NetBSD: files.obs405,v 1.23 2021/03/30 02:41:14 rin Exp $ # # obs405-specific configuration info file arch/powerpc/ibm4xx/ibm4xx_autoconf.c file arch/powerpc/ibm4xx/ibm40x_machdep.c file arch/powerpc/ibm4xx/ibm4xx_machdep.c -file arch/evbppc/obs405/obs405_machdep.c # Memory Disk for install kernel file dev/md_root.cmemory_disk_hooks Index: src/sys/arch/evbppc/evbppc/evbppc_machdep.c diff -u src/sys/arch/evbppc/evbppc/evbppc_machdep.c:1.13 src/sys/arch/evbppc/evbppc/evbppc_machdep.c:1.14 --- src/sys/arch/evbppc/evbppc/evbppc_machdep.c:1.13 Fri Jul 1 20:46:39 2011 +++ src/sys/arch/evbppc/evbppc/evbppc_machdep.c Tue Mar 30 02:41:14 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: evbppc_machdep.c,v 1.13 2011/07/01 20:46:39 dyoung Exp $ */ +/* $NetBSD: evbppc_machdep.c,v 1.14 2021/03/30 02:41:14 rin Exp $ */ /* * Copyright 2001, 2002 Wasabi Systems, Inc. @@ -67,7 +67,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: evbppc_machdep.c,v 1.13 2011/07/01 20:46:39 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: evbppc_machdep.c,v 1.14 2021/03/30 02:41:14 rin Exp $"); #include #include @@ -81,6 +81,17 @@ __KERNEL_RCSID(0, "$NetBSD: evbppc_machd #include /* + * Global variables used here and there. + */ +struct vm_map *phys_map = NULL; + +/* + * XXX This should probably be in autoconf. + */ +char machine[] = MACHINE; +char machine_arch[] = MACHINE_ARCH; + +/* * ibm4xx kernels need to set module_machine to this for modules to work. */ char module_machine_ibm4xx[] = "powerpc-ibm4xx"; Index: src/sys/arch/evbppc/explora/machdep.c diff -u src/sys/arch/evbppc/explora/machdep.c:1.47 src/sys/arch/evbppc/explora/machdep.c:1.48 --- src/sys/arch/evbppc/explora/machdep.c:1.47 Tue Mar 30 01:33:50 2021 +++ src/sys/arch/evbppc/explora/machdep.c Tue Mar 30 02:41:14 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.47 2021/03/30 01:33:50 rin Exp $ */ +/* $NetBSD: machdep.c,v 1.48 2021/03/30 02:41:14 rin Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.47 2021/03/30 01:33:50 rin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.48 2021/03/30 02:41:14 rin Exp $"); #include "opt_explora.h" #include "opt_modular.h" @@ -74,13 +74,8 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v #define TLB_PG_SIZE (16*1024*1024) -char machine[] = MACHINE; /* from */ -char machine_arch[] = MACHINE_ARCH; /* from */ - static const unsigned int cpuspeed = 6600; -struct vm_map *phys_map = NULL; - void initppc(vaddr_t, vaddr_t); void Index: src/sys/arch/evbppc/virtex/machdep.c diff -u src/sys/arch/evbppc/virtex/machdep.c:1.28 src/sys/arch/evbppc/virtex/machdep.c:1.29 --- src/sys/arch/evbppc/virtex/machdep.c:1.28 Tue Mar 30 01:33:50 2021 +++ src/sys/arch/evbppc/virtex/machdep.c Tue Mar 30 02:41:14 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.28 2021/03/30 01:33:50 rin Exp $ */ +/* $NetBSD: machdep.c,v 1.29 2021/03/30 02:41:14 rin Exp $ */ /* * Copyright (c) 2006 Jachym Holecek @@ -34,7 +34,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.28 2021/03/30 01:33:50 rin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.29 2021/03/30 02:41:14 rin Exp $"); #include "opt_compat_netbsd.h" #include "opt_ddb.h" @@ -88,17 +88,6 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v #include #endif -/* - * Global variables used here and there - */ -struct vm_map *phys_map = NULL; - -/* - * This should probably be in autoconf!XXX - */ -char machine[]
CVS commit: src/sys/arch/evbppc/walnut/pci
Module Name:src Committed By: rin Date: Mon Mar 29 22:54:19 UTC 2021 Removed Files: src/sys/arch/evbppc/walnut/pci: pchb.c Log Message: Remove obsoleted file; we had switched to powerpc/ibm4xx/pci/pchb.c long ago. To generate a diff of this commit: cvs rdiff -u -r1.15 -r0 src/sys/arch/evbppc/walnut/pci/pchb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbppc/walnut
Module Name:src
Committed By: rin
Date: Mon Mar 29 14:37:01 UTC 2021
Modified Files:
src/sys/arch/evbppc/walnut: machdep.c
Log Message:
Use ibm4xx_cpu_startup() and board_info_init().
To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 src/sys/arch/evbppc/walnut/machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbppc/walnut/machdep.c
diff -u src/sys/arch/evbppc/walnut/machdep.c:1.61 src/sys/arch/evbppc/walnut/machdep.c:1.62
--- src/sys/arch/evbppc/walnut/machdep.c:1.61 Mon Mar 29 14:27:36 2021
+++ src/sys/arch/evbppc/walnut/machdep.c Mon Mar 29 14:37:01 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.61 2021/03/29 14:27:36 rin Exp $ */
+/* $NetBSD: machdep.c,v 1.62 2021/03/29 14:37:01 rin Exp $ */
/*
* Copyright 2001, 2002 Wasabi Systems, Inc.
@@ -67,7 +67,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.61 2021/03/29 14:27:36 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.62 2021/03/29 14:37:01 rin Exp $");
#include "opt_compat_netbsd.h"
#include "opt_ddb.h"
@@ -209,56 +209,12 @@ initppc(vaddr_t startkernel, vaddr_t end
void
cpu_startup(void)
{
- vaddr_t minaddr, maxaddr;
prop_number_t pn;
prop_data_t pd;
- char pbuf[9];
- /*
- * Initialize error message buffer (at end of core).
- */
-#if 0 /* For some reason this fails... --Artem
- * Besides, do we really have to put it at the end of core?
- * Let's use static buffer for now
- */
- if (!(msgbuf_vaddr = uvm_km_alloc(kernel_map, round_page(MSGBUFSIZE), 0,
- UVM_KMF_VAONLY)))
- panic("startup: no room for message buffer");
- for (i = 0; i < btoc(MSGBUFSIZE); i++)
- pmap_kenter_pa(msgbuf_vaddr + i * PAGE_SIZE,
- msgbuf_paddr + i * PAGE_SIZE, VM_PROT_READ|VM_PROT_WRITE, 0);
- initmsgbuf((void *)msgbuf_vaddr, round_page(MSGBUFSIZE));
-#else
- initmsgbuf((void *)msgbuf, round_page(MSGBUFSIZE));
-#endif
-
- printf("%s%s", copyright, version);
- printf("Walnut PowerPC 405GP Evaluation Board\n");
-
- format_bytes(pbuf, sizeof(pbuf), ctob(physmem));
- printf("total memory = %s\n", pbuf);
-
- minaddr = 0;
- /*
- * Allocate a submap for physio
- */
- phys_map = uvm_km_suballoc(kernel_map, , ,
- VM_PHYS_SIZE, 0, false, NULL);
-
- /*
- * No need to allocate an mbuf cluster submap. Mbuf clusters
- * are allocated via the pool allocator, and we use direct-mapped
- * pool pages.
- */
-
- format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_availmem(false)));
- printf("avail memory = %s\n", pbuf);
+ ibm4xx_cpu_startup("Walnut PowerPC 405GP Evaluation Board");
- /*
- * Set up the board properties dictionary.
- */
- board_properties = prop_dictionary_create();
- KASSERT(board_properties != NULL);
+ board_info_init();
pn = prop_number_create_integer(board_data.mem_size);
KASSERT(pn != NULL);
CVS commit: src/sys/arch/evbppc/walnut
Module Name:src Committed By: rin Date: Mon Mar 29 14:27:36 UTC 2021 Modified Files: src/sys/arch/evbppc/walnut: machdep.c Log Message: Use IBM405GP_UART0_BASE instead of hard-coded magic number 0xef00. No functional changes since: IBM405GP_UART0_BASE & ~(TLB_PG_SIZE - 1) == 0xef00 See ppc4xx_tlb_reserve() in ibm4xx/pmap.c. To generate a diff of this commit: cvs rdiff -u -r1.60 -r1.61 src/sys/arch/evbppc/walnut/machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbppc/walnut/machdep.c diff -u src/sys/arch/evbppc/walnut/machdep.c:1.60 src/sys/arch/evbppc/walnut/machdep.c:1.61 --- src/sys/arch/evbppc/walnut/machdep.c:1.60 Mon Mar 29 14:21:08 2021 +++ src/sys/arch/evbppc/walnut/machdep.c Mon Mar 29 14:27:36 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.60 2021/03/29 14:21:08 rin Exp $ */ +/* $NetBSD: machdep.c,v 1.61 2021/03/29 14:27:36 rin Exp $ */ /* * Copyright 2001, 2002 Wasabi Systems, Inc. @@ -67,7 +67,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.60 2021/03/29 14:21:08 rin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.61 2021/03/29 14:27:36 rin Exp $"); #include "opt_compat_netbsd.h" #include "opt_ddb.h" @@ -106,6 +106,7 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v #include #include #include +#include #include @@ -164,7 +165,7 @@ initppc(vaddr_t startkernel, vaddr_t end } /* Map console after physmem (see pmap_tlbmiss()) */ - ppc4xx_tlb_reserve(0xef00, + ppc4xx_tlb_reserve(IBM405GP_UART0_BASE, roundup(board_data.mem_size, TLB_PG_SIZE), TLB_PG_SIZE, TLB_I | TLB_G);
CVS commit: src/sys/arch/evbppc
Module Name:src
Committed By: rin
Date: Mon Mar 29 14:21:08 UTC 2021
Modified Files:
src/sys/arch/evbppc/conf: files.walnut
src/sys/arch/evbppc/walnut: machdep.c
Log Message:
Use ibm40x_machdep.c.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/evbppc/conf/files.walnut
cvs rdiff -u -r1.59 -r1.60 src/sys/arch/evbppc/walnut/machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbppc/conf/files.walnut
diff -u src/sys/arch/evbppc/conf/files.walnut:1.17 src/sys/arch/evbppc/conf/files.walnut:1.18
--- src/sys/arch/evbppc/conf/files.walnut:1.17 Mon Jun 20 17:44:33 2011
+++ src/sys/arch/evbppc/conf/files.walnut Mon Mar 29 14:21:08 2021
@@ -1,4 +1,4 @@
-# $NetBSD: files.walnut,v 1.17 2011/06/20 17:44:33 matt Exp $
+# $NetBSD: files.walnut,v 1.18 2021/03/29 14:21:08 rin Exp $
#
# walnut-specific configuration info
@@ -6,6 +6,7 @@ file arch/evbppc/walnut/autoconf.c
file arch/evbppc/walnut/consinit.c
file arch/evbppc/walnut/machdep.c
file arch/powerpc/ibm4xx/ibm4xx_autoconf.c
+file arch/powerpc/ibm4xx/ibm40x_machdep.c
file arch/powerpc/ibm4xx/ibm4xx_machdep.c
# Memory Disk for install kernel
Index: src/sys/arch/evbppc/walnut/machdep.c
diff -u src/sys/arch/evbppc/walnut/machdep.c:1.59 src/sys/arch/evbppc/walnut/machdep.c:1.60
--- src/sys/arch/evbppc/walnut/machdep.c:1.59 Thu Jun 11 19:20:43 2020
+++ src/sys/arch/evbppc/walnut/machdep.c Mon Mar 29 14:21:08 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.59 2020/06/11 19:20:43 ad Exp $ */
+/* $NetBSD: machdep.c,v 1.60 2021/03/29 14:21:08 rin Exp $ */
/*
* Copyright 2001, 2002 Wasabi Systems, Inc.
@@ -67,7 +67,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.59 2020/06/11 19:20:43 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.60 2021/03/29 14:21:08 rin Exp $");
#include "opt_compat_netbsd.h"
#include "opt_ddb.h"
@@ -142,10 +142,6 @@ void initppc(vaddr_t, vaddr_t, char *, v
static void dumpsys(void);
-#define MEMREGIONS 8
-struct mem_region physmemr[MEMREGIONS]; /* Hard code memory */
-struct mem_region availmemr[MEMREGIONS]; /* Who's supposed to set these up? */
-
struct board_cfg_data board_data;
void
@@ -160,13 +156,7 @@ initppc(vaddr_t startkernel, vaddr_t end
/* Save info block */
memcpy(_data, info_block, sizeof(board_data));
- memset(physmemr, 0, sizeof physmemr);
- memset(availmemr, 0, sizeof availmemr);
- physmemr[0].start = 0;
- physmemr[0].size = board_data.mem_size & ~PGOFSET;
- /* Lower memory reserved by eval board BIOS */
- availmemr[0].start = startkernel;
- availmemr[0].size = board_data.mem_size - availmemr[0].start;
+ ibm40x_memsize_init(board_data.mem_size, startkernel);
/* Linear map kernel memory */
for (vaddr_t va = 0; va < endkernel; va += TLB_PG_SIZE) {
@@ -174,7 +164,8 @@ initppc(vaddr_t startkernel, vaddr_t end
}
/* Map console after physmem (see pmap_tlbmiss()) */
- ppc4xx_tlb_reserve(0xef00, roundup(physmemr[0].size, TLB_PG_SIZE),
+ ppc4xx_tlb_reserve(0xef00,
+ roundup(board_data.mem_size, TLB_PG_SIZE),
TLB_PG_SIZE, TLB_I | TLB_G);
mtspr(SPR_TCR, 0); /* disable all timers */
@@ -389,15 +380,6 @@ cpu_reboot(int howto, char *what)
#endif
}
-void
-mem_regions(struct mem_region **mem, struct mem_region **avail)
-{
-
- *mem = physmemr;
- *avail = availmemr;
-}
-
-
int
ibm4xx_pci_bus_maxdevs(void *v, int busno)
{
CVS commit: src/sys/arch/evbppc/walnut
Module Name:src
Committed By: rin
Date: Mon Mar 29 13:59:16 UTC 2021
Modified Files:
src/sys/arch/evbppc/walnut: consinit.c
Log Message:
Use com_opb_cnattach().
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbppc/walnut/consinit.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbppc/walnut/consinit.c
diff -u src/sys/arch/evbppc/walnut/consinit.c:1.8 src/sys/arch/evbppc/walnut/consinit.c:1.9
--- src/sys/arch/evbppc/walnut/consinit.c:1.8 Fri Jul 1 19:03:50 2011
+++ src/sys/arch/evbppc/walnut/consinit.c Mon Mar 29 13:59:15 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: consinit.c,v 1.8 2011/07/01 19:03:50 dyoung Exp $ */
+/* $NetBSD: consinit.c,v 1.9 2021/03/29 13:59:15 rin Exp $ */
/*
* Copyright (c) 1998
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.8 2011/07/01 19:03:50 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.9 2021/03/29 13:59:15 rin Exp $");
#include "opt_kgdb.h"
@@ -44,6 +44,7 @@ __KERNEL_RCSID(0, "$NetBSD: consinit.c,v
#include
#include
#include
+#include
#endif
#include
@@ -92,36 +93,11 @@ int comkgdbmode = KGDB_DEVMODE;
#endif /* KGDB */
-/*
- * consinit:
- * initialize the system console.
- * XXX - shouldn't deal with this initted thing, but then,
- * it shouldn't be called from initppc either.
- */
void
consinit(void)
{
- static int initted = 0;
-#if (NCOM > 0)
- bus_space_tag_t tag;
-#endif
- if (initted)
- return;
- initted = 1;
-
-#if (NCOM > 0)
- /* We *know* the com-console attaches to opb */
- tag = opb_get_bus_space_tag();
-
- if (comcnattach(tag, CONADDR, CONSPEED, COM_FREQ * 6,
- COM_TYPE_NORMAL, comcnmode))
- panic("can't init serial console @%x", CONADDR);
- else
- return;
-#endif
- panic("console device missing -- serial console not in kernel");
- /* Of course, this is moot if there is no console... */
+ com_opb_cnattach(COM_FREQ * 6, CONADDR, CONSPEED, comcnmode);
}
#ifdef KGDB
CVS commit: src/sys/arch/evbppc/walnut
Module Name:src
Committed By: rin
Date: Mon Mar 29 13:49:15 UTC 2021
Modified Files:
src/sys/arch/evbppc/walnut: autoconf.c
Log Message:
Use genppc_cpu_configure().
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/evbppc/walnut/autoconf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbppc/walnut/autoconf.c
diff -u src/sys/arch/evbppc/walnut/autoconf.c:1.24 src/sys/arch/evbppc/walnut/autoconf.c:1.25
--- src/sys/arch/evbppc/walnut/autoconf.c:1.24 Mon Mar 29 13:38:31 2021
+++ src/sys/arch/evbppc/walnut/autoconf.c Mon Mar 29 13:49:15 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.24 2021/03/29 13:38:31 rin Exp $ */
+/* $NetBSD: autoconf.c,v 1.25 2021/03/29 13:49:15 rin Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.24 2021/03/29 13:38:31 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.25 2021/03/29 13:49:15 rin Exp $");
#include
#include
@@ -71,7 +71,7 @@ cpu_configure(void)
if (config_rootfound("plb", __UNCONST(_plb_devs)) == NULL)
panic("configure: plb not configured");
- (void)spl0();
+ genppc_cpu_configure();
}
void
CVS commit: src/sys/arch/evbppc
Module Name:src
Committed By: rin
Date: Mon Mar 29 13:38:31 UTC 2021
Modified Files:
src/sys/arch/evbppc/conf: files.obs405
src/sys/arch/evbppc/obs405: obs200_autoconf.c obs266_autoconf.c
obs600_autoconf.c
src/sys/arch/evbppc/walnut: autoconf.c
Removed Files:
src/sys/arch/evbppc/obs405: obs405_autoconf.c
Log Message:
Set com(4) frequency in ibm4xx_device_register() in order to dedup codes.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/evbppc/conf/files.obs405
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbppc/obs405/obs200_autoconf.c \
src/sys/arch/evbppc/obs405/obs266_autoconf.c
cvs rdiff -u -r1.7 -r0 src/sys/arch/evbppc/obs405/obs405_autoconf.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbppc/obs405/obs600_autoconf.c
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/evbppc/walnut/autoconf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbppc/conf/files.obs405
diff -u src/sys/arch/evbppc/conf/files.obs405:1.21 src/sys/arch/evbppc/conf/files.obs405:1.22
--- src/sys/arch/evbppc/conf/files.obs405:1.21 Thu Mar 18 13:47:04 2010
+++ src/sys/arch/evbppc/conf/files.obs405 Mon Mar 29 13:38:31 2021
@@ -1,11 +1,10 @@
-# $NetBSD: files.obs405,v 1.21 2010/03/18 13:47:04 kiyohara Exp $
+# $NetBSD: files.obs405,v 1.22 2021/03/29 13:38:31 rin Exp $
#
# obs405-specific configuration info
file arch/powerpc/ibm4xx/ibm4xx_autoconf.c
file arch/powerpc/ibm4xx/ibm40x_machdep.c
file arch/powerpc/ibm4xx/ibm4xx_machdep.c
-file arch/evbppc/obs405/obs405_autoconf.c
file arch/evbppc/obs405/obs405_machdep.c
# Memory Disk for install kernel
Index: src/sys/arch/evbppc/obs405/obs200_autoconf.c
diff -u src/sys/arch/evbppc/obs405/obs200_autoconf.c:1.8 src/sys/arch/evbppc/obs405/obs200_autoconf.c:1.9
--- src/sys/arch/evbppc/obs405/obs200_autoconf.c:1.8 Tue Mar 2 07:21:01 2021
+++ src/sys/arch/evbppc/obs405/obs200_autoconf.c Mon Mar 29 13:38:31 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: obs200_autoconf.c,v 1.8 2021/03/02 07:21:01 rin Exp $ */
+/* $NetBSD: obs200_autoconf.c,v 1.9 2021/03/29 13:38:31 rin Exp $ */
/*
* Copyright 2004 Shigeyuki Fukushima.
@@ -33,7 +33,7 @@
* DAMAGE.
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: obs200_autoconf.c,v 1.8 2021/03/02 07:21:01 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obs200_autoconf.c,v 1.9 2021/03/29 13:38:31 rin Exp $");
#include
#include
@@ -69,5 +69,5 @@ cpu_configure(void)
void device_register(device_t dev, void *aux)
{
- obs405_device_register(dev, aux, OBS200_COM_FREQ);
+ ibm4xx_device_register(dev, aux, OBS200_COM_FREQ);
}
Index: src/sys/arch/evbppc/obs405/obs266_autoconf.c
diff -u src/sys/arch/evbppc/obs405/obs266_autoconf.c:1.8 src/sys/arch/evbppc/obs405/obs266_autoconf.c:1.9
--- src/sys/arch/evbppc/obs405/obs266_autoconf.c:1.8 Tue Mar 2 07:21:01 2021
+++ src/sys/arch/evbppc/obs405/obs266_autoconf.c Mon Mar 29 13:38:31 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: obs266_autoconf.c,v 1.8 2021/03/02 07:21:01 rin Exp $ */
+/* $NetBSD: obs266_autoconf.c,v 1.9 2021/03/29 13:38:31 rin Exp $ */
/*
* Copyright 2004 Shigeyuki Fukushima.
@@ -33,7 +33,7 @@
* DAMAGE.
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: obs266_autoconf.c,v 1.8 2021/03/02 07:21:01 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obs266_autoconf.c,v 1.9 2021/03/29 13:38:31 rin Exp $");
#include
#include
@@ -69,5 +69,5 @@ void
device_register(device_t dev, void *aux)
{
- obs405_device_register(dev, aux, OBS266_COM_FREQ);
+ ibm4xx_device_register(dev, aux, OBS266_COM_FREQ);
}
Index: src/sys/arch/evbppc/obs405/obs600_autoconf.c
diff -u src/sys/arch/evbppc/obs405/obs600_autoconf.c:1.10 src/sys/arch/evbppc/obs405/obs600_autoconf.c:1.11
--- src/sys/arch/evbppc/obs405/obs600_autoconf.c:1.10 Tue Mar 2 07:27:24 2021
+++ src/sys/arch/evbppc/obs405/obs600_autoconf.c Mon Mar 29 13:38:31 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: obs600_autoconf.c,v 1.10 2021/03/02 07:27:24 rin Exp $ */
+/* $NetBSD: obs600_autoconf.c,v 1.11 2021/03/29 13:38:31 rin Exp $ */
/*
* Copyright 2004 Shigeyuki Fukushima.
@@ -33,7 +33,7 @@
* DAMAGE.
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: obs600_autoconf.c,v 1.10 2021/03/02 07:27:24 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obs600_autoconf.c,v 1.11 2021/03/29 13:38:31 rin Exp $");
#include "dwctwo.h"
@@ -126,5 +126,5 @@ device_register(device_t dev, void *aux)
}
#endif
- obs405_device_register(dev, aux, OBS600_COM_FREQ);
+ ibm4xx_device_register(dev, aux, OBS600_COM_FREQ);
}
Index: src/sys/arch/evbppc/walnut/autoconf.c
diff -u src/sys/arch/evbppc/walnut/autoconf.c:1.23 src/sys/arch/evbppc/walnut/autoconf.c:1.24
--- src/sys/arch/evbppc/walnut/autoconf.c:1.23 Mon Mar 29 13:17:53 2021
+++ src/sys/arch/evbppc/walnut/autoconf.c Mon Mar 29 13:38:31 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.23 2021/03/29 13:17:53 rin Exp $ */
+/* $NetBSD: autoconf.c,v 1.24 2021/03/29 13:38:31 rin Exp $ */
/*
*
CVS commit: src/sys/arch/evbppc/virtex
Module Name:src
Committed By: rin
Date: Mon Mar 29 13:14:14 UTC 2021
Modified Files:
src/sys/arch/evbppc/virtex: autoconf.c consinit.c design_gsrd2.c
machdep.c
src/sys/arch/evbppc/virtex/dev: if_temac.c tft_ll.c
Log Message:
Make VIRTEX_* kernels compile. Not tested.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbppc/virtex/autoconf.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbppc/virtex/consinit.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbppc/virtex/design_gsrd2.c
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/evbppc/virtex/machdep.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/evbppc/virtex/dev/if_temac.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbppc/virtex/dev/tft_ll.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbppc/virtex/autoconf.c
diff -u src/sys/arch/evbppc/virtex/autoconf.c:1.5 src/sys/arch/evbppc/virtex/autoconf.c:1.6
--- src/sys/arch/evbppc/virtex/autoconf.c:1.5 Sun Jul 29 18:05:42 2012
+++ src/sys/arch/evbppc/virtex/autoconf.c Mon Mar 29 13:14:13 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.5 2012/07/29 18:05:42 mlelstv Exp $ */
+/* $NetBSD: autoconf.c,v 1.6 2021/03/29 13:14:13 rin Exp $ */
/*
* Copyright (c) 2006 Jachym Holecek
@@ -61,7 +61,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.5 2012/07/29 18:05:42 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.6 2021/03/29 13:14:13 rin Exp $");
#include
#include
@@ -76,7 +76,7 @@ __KERNEL_RCSID(0, "$NetBSD: autoconf.c,v
/* List of port-specific devices to attach to the processor local bus. */
-static const struct plb_dev local_plb_devs [] = {
+static struct plb_dev local_plb_devs [] = {
{ XILVIRTEX, "xcvbus" },
{ 0, NULL }
};
Index: src/sys/arch/evbppc/virtex/consinit.c
diff -u src/sys/arch/evbppc/virtex/consinit.c:1.3 src/sys/arch/evbppc/virtex/consinit.c:1.4
--- src/sys/arch/evbppc/virtex/consinit.c:1.3 Fri Jul 1 19:03:50 2011
+++ src/sys/arch/evbppc/virtex/consinit.c Mon Mar 29 13:14:13 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: consinit.c,v 1.3 2011/07/01 19:03:50 dyoung Exp $ */
+/* $NetBSD: consinit.c,v 1.4 2021/03/29 13:14:13 rin Exp $ */
/*
* Copyright (c) 2006 Jachym Holecek
@@ -33,7 +33,7 @@
#include "xlcom.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.3 2011/07/01 19:03:50 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.4 2021/03/29 13:14:13 rin Exp $");
#include
#include
@@ -54,7 +54,6 @@ void xlcom_kgdbinit(void);
#endif
#endif
-struct consdev *cn_tab = NULL;
bus_space_tag_t consdev_iot;
bus_space_handle_t consdev_ioh;
Index: src/sys/arch/evbppc/virtex/design_gsrd2.c
diff -u src/sys/arch/evbppc/virtex/design_gsrd2.c:1.4 src/sys/arch/evbppc/virtex/design_gsrd2.c:1.5
--- src/sys/arch/evbppc/virtex/design_gsrd2.c:1.4 Sat Jun 18 06:44:27 2011
+++ src/sys/arch/evbppc/virtex/design_gsrd2.c Mon Mar 29 13:14:13 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: design_gsrd2.c,v 1.4 2011/06/18 06:44:27 matt Exp $ */
+/* $NetBSD: design_gsrd2.c,v 1.5 2021/03/29 13:14:13 rin Exp $ */
/*
* Copyright (c) 2006 Jachym Holecek
@@ -32,7 +32,7 @@
#include "opt_virtex.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: design_gsrd2.c,v 1.4 2011/06/18 06:44:27 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: design_gsrd2.c,v 1.5 2021/03/29 13:14:13 rin Exp $");
#include
#include
@@ -96,6 +96,7 @@ static void *cdmac_ih;
* DCR bus space leaf access routines.
*/
+#ifndef DESIGN_DFC
static void
tft0_write_4(bus_space_tag_t t, bus_space_handle_t h, uint32_t addr,
uint32_t val)
@@ -124,6 +125,7 @@ tft0_read_4(bus_space_tag_t t, bus_space
return (val);
}
+#endif /* !DESIGN_DFC */
static void
tft1_write_4(bus_space_tag_t t, bus_space_handle_t h, uint32_t addr,
@@ -232,9 +234,11 @@ static const struct powerpc_bus_space te
DCR_BST_BODY(DCR_TEMAC_BASE, temac_read_4, temac_write_4)
};
+#ifndef DESIGN_DFC
static const struct powerpc_bus_space tft0_bst = {
DCR_BST_BODY(DCR_TFT0_BASE, tft0_read_4, tft0_write_4)
};
+#endif
static const struct powerpc_bus_space tft1_bst = {
DCR_BST_BODY(DCR_TFT1_BASE, tft1_read_4, tft1_write_4)
Index: src/sys/arch/evbppc/virtex/machdep.c
diff -u src/sys/arch/evbppc/virtex/machdep.c:1.25 src/sys/arch/evbppc/virtex/machdep.c:1.26
--- src/sys/arch/evbppc/virtex/machdep.c:1.25 Thu Jun 11 19:20:43 2020
+++ src/sys/arch/evbppc/virtex/machdep.c Mon Mar 29 13:14:13 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.25 2020/06/11 19:20:43 ad Exp $ */
+/* $NetBSD: machdep.c,v 1.26 2021/03/29 13:14:13 rin Exp $ */
/*
* Copyright (c) 2006 Jachym Holecek
@@ -34,7 +34,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.25 2020/06/11 19:20:43 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.26 2021/03/29 13:14:13 rin Exp $");
#include "opt_compat_netbsd.h"
#include "opt_ddb.h"
@@ -100,7 +100,6 @@ char machine[] = MACHINE; /* from */
CVS commit: src/sys/arch/evbppc/conf
Module Name:src
Committed By: rin
Date: Mon Mar 29 13:12:38 UTC 2021
Modified Files:
src/sys/arch/evbppc/conf: Makefile.virtex.inc Makefile.walnut.inc
Log Message:
Fix copy-paste; These boards are 405, not 403.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbppc/conf/Makefile.virtex.inc
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbppc/conf/Makefile.walnut.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbppc/conf/Makefile.virtex.inc
diff -u src/sys/arch/evbppc/conf/Makefile.virtex.inc:1.1 src/sys/arch/evbppc/conf/Makefile.virtex.inc:1.2
--- src/sys/arch/evbppc/conf/Makefile.virtex.inc:1.1 Sat Dec 2 22:18:47 2006
+++ src/sys/arch/evbppc/conf/Makefile.virtex.inc Mon Mar 29 13:12:38 2021
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.virtex.inc,v 1.1 2006/12/02 22:18:47 freza Exp $
+# $NetBSD: Makefile.virtex.inc,v 1.2 2021/03/29 13:12:38 rin Exp $
-CFLAGS+=-mcpu=403
-AFLAGS+=-mcpu=403
+CFLAGS+=-mcpu=405
+AFLAGS+=-mcpu=405
.ifndef TEXTADDR
BEGIN:
Index: src/sys/arch/evbppc/conf/Makefile.walnut.inc
diff -u src/sys/arch/evbppc/conf/Makefile.walnut.inc:1.9 src/sys/arch/evbppc/conf/Makefile.walnut.inc:1.10
--- src/sys/arch/evbppc/conf/Makefile.walnut.inc:1.9 Thu Jul 28 22:46:48 2016
+++ src/sys/arch/evbppc/conf/Makefile.walnut.inc Mon Mar 29 13:12:38 2021
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.walnut.inc,v 1.9 2016/07/28 22:46:48 maya Exp $
+# $NetBSD: Makefile.walnut.inc,v 1.10 2021/03/29 13:12:38 rin Exp $
MKIMG?= ${HOST_SH} ${THISPPC}/compile/walnut-mkimg.sh
-CFLAGS+=-mcpu=403
-AFLAGS+=-mcpu=403
+CFLAGS+=-mcpu=405
+AFLAGS+=-mcpu=405
TEXTADDR?= 25000
SYSTEM_FIRST_OBJ= walnut_start.o
CVS commit: src/sys/arch/evbppc/explora/dev
Module Name:src
Committed By: rin
Date: Tue Mar 16 08:16:53 UTC 2021
Modified Files:
src/sys/arch/evbppc/explora/dev: com_elb.c
Log Message:
Style. No binary changes.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbppc/explora/dev/com_elb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbppc/explora/dev/com_elb.c
diff -u src/sys/arch/evbppc/explora/dev/com_elb.c:1.11 src/sys/arch/evbppc/explora/dev/com_elb.c:1.12
--- src/sys/arch/evbppc/explora/dev/com_elb.c:1.11 Tue Mar 2 12:01:02 2021
+++ src/sys/arch/evbppc/explora/dev/com_elb.c Tue Mar 16 08:16:53 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: com_elb.c,v 1.11 2021/03/02 12:01:02 rin Exp $ */
+/* $NetBSD: com_elb.c,v 1.12 2021/03/16 08:16:53 rin Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: com_elb.c,v 1.11 2021/03/02 12:01:02 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_elb.c,v 1.12 2021/03/16 08:16:53 rin Exp $");
#include
#include
@@ -59,12 +59,12 @@ CFATTACH_DECL_NEW(com_elb, sizeof(struct
int
com_elb_probe(device_t parent, cfdata_t cf, void *aux)
{
- struct elb_attach_args *oaa = aux;
+ struct elb_attach_args *eaa = aux;
- if (strcmp(oaa->elb_name, cf->cf_name) != 0)
+ if (strcmp(eaa->elb_name, cf->cf_name) != 0)
return 0;
- return (1);
+ return 1;
}
void
CVS commit: src/sys/arch/evbppc/conf
Module Name:src Committed By: rin Date: Sun Mar 14 03:35:39 UTC 2021 Modified Files: src/sys/arch/evbppc/conf: EXPLORA451 Log Message: Enable NFS_BOOT_UDP; on-board NIC seems to be too slow for overhead due to NFS over TCP. Some scores of pkgsrc/benchmarks/bonnie improve nearly x2. To generate a diff of this commit: cvs rdiff -u -r1.70 -r1.71 src/sys/arch/evbppc/conf/EXPLORA451 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbppc/conf/EXPLORA451 diff -u src/sys/arch/evbppc/conf/EXPLORA451:1.70 src/sys/arch/evbppc/conf/EXPLORA451:1.71 --- src/sys/arch/evbppc/conf/EXPLORA451:1.70 Fri Mar 5 07:06:15 2021 +++ src/sys/arch/evbppc/conf/EXPLORA451 Sun Mar 14 03:35:39 2021 @@ -1,4 +1,4 @@ -# $NetBSD: EXPLORA451,v 1.70 2021/03/05 07:06:15 rin Exp $ +# $NetBSD: EXPLORA451,v 1.71 2021/03/14 03:35:39 rin Exp $ # # EXPLORA451 -- NCD Explora 450 Series Thin Client # @@ -121,6 +121,7 @@ options WS_KERNEL_FG=WSCOL_GREEN options WSDISPLAY_DEFAULTSCREENS=1 # Options for netboot +options NFS_BOOT_UDP # for much better performance options NFS_BOOT_BOOTPARAM options NFS_BOOT_DHCP
CVS commit: src/sys/arch/evbppc/explora/dev
Module Name:src
Committed By: rin
Date: Sun Mar 7 10:33:07 UTC 2021
Modified Files:
src/sys/arch/evbppc/explora/dev: fb_elb.c
Log Message:
Add initial support for Xorg server for wsfb(4):
- Fix WSDISPLAYIO_GTYPE ioctl.
- Support WSDISPLAYIO_LINEBYTES, _{GET,PUT}CMAP, and _SMODE ioctl.
As well as tiny improvements related to it:
- Use actual size of framebuffer for bus_space_mmap(9), as well as upper
bound for mmap(2).
- Use base address obtained from autoconf(9) layer for mmap(2), instead of
hard-coded one.
- Use rasops_cmap as default color map, instead of our own ANSI color map.
- Show monitor resolution and color depth instead of size as tty.
I've confirmed that mlterm-fb from pkgsrc/x11/mlterm also works fine.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/evbppc/explora/dev/fb_elb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbppc/explora/dev/fb_elb.c
diff -u src/sys/arch/evbppc/explora/dev/fb_elb.c:1.17 src/sys/arch/evbppc/explora/dev/fb_elb.c:1.18
--- src/sys/arch/evbppc/explora/dev/fb_elb.c:1.17 Sun Mar 7 10:01:03 2021
+++ src/sys/arch/evbppc/explora/dev/fb_elb.c Sun Mar 7 10:33:07 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: fb_elb.c,v 1.17 2021/03/07 10:01:03 rin Exp $ */
+/* $NetBSD: fb_elb.c,v 1.18 2021/03/07 10:33:07 rin Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: fb_elb.c,v 1.17 2021/03/07 10:01:03 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fb_elb.c,v 1.18 2021/03/07 10:33:07 rin Exp $");
#include
#include
@@ -58,18 +58,38 @@ struct fb_dev {
struct rasops_info fb_ri;
};
+struct fb_cmap {
+ uint8_t r;
+ uint8_t g;
+ uint8_t b;
+};
+
struct fb_elb_softc {
device_t sc_dev;
struct fb_dev *sc_fb;
+ bus_addr_t sc_fbbase;
+ bus_size_t sc_fbsize;
int sc_nscreens;
+ int sc_mode;
+ struct fb_cmap sc_cmap[CMAP_SIZE];
};
+/*
+ * We assume that rasops_cmap is compatible to sc_cmap.
+ */
+CTASSERT(sizeof(rasops_cmap) == CMAP_SIZE * 3);
+
void fb_cnattach(bus_space_tag_t, bus_addr_t, void *);
static int fb_elb_probe(device_t, cfdata_t, void *);
static void fb_elb_attach(device_t, device_t, void *);
-static void fb_init(struct fb_dev *);
+static void fb_init(struct fb_dev *, int, int);
+static void fb_initcmap(struct fb_elb_softc *);
+
+static int fb_getcmap(struct fb_elb_softc *, struct wsdisplay_cmap *);
+static int fb_putcmap(struct fb_elb_softc *,
+ const struct wsdisplay_cmap *);
static int fb_ioctl(void *, void *, u_long, void *, int, struct lwp *);
static paddr_t fb_mmap(void *, void *, off_t, int);
@@ -84,7 +104,8 @@ static void fb_erasecols(void *, int, in
static void fb_copyrows(void *, int, int, int);
static void fb_copycols(void *, int, int, int, int);
-static void s3_init(struct fb_dev *, int *, int *);
+static void s3_getgeometry(struct fb_dev *, int *, int *);
+static void s3_putcmap(struct fb_dev *, const struct fb_cmap *);
static void s3_copy(struct fb_dev *, int, int, int, int, int, int, int);
static void s3_fill(struct fb_dev *, int, int, int, int, int, int);
@@ -120,12 +141,17 @@ fb_cnattach(bus_space_tag_t iot, bus_add
{
struct rasops_info *ri = _dev.fb_ri;
long defattr;
+ int width, height;
console_dev.fb_iot = iot;
console_dev.fb_ioh = iobase;
console_dev.fb_vram = vram;
- fb_init(_dev);
+ s3_getgeometry(_dev, , );
+
+ fb_init(_dev, width, height);
+
+ s3_putcmap(_dev, (const struct fb_cmap*)rasops_cmap);
(*ri->ri_ops.allocattr)(ri, 0, 0, 0, );
@@ -152,35 +178,37 @@ fb_elb_attach(device_t parent, device_t
struct fb_elb_softc *sc = device_private(self);
struct elb_attach_args *eaa = aux;
struct wsemuldisplaydev_attach_args waa;
- struct rasops_info *ri;
bus_space_handle_t ioh;
- int is_console;
+ int is_console, width, height;
sc->sc_dev = self;
is_console = ((void *)eaa->elb_base == console_dev.fb_vram);
- if (is_console) {
+ if (is_console)
sc->sc_fb = _dev;
- sc->sc_fb->fb_ri.ri_flg &= ~RI_NO_AUTO;
- } else {
+ else
sc->sc_fb = kmem_zalloc(sizeof(struct fb_dev), KM_SLEEP);
- }
sc->sc_fb->fb_iot = eaa->elb_bt;
- bus_space_map(sc->sc_fb->fb_iot, eaa->elb_base, SIZE_FB,
- BUS_SPACE_MAP_LINEAR, );
- sc->sc_fb->fb_vram = bus_space_vaddr(sc->sc_fb->fb_iot, ioh);
bus_space_map(sc->sc_fb->fb_iot, eaa->elb_base2, FB_NPORTS,
0, >sc_fb->fb_ioh);
- if (!is_console)
- fb_init(sc->sc_fb);
+ s3_getgeometry(sc->sc_fb, , );
+
+ sc->sc_fbbase = eaa->elb_base;
+ sc->sc_fbsize = width * height;
+ bus_space_map(sc->sc_fb->fb_iot, sc->sc_fbbase, sc->sc_fbsize,
+ BUS_SPACE_MAP_LINEAR, );
+ sc->sc_fb->fb_vram = bus_space_vaddr(sc->sc_fb->fb_iot, ioh);
- ri = >sc_fb->fb_ri;
+ if (!is_console)
+ fb_init(sc->sc_fb, width, height);
+ fb_initcmap(sc);
- printf(": %d x %d\n", ri->ri_rows, ri->ri_cols);
+ printf(": %dx%d 8bpp\n", width,
CVS commit: src/sys/arch/evbppc/explora/dev
Module Name:src
Committed By: rin
Date: Sun Mar 7 10:01:03 UTC 2021
Modified Files:
src/sys/arch/evbppc/explora/dev: fb_elb.c
Log Message:
Misc cleanup for clarity. No functional changes.
- Group function declarations, and reorder function bodies accordingly.
- Misc KNF.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/evbppc/explora/dev/fb_elb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbppc/explora/dev/fb_elb.c
diff -u src/sys/arch/evbppc/explora/dev/fb_elb.c:1.16 src/sys/arch/evbppc/explora/dev/fb_elb.c:1.17
--- src/sys/arch/evbppc/explora/dev/fb_elb.c:1.16 Fri Mar 5 06:50:57 2021
+++ src/sys/arch/evbppc/explora/dev/fb_elb.c Sun Mar 7 10:01:03 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: fb_elb.c,v 1.16 2021/03/05 06:50:57 rin Exp $ */
+/* $NetBSD: fb_elb.c,v 1.17 2021/03/07 10:01:03 rin Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: fb_elb.c,v 1.16 2021/03/05 06:50:57 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fb_elb.c,v 1.17 2021/03/07 10:01:03 rin Exp $");
#include
#include
@@ -49,6 +49,7 @@ __KERNEL_RCSID(0, "$NetBSD: fb_elb.c,v 1
#include
#define FB_NPORTS 65536
+#define CMAP_SIZE 256
struct fb_dev {
void *fb_vram;
@@ -63,10 +64,13 @@ struct fb_elb_softc {
int sc_nscreens;
};
+void fb_cnattach(bus_space_tag_t, bus_addr_t, void *);
+
static int fb_elb_probe(device_t, cfdata_t, void *);
static void fb_elb_attach(device_t, device_t, void *);
-void fb_cnattach(bus_space_tag_t, bus_addr_t, void *);
+
static void fb_init(struct fb_dev *);
+
static int fb_ioctl(void *, void *, u_long, void *, int, struct lwp *);
static paddr_t fb_mmap(void *, void *, off_t, int);
static int fb_alloc_screen(void *, const struct wsscreen_descr *, void **,
@@ -111,6 +115,23 @@ static struct wsscreen_list screenlist =
__arraycount(scrlist), scrlist
};
+void
+fb_cnattach(bus_space_tag_t iot, bus_addr_t iobase, void *vram)
+{
+ struct rasops_info *ri = _dev.fb_ri;
+ long defattr;
+
+ console_dev.fb_iot = iot;
+ console_dev.fb_ioh = iobase;
+ console_dev.fb_vram = vram;
+
+ fb_init(_dev);
+
+ (*ri->ri_ops.allocattr)(ri, 0, 0, 0, );
+
+ wsdisplay_cnattach(, ri, 0, 0, defattr);
+}
+
CFATTACH_DECL_NEW(fb_elb, sizeof(struct fb_elb_softc),
fb_elb_probe, fb_elb_attach, NULL, NULL);
@@ -122,7 +143,7 @@ fb_elb_probe(device_t parent, cfdata_t c
if (strcmp(oaa->elb_name, cf->cf_name) != 0)
return 0;
- return (1);
+ return 1;
}
static void
@@ -206,7 +227,7 @@ fb_ioctl(void *v, void *vs, u_long cmd,
switch (cmd) {
case WSDISPLAYIO_GTYPE:
*(int *)data = WSDISPLAY_TYPE_UNKNOWN; /* XXX */
- return(0);
+ return 0;
case WSDISPLAYIO_GINFO:
wdf = (void *)data;
@@ -214,7 +235,7 @@ fb_ioctl(void *v, void *vs, u_long cmd,
wdf->width = ri->ri_width;
wdf->depth = ri->ri_depth;
wdf->cmsize = 16; /*XXX*/
- return(0);
+ return 0;
case WSDISPLAYIO_SVIDEO:
case WSDISPLAYIO_GETCMAP:
@@ -222,7 +243,7 @@ fb_ioctl(void *v, void *vs, u_long cmd,
break;
}
- return(EPASSTHROUGH);
+ return EPASSTHROUGH;
}
static paddr_t
@@ -252,7 +273,7 @@ fb_alloc_screen(void *v, const struct ws
(*ri->ri_ops.allocattr)(ri, 0, 0, 0, attrp);
sc->sc_nscreens++;
- return(0);
+ return 0;
}
static void
@@ -270,24 +291,8 @@ static int
fb_show_screen(void *v, void *cookie, int waitok, void (*cb)(void *, int, int),
void *cbarg)
{
- return(0);
-}
-void
-fb_cnattach(bus_space_tag_t iot, bus_addr_t iobase, void *vram)
-{
- struct rasops_info *ri = _dev.fb_ri;
- long defattr;
-
- console_dev.fb_iot = iot;
- console_dev.fb_ioh = iobase;
- console_dev.fb_vram = vram;
-
- fb_init(_dev);
-
- (*ri->ri_ops.allocattr)(ri, 0, 0, 0, );
-
- wsdisplay_cnattach(, ri, 0, 0, defattr);
+ return 0;
}
static void
@@ -385,8 +390,6 @@ fb_copycols(void *v, int row, int srccol
#define S3_CSRC_DISPMEM 0x0060
#define S3_MIX_NEW 0x0007
-#define CMAP_SIZE 256
-
static u_int8_t default_cmap[] = {
/* black */ 0, 0, 0,
/* red */ 192, 0, 0,
CVS commit: src/sys/arch/evbppc/explora
Module Name:src Committed By: rin Date: Sun Mar 7 09:48:33 UTC 2021 Modified Files: src/sys/arch/evbppc/explora: consinit.c Log Message: No need to clear framebuffer here; rasops(4) takes care of it. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbppc/explora/consinit.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbppc/explora/consinit.c diff -u src/sys/arch/evbppc/explora/consinit.c:1.11 src/sys/arch/evbppc/explora/consinit.c:1.12 --- src/sys/arch/evbppc/explora/consinit.c:1.11 Sun Mar 7 09:47:00 2021 +++ src/sys/arch/evbppc/explora/consinit.c Sun Mar 7 09:48:33 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: consinit.c,v 1.11 2021/03/07 09:47:00 rin Exp $ */ +/* $NetBSD: consinit.c,v 1.12 2021/03/07 09:48:33 rin Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.11 2021/03/07 09:47:00 rin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.12 2021/03/07 09:48:33 rin Exp $"); #include #include @@ -81,9 +81,6 @@ consinit(void) COM_FREQ, COM_TYPE_NORMAL, (TTYDEF_CFLAG & ~(CSIZE | CSTOPB | PARENB)) | CS8); #else - /* Clear VRam */ - memset((void *)BASE_FB, 0, SIZE_FB); - tag = elb_get_bus_space_tag(BASE_FB); fb_cnattach(tag, BASE_FB2, (void *)BASE_FB);
CVS commit: src/sys/arch/evbppc/explora
Module Name:src
Committed By: rin
Date: Sun Mar 7 09:47:00 UTC 2021
Modified Files:
src/sys/arch/evbppc/explora: consinit.c
Log Message:
Reduce ifdef. No functional changes.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbppc/explora/consinit.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbppc/explora/consinit.c
diff -u src/sys/arch/evbppc/explora/consinit.c:1.10 src/sys/arch/evbppc/explora/consinit.c:1.11
--- src/sys/arch/evbppc/explora/consinit.c:1.10 Fri Mar 5 06:06:34 2021
+++ src/sys/arch/evbppc/explora/consinit.c Sun Mar 7 09:47:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: consinit.c,v 1.10 2021/03/05 06:06:34 rin Exp $ */
+/* $NetBSD: consinit.c,v 1.11 2021/03/07 09:47:00 rin Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.10 2021/03/05 06:06:34 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.11 2021/03/07 09:47:00 rin Exp $");
#include
#include
@@ -62,14 +62,13 @@ __KERNEL_RCSID(0, "$NetBSD: consinit.c,v
#define COM_CONSOLE_SPEED 9600
#endif
+extern void fb_cnattach(bus_space_tag_t, bus_addr_t, void *);
+
void
consinit(void)
{
bus_space_tag_t tag;
static int done = 0;
-#ifndef COM_IS_CONSOLE
- extern void fb_cnattach(bus_space_tag_t, bus_addr_t, void *);
-#endif
if (done)
return;
CVS commit: src/sys/arch/evbppc
Module Name:src
Committed By: rin
Date: Sun Mar 7 09:43:57 UTC 2021
Modified Files:
src/sys/arch/evbppc/conf: files.explora
src/sys/arch/evbppc/explora: machdep.c
Log Message:
Revert this commit:
http://www.nerv.org/netbsd/?q=id:20210305T064016Z.410b0e33273c3a62110d09e8bb27939f6a8bab38
> Map framebuffer to virtual space when fb(4) is present,
> even if it is not console.
Direct mapping for framebuffer is required only if fb(4) is console.
XXX
It would be nice if we can remove reserved TLB entries after
fb(4) is properly attached.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbppc/conf/files.explora
cvs rdiff -u -r1.45 -r1.46 src/sys/arch/evbppc/explora/machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbppc/conf/files.explora
diff -u src/sys/arch/evbppc/conf/files.explora:1.12 src/sys/arch/evbppc/conf/files.explora:1.13
--- src/sys/arch/evbppc/conf/files.explora:1.12 Fri Mar 5 06:40:15 2021
+++ src/sys/arch/evbppc/conf/files.explora Sun Mar 7 09:43:56 2021
@@ -1,4 +1,4 @@
-# $NetBSD: files.explora,v 1.12 2021/03/05 06:40:15 rin Exp $
+# $NetBSD: files.explora,v 1.13 2021/03/07 09:43:56 rin Exp $
# maxpartitions must be first item in files.${ARCH}
@@ -50,4 +50,4 @@ file arch/evbppc/explora/dev/pckbc_elb.c
device fb: wsemuldisplaydev, rasops8
attach fb at elb with fb_elb
-file arch/evbppc/explora/dev/fb_elb.c fb_elb needs-flag
+file arch/evbppc/explora/dev/fb_elb.c fb_elb
Index: src/sys/arch/evbppc/explora/machdep.c
diff -u src/sys/arch/evbppc/explora/machdep.c:1.45 src/sys/arch/evbppc/explora/machdep.c:1.46
--- src/sys/arch/evbppc/explora/machdep.c:1.45 Fri Mar 5 07:06:15 2021
+++ src/sys/arch/evbppc/explora/machdep.c Sun Mar 7 09:43:56 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.45 2021/03/05 07:06:15 rin Exp $ */
+/* $NetBSD: machdep.c,v 1.46 2021/03/07 09:43:56 rin Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -30,12 +30,11 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.45 2021/03/05 07:06:15 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.46 2021/03/07 09:43:56 rin Exp $");
#include "opt_explora.h"
#include "opt_modular.h"
-#include "fb_elb.h"
#include "ksyms.h"
#include
@@ -121,7 +120,7 @@ initppc(vaddr_t startkernel, vaddr_t end
/* Map PCKBC, PCKBC2, COM, LPT. This is far beyond physmem. */
ppc4xx_tlb_reserve(BASE_ISA, BASE_ISA, TLB_PG_SIZE, TLB_I | TLB_G);
-#if NFB_ELB > 0
+#ifndef COM_IS_CONSOLE
ppc4xx_tlb_reserve(BASE_FB, BASE_FB, TLB_PG_SIZE, TLB_I | TLB_G);
ppc4xx_tlb_reserve(BASE_FB2, BASE_FB2, TLB_PG_SIZE, TLB_I | TLB_G);
#endif
CVS commit: src/sys/arch/evbppc/obs405
Module Name:src Committed By: rin Date: Sat Mar 6 08:29:19 UTC 2021 Modified Files: src/sys/arch/evbppc/obs405: obs600_machdep.c Log Message: Reorder things in cpu_startup() for clarity. No functional changes intended. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbppc/obs405/obs600_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbppc/obs405/obs600_machdep.c diff -u src/sys/arch/evbppc/obs405/obs600_machdep.c:1.11 src/sys/arch/evbppc/obs405/obs600_machdep.c:1.12 --- src/sys/arch/evbppc/obs405/obs600_machdep.c:1.11 Tue Mar 2 07:27:24 2021 +++ src/sys/arch/evbppc/obs405/obs600_machdep.c Sat Mar 6 08:29:19 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: obs600_machdep.c,v 1.11 2021/03/02 07:27:24 rin Exp $ */ +/* $NetBSD: obs600_machdep.c,v 1.12 2021/03/06 08:29:19 rin Exp $ */ /* Original: md_machdep.c,v 1.3 2005/01/24 18:47:37 shige Exp $ */ /* @@ -68,7 +68,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: obs600_machdep.c,v 1.11 2021/03/02 07:27:24 rin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: obs600_machdep.c,v 1.12 2021/03/06 08:29:19 rin Exp $"); #include "opt_compat_netbsd.h" #include "opt_ddb.h" @@ -206,11 +206,6 @@ cpu_startup(void) */ board_info_init(); - /* - * Now that we have VM, malloc()s are OK in bus_space. - */ - bus_space_mallocok(); - pn = prop_number_create_integer(OBS600_CPU_FREQ); KASSERT(pn != NULL); if (prop_dictionary_set(board_properties, "processor-frequency", pn) == @@ -258,6 +253,11 @@ cpu_startup(void) prop_object_release(pn); /* + * Now that we have VM, malloc()s are OK in bus_space. + */ + bus_space_mallocok(); + + /* * no fake mapiodev */ fake_mapiodev = 0;
CVS commit: src/sys/arch/evbppc
Module Name:src
Committed By: rin
Date: Fri Mar 5 07:06:15 UTC 2021
Modified Files:
src/sys/arch/evbppc/conf: EXPLORA451
src/sys/arch/evbppc/explora: machdep.c
Log Message:
Identify oneself as ``Explora 450'' instead of 451.
There are models numbered 450 to 454. The differences b/w them are
shapes of ethernet and audio connectors. Base model number 450 is
displayed for (probably) all models by firmware.
To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 src/sys/arch/evbppc/conf/EXPLORA451
cvs rdiff -u -r1.44 -r1.45 src/sys/arch/evbppc/explora/machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbppc/conf/EXPLORA451
diff -u src/sys/arch/evbppc/conf/EXPLORA451:1.69 src/sys/arch/evbppc/conf/EXPLORA451:1.70
--- src/sys/arch/evbppc/conf/EXPLORA451:1.69 Fri Mar 5 06:57:02 2021
+++ src/sys/arch/evbppc/conf/EXPLORA451 Fri Mar 5 07:06:15 2021
@@ -1,6 +1,6 @@
-# $NetBSD: EXPLORA451,v 1.69 2021/03/05 06:57:02 rin Exp $
+# $NetBSD: EXPLORA451,v 1.70 2021/03/05 07:06:15 rin Exp $
#
-# GENERIC -- everything that's currently supported
+# EXPLORA451 -- NCD Explora 450 Series Thin Client
#
include "arch/evbppc/conf/std.explora"
Index: src/sys/arch/evbppc/explora/machdep.c
diff -u src/sys/arch/evbppc/explora/machdep.c:1.44 src/sys/arch/evbppc/explora/machdep.c:1.45
--- src/sys/arch/evbppc/explora/machdep.c:1.44 Fri Mar 5 06:40:15 2021
+++ src/sys/arch/evbppc/explora/machdep.c Fri Mar 5 07:06:15 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.44 2021/03/05 06:40:15 rin Exp $ */
+/* $NetBSD: machdep.c,v 1.45 2021/03/05 07:06:15 rin Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.44 2021/03/05 06:40:15 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.45 2021/03/05 07:06:15 rin Exp $");
#include "opt_explora.h"
#include "opt_modular.h"
@@ -149,7 +149,7 @@ cpu_startup(void)
/*
* cpu common startup
*/
- ibm4xx_cpu_startup("NCD Explora 451");
+ ibm4xx_cpu_startup("NCD Explora 450");
/*
* Set up the board properties database.
CVS commit: src/sys/arch/evbppc/conf
Module Name:src Committed By: rin Date: Fri Mar 5 06:57:02 UTC 2021 Modified Files: src/sys/arch/evbppc/conf: EXPLORA451 Log Message: Add tmpfs. To generate a diff of this commit: cvs rdiff -u -r1.68 -r1.69 src/sys/arch/evbppc/conf/EXPLORA451 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbppc/conf/EXPLORA451 diff -u src/sys/arch/evbppc/conf/EXPLORA451:1.68 src/sys/arch/evbppc/conf/EXPLORA451:1.69 --- src/sys/arch/evbppc/conf/EXPLORA451:1.68 Sun Sep 27 13:48:51 2020 +++ src/sys/arch/evbppc/conf/EXPLORA451 Fri Mar 5 06:57:02 2021 @@ -1,4 +1,4 @@ -# $NetBSD: EXPLORA451,v 1.68 2020/09/27 13:48:51 roy Exp $ +# $NetBSD: EXPLORA451,v 1.69 2021/03/05 06:57:02 rin Exp $ # # GENERIC -- everything that's currently supported # @@ -76,6 +76,7 @@ file-system UMAPFS # NULLFS + uid and file-system UNION # union file system file-system CODA # Coda File System; also needs vcoda (below) file-system PTYFS # /dev/pts/N support +file-system TMPFS # Efficient memory file-system # File system options options QUOTA # legacy UFS quotas
CVS commit: src/sys/arch/evbppc/explora/dev
Module Name:src
Committed By: rin
Date: Fri Mar 5 06:50:57 UTC 2021
Modified Files:
src/sys/arch/evbppc/explora/dev: fb_elb.c
Log Message:
Fix color map.
Almost all colors except *green* were wrong for the apparent reason ;).
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/evbppc/explora/dev/fb_elb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbppc/explora/dev/fb_elb.c
diff -u src/sys/arch/evbppc/explora/dev/fb_elb.c:1.15 src/sys/arch/evbppc/explora/dev/fb_elb.c:1.16
--- src/sys/arch/evbppc/explora/dev/fb_elb.c:1.15 Fri Mar 5 06:48:20 2021
+++ src/sys/arch/evbppc/explora/dev/fb_elb.c Fri Mar 5 06:50:57 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: fb_elb.c,v 1.15 2021/03/05 06:48:20 rin Exp $ */
+/* $NetBSD: fb_elb.c,v 1.16 2021/03/05 06:50:57 rin Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: fb_elb.c,v 1.15 2021/03/05 06:48:20 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fb_elb.c,v 1.16 2021/03/05 06:50:57 rin Exp $");
#include
#include
@@ -389,20 +389,20 @@ fb_copycols(void *v, int row, int srccol
static u_int8_t default_cmap[] = {
/* black */ 0, 0, 0,
- /* blue */ 0, 0, 192,
- /* green */ 0, 192, 0,
- /* cyan */ 0, 192, 192,
/* red */ 192, 0, 0,
- /* magenta */ 192, 0, 192,
+ /* green */ 0, 192, 0,
/* brown */ 192, 192, 0,
+ /* blue */ 0, 0, 192,
+ /* magenta */ 192, 0, 192,
+ /* cyan */ 0, 192, 192,
/* lightgrey */ 212, 208, 200,
/* darkgrey */ 200, 192, 188,
- /* lightblue */ 0, 0, 255,
- /* lightgreen */ 0, 255, 0,
- /* lightcyan */ 0, 255, 255,
/* lightred */ 255, 0, 0,
- /* lightmagenta */ 255, 0, 255,
+ /* lightgreen */ 0, 255, 0,
/* yellow */ 255, 255, 0,
+ /* lightblue */ 0, 0, 255,
+ /* lightmagenta */ 255, 0, 255,
+ /* lightcyan */ 0, 255, 255,
/* white */ 255, 255, 255,
};
CVS commit: src/sys/arch/evbppc/explora/dev
Module Name:src
Committed By: rin
Date: Fri Mar 5 06:48:21 UTC 2021
Modified Files:
src/sys/arch/evbppc/explora/dev: fb_elb.c
Log Message:
Configure fb(4) appropriately also when it is not console.
Now, wsdisplay(4) can be used with serial console.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/evbppc/explora/dev/fb_elb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbppc/explora/dev/fb_elb.c
diff -u src/sys/arch/evbppc/explora/dev/fb_elb.c:1.14 src/sys/arch/evbppc/explora/dev/fb_elb.c:1.15
--- src/sys/arch/evbppc/explora/dev/fb_elb.c:1.14 Sat Nov 21 15:42:20 2020
+++ src/sys/arch/evbppc/explora/dev/fb_elb.c Fri Mar 5 06:48:20 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: fb_elb.c,v 1.14 2020/11/21 15:42:20 thorpej Exp $ */
+/* $NetBSD: fb_elb.c,v 1.15 2021/03/05 06:48:20 rin Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: fb_elb.c,v 1.14 2020/11/21 15:42:20 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fb_elb.c,v 1.15 2021/03/05 06:48:20 rin Exp $");
#include
#include
@@ -66,7 +66,7 @@ struct fb_elb_softc {
static int fb_elb_probe(device_t, cfdata_t, void *);
static void fb_elb_attach(device_t, device_t, void *);
void fb_cnattach(bus_space_tag_t, bus_addr_t, void *);
-static void fb_init(struct fb_dev *, int);
+static void fb_init(struct fb_dev *);
static int fb_ioctl(void *, void *, u_long, void *, int, struct lwp *);
static paddr_t fb_mmap(void *, void *, off_t, int);
static int fb_alloc_screen(void *, const struct wsscreen_descr *, void **,
@@ -153,7 +153,8 @@ fb_elb_attach(device_t parent, device_t
bus_space_map(sc->sc_fb->fb_iot, eaa->elb_base2, FB_NPORTS,
0, >sc_fb->fb_ioh);
- fb_init(sc->sc_fb, !is_console);
+ if (!is_console)
+ fb_init(sc->sc_fb);
ri = >sc_fb->fb_ri;
@@ -168,24 +169,19 @@ fb_elb_attach(device_t parent, device_t
}
static void
-fb_init(struct fb_dev *fb, int full)
+fb_init(struct fb_dev *fb)
{
struct rasops_info *ri = >fb_ri;
- if (full) {
- s3_init(fb, >ri_width, >ri_height);
- ri->ri_depth = 8;
- ri->ri_stride = ri->ri_width;
- ri->ri_bits = fb->fb_vram;
- ri->ri_flg = RI_CENTER;
- if (ri == _dev.fb_ri)
- ri->ri_flg |= RI_NO_AUTO;
+ s3_init(fb, >ri_width, >ri_height);
+ ri->ri_depth = 8;
+ ri->ri_stride = ri->ri_width;
+ ri->ri_bits = fb->fb_vram;
+ ri->ri_flg = RI_CENTER | RI_CLEAR;
+ if (ri == _dev.fb_ri)
+ ri->ri_flg |= RI_NO_AUTO;
- rasops_init(ri, 500, 500);
- } else {
- ri->ri_origbits = fb->fb_vram; /*XXX*/
- rasops_reconfig(ri, 500, 500);
- }
+ rasops_init(ri, 500, 500);
/* Replace the copy/erase ops. */
ri->ri_hw = fb;
@@ -287,7 +283,7 @@ fb_cnattach(bus_space_tag_t iot, bus_add
console_dev.fb_ioh = iobase;
console_dev.fb_vram = vram;
- fb_init(_dev, 1);
+ fb_init(_dev);
(*ri->ri_ops.allocattr)(ri, 0, 0, 0, );
CVS commit: src/sys/arch/evbppc/conf
Module Name:src Committed By: rin Date: Fri Mar 5 06:45:12 UTC 2021 Modified Files: src/sys/arch/evbppc/conf: std.explora Log Message: Bump INTSTK to 16KB, i.e., one VM page, in the same manner as other boards. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbppc/conf/std.explora Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbppc/conf/std.explora diff -u src/sys/arch/evbppc/conf/std.explora:1.6 src/sys/arch/evbppc/conf/std.explora:1.7 --- src/sys/arch/evbppc/conf/std.explora:1.6 Fri Mar 5 06:06:34 2021 +++ src/sys/arch/evbppc/conf/std.explora Fri Mar 5 06:45:12 2021 @@ -1,4 +1,4 @@ -# $NetBSD: std.explora,v 1.6 2021/03/05 06:06:34 rin Exp $ +# $NetBSD: std.explora,v 1.7 2021/03/05 06:45:12 rin Exp $ # # Standard/required options for NetBSD/explora. @@ -20,7 +20,7 @@ makeoptions PPCDIR="ibm4xx" options PPC_INTR_IMPL="" -options INTSTK=8192 +options INTSTK=16384 options PPC_CPU_FREQ=6600 # XXX hack for pckbc_cnattach()
CVS commit: src/sys/arch/evbppc
Module Name:src
Committed By: rin
Date: Fri Mar 5 06:40:16 UTC 2021
Modified Files:
src/sys/arch/evbppc/conf: files.explora
src/sys/arch/evbppc/explora: machdep.c
Log Message:
Map framebuffer to virtual space when fb(4) is present,
even if it is not console.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbppc/conf/files.explora
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/evbppc/explora/machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbppc/conf/files.explora
diff -u src/sys/arch/evbppc/conf/files.explora:1.11 src/sys/arch/evbppc/conf/files.explora:1.12
--- src/sys/arch/evbppc/conf/files.explora:1.11 Fri Mar 5 06:26:56 2021
+++ src/sys/arch/evbppc/conf/files.explora Fri Mar 5 06:40:15 2021
@@ -1,4 +1,4 @@
-# $NetBSD: files.explora,v 1.11 2021/03/05 06:26:56 rin Exp $
+# $NetBSD: files.explora,v 1.12 2021/03/05 06:40:15 rin Exp $
# maxpartitions must be first item in files.${ARCH}
@@ -50,4 +50,4 @@ file arch/evbppc/explora/dev/pckbc_elb.c
device fb: wsemuldisplaydev, rasops8
attach fb at elb with fb_elb
-file arch/evbppc/explora/dev/fb_elb.c fb_elb
+file arch/evbppc/explora/dev/fb_elb.c fb_elb needs-flag
Index: src/sys/arch/evbppc/explora/machdep.c
diff -u src/sys/arch/evbppc/explora/machdep.c:1.43 src/sys/arch/evbppc/explora/machdep.c:1.44
--- src/sys/arch/evbppc/explora/machdep.c:1.43 Fri Mar 5 06:30:45 2021
+++ src/sys/arch/evbppc/explora/machdep.c Fri Mar 5 06:40:15 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.43 2021/03/05 06:30:45 rin Exp $ */
+/* $NetBSD: machdep.c,v 1.44 2021/03/05 06:40:15 rin Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -30,10 +30,12 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.43 2021/03/05 06:30:45 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.44 2021/03/05 06:40:15 rin Exp $");
#include "opt_explora.h"
#include "opt_modular.h"
+
+#include "fb_elb.h"
#include "ksyms.h"
#include
@@ -119,7 +121,7 @@ initppc(vaddr_t startkernel, vaddr_t end
/* Map PCKBC, PCKBC2, COM, LPT. This is far beyond physmem. */
ppc4xx_tlb_reserve(BASE_ISA, BASE_ISA, TLB_PG_SIZE, TLB_I | TLB_G);
-#ifndef COM_IS_CONSOLE
+#if NFB_ELB > 0
ppc4xx_tlb_reserve(BASE_FB, BASE_FB, TLB_PG_SIZE, TLB_I | TLB_G);
ppc4xx_tlb_reserve(BASE_FB2, BASE_FB2, TLB_PG_SIZE, TLB_I | TLB_G);
#endif
CVS commit: src/sys/arch/evbppc/explora
Module Name:src Committed By: rin Date: Fri Mar 5 06:30:45 UTC 2021 Modified Files: src/sys/arch/evbppc/explora: machdep.c Log Message: Call bus_space_mallocok() appropriately. To generate a diff of this commit: cvs rdiff -u -r1.42 -r1.43 src/sys/arch/evbppc/explora/machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbppc/explora/machdep.c diff -u src/sys/arch/evbppc/explora/machdep.c:1.42 src/sys/arch/evbppc/explora/machdep.c:1.43 --- src/sys/arch/evbppc/explora/machdep.c:1.42 Fri Mar 5 06:26:56 2021 +++ src/sys/arch/evbppc/explora/machdep.c Fri Mar 5 06:30:45 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.42 2021/03/05 06:26:56 rin Exp $ */ +/* $NetBSD: machdep.c,v 1.43 2021/03/05 06:30:45 rin Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.42 2021/03/05 06:26:56 rin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.43 2021/03/05 06:30:45 rin Exp $"); #include "opt_explora.h" #include "opt_modular.h" @@ -168,6 +168,11 @@ cpu_startup(void) prop_object_release(pn); /* + * Now that we have VM, malloc()s are OK in bus_space. + */ + bus_space_mallocok(); + + /* * no fake mapiodev */ fake_mapiodev = 0;
CVS commit: src/sys/arch/evbppc
Module Name:src
Committed By: rin
Date: Fri Mar 5 06:26:57 UTC 2021
Modified Files:
src/sys/arch/evbppc/conf: files.explora
src/sys/arch/evbppc/explora: autoconf.c machdep.c
Log Message:
For very MD codes for Explora, reorder things, and use more common codes for
ibm4xx and ibm40x for clarity as well as better comparison with other boards.
No functional changes intended.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbppc/conf/files.explora
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/evbppc/explora/autoconf.c
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/evbppc/explora/machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbppc/conf/files.explora
diff -u src/sys/arch/evbppc/conf/files.explora:1.10 src/sys/arch/evbppc/conf/files.explora:1.11
--- src/sys/arch/evbppc/conf/files.explora:1.10 Mon Jul 6 10:38:46 2020
+++ src/sys/arch/evbppc/conf/files.explora Fri Mar 5 06:26:56 2021
@@ -1,4 +1,4 @@
-# $NetBSD: files.explora,v 1.10 2020/07/06 10:38:46 rin Exp $
+# $NetBSD: files.explora,v 1.11 2021/03/05 06:26:56 rin Exp $
# maxpartitions must be first item in files.${ARCH}
@@ -15,7 +15,13 @@ include "arch/powerpc/pic/files.pic"
file arch/evbppc/explora/autoconf.c
file arch/evbppc/explora/consinit.c
file arch/evbppc/explora/machdep.c
+
file arch/powerpc/ibm4xx/ibm4xx_machdep.c
+file arch/powerpc/ibm4xx/ibm40x_machdep.c
+
+# Board Properties
+file arch/powerpc/ibm4xx/board_prop.c
+
defflag opt_uic.h MULTIUIC
file arch/powerpc/ibm4xx/pic_uic.c
file dev/md_root.cmemory_disk_hooks
Index: src/sys/arch/evbppc/explora/autoconf.c
diff -u src/sys/arch/evbppc/explora/autoconf.c:1.14 src/sys/arch/evbppc/explora/autoconf.c:1.15
--- src/sys/arch/evbppc/explora/autoconf.c:1.14 Tue Mar 2 07:38:48 2021
+++ src/sys/arch/evbppc/explora/autoconf.c Fri Mar 5 06:26:56 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.14 2021/03/02 07:38:48 rin Exp $ */
+/* $NetBSD: autoconf.c,v 1.15 2021/03/05 06:26:56 rin Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.14 2021/03/02 07:38:48 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.15 2021/03/05 06:26:56 rin Exp $");
#include
#include
@@ -43,6 +43,8 @@ __KERNEL_RCSID(0, "$NetBSD: autoconf.c,v
void
cpu_configure(void)
{
+
+ intr_init();
calc_delayconst();
if (config_rootfound("elb", NULL) == NULL)
Index: src/sys/arch/evbppc/explora/machdep.c
diff -u src/sys/arch/evbppc/explora/machdep.c:1.41 src/sys/arch/evbppc/explora/machdep.c:1.42
--- src/sys/arch/evbppc/explora/machdep.c:1.41 Tue Mar 2 07:44:08 2021
+++ src/sys/arch/evbppc/explora/machdep.c Fri Mar 5 06:26:56 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.41 2021/03/02 07:44:08 rin Exp $ */
+/* $NetBSD: machdep.c,v 1.42 2021/03/05 06:26:56 rin Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.41 2021/03/02 07:44:08 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.42 2021/03/05 06:26:56 rin Exp $");
#include "opt_explora.h"
#include "opt_modular.h"
@@ -71,7 +71,6 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v
#include
#endif
-#define MEMREGIONS 2
#define TLB_PG_SIZE (16*1024*1024)
char machine[] = MACHINE; /* from */
@@ -79,12 +78,8 @@ char machine_arch[] = MACHINE_ARCH; /* f
static const unsigned int cpuspeed = 6600;
-prop_dictionary_t board_properties;
struct vm_map *phys_map = NULL;
-static struct mem_region phys_mem[MEMREGIONS];
-static struct mem_region avail_mem[MEMREGIONS];
-
void initppc(vaddr_t, vaddr_t);
void
@@ -112,11 +107,6 @@ initppc(vaddr_t startkernel, vaddr_t end
size = maddr+msize;
}
- phys_mem[0].start = 0;
- phys_mem[0].size = size & ~PGOFSET;
- avail_mem[0].start = startkernel;
- avail_mem[0].size = size-startkernel;
-
/*
* Setup initial tlbs.
* Kernel memory and console device are
@@ -140,48 +130,29 @@ initppc(vaddr_t startkernel, vaddr_t end
/* Disable all timer interrupts */
mtspr(SPR_TCR, 0);
+ ibm40x_memsize_init(size, startkernel);
ibm4xx_init(startkernel, endkernel, pic_ext_intr);
+
+ /*
+ * Look for the ibm4xx modules in the right place.
+ */
+ module_machine = module_machine_ibm4xx;
}
void
cpu_startup(void)
{
- vaddr_t minaddr, maxaddr;
prop_number_t pn;
- char pbuf[9];
-
- /*
- * Initialize error message buffer (before start of kernel)
- */
- initmsgbuf((void *)msgbuf, round_page(MSGBUFSIZE));
-
- printf("%s%s", copyright, version);
- printf("NCD Explora451\n");
-
- format_bytes(pbuf, sizeof(pbuf), ctob(physmem));
- printf("total memory = %s\n", pbuf);
-
- minaddr = 0;
- /*
- * Allocate a submap for physio
- */
- phys_map = uvm_km_suballoc(kernel_map, , ,
- VM_PHYS_SIZE, 0, false, NULL);
/*
- * No need to allocate an mbuf
CVS commit: src/sys/arch/evbppc/explora/dev
Module Name:src
Committed By: rin
Date: Fri Mar 5 06:17:02 UTC 2021
Modified Files:
src/sys/arch/evbppc/explora/dev: pckbc_elb.c
Log Message:
Avoid doubly bus_space_map(9) when pckbc(4) is already attached as console.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbppc/explora/dev/pckbc_elb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbppc/explora/dev/pckbc_elb.c
diff -u src/sys/arch/evbppc/explora/dev/pckbc_elb.c:1.11 src/sys/arch/evbppc/explora/dev/pckbc_elb.c:1.12
--- src/sys/arch/evbppc/explora/dev/pckbc_elb.c:1.11 Fri Mar 5 06:14:47 2021
+++ src/sys/arch/evbppc/explora/dev/pckbc_elb.c Fri Mar 5 06:17:02 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: pckbc_elb.c,v 1.11 2021/03/05 06:14:47 rin Exp $ */
+/* $NetBSD: pckbc_elb.c,v 1.12 2021/03/05 06:17:02 rin Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pckbc_elb.c,v 1.11 2021/03/05 06:14:47 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pckbc_elb.c,v 1.12 2021/03/05 06:17:02 rin Exp $");
#include
#include
@@ -84,19 +84,23 @@ pckbc_elb_attach(device_t parent, device
msc->sc_irq = eaa->elb_irq;
sc->intr_establish = pckbc_elb_intr_establish;
- if (pckbc_is_console(eaa->elb_bt, eaa->elb_base)) {
+ if (pckbc_is_console(eaa->elb_bt,
+ _BUS_SPACE_UNSTRIDE(eaa->elb_bt, eaa->elb_base))) {
t = _consdata;
pckbc_console_attached = 1;
} else {
t = kmem_zalloc(sizeof(struct pckbc_internal), KM_SLEEP);
+
+ t->t_iot = eaa->elb_bt;
+ bus_space_map(eaa->elb_bt,
+ _BUS_SPACE_UNSTRIDE(eaa->elb_bt, eaa->elb_base), 1, 0,
+ >t_ioh_d);
+ bus_space_map(eaa->elb_bt,
+ _BUS_SPACE_UNSTRIDE(eaa->elb_bt, eaa->elb_base2), 1, 0,
+ >t_ioh_c);
+ t->t_addr = eaa->elb_base;
}
- t->t_iot = eaa->elb_bt;
- bus_space_map(eaa->elb_bt,
- _BUS_SPACE_UNSTRIDE(eaa->elb_bt, eaa->elb_base), 1, 0, >t_ioh_d);
- bus_space_map(eaa->elb_bt,
- _BUS_SPACE_UNSTRIDE(eaa->elb_bt, eaa->elb_base2), 1, 0, >t_ioh_c);
- t->t_addr = eaa->elb_base;
t->t_sc = sc;
sc->id = t;
CVS commit: src/sys/arch/evbppc/explora/dev
Module Name:src Committed By: rin Date: Fri Mar 5 06:14:47 UTC 2021 Modified Files: src/sys/arch/evbppc/explora/dev: pckbc_elb.c Log Message: pckbcintr() must be running with IPL_TTY, not IPL_SERIAL. Otherwise, tty(4) routines are unexpectedly interrupted, which results in "locking against myself" errors for tty_lock. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbppc/explora/dev/pckbc_elb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbppc/explora/dev/pckbc_elb.c diff -u src/sys/arch/evbppc/explora/dev/pckbc_elb.c:1.10 src/sys/arch/evbppc/explora/dev/pckbc_elb.c:1.11 --- src/sys/arch/evbppc/explora/dev/pckbc_elb.c:1.10 Tue Mar 2 12:01:02 2021 +++ src/sys/arch/evbppc/explora/dev/pckbc_elb.c Fri Mar 5 06:14:47 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: pckbc_elb.c,v 1.10 2021/03/02 12:01:02 rin Exp $ */ +/* $NetBSD: pckbc_elb.c,v 1.11 2021/03/05 06:14:47 rin Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: pckbc_elb.c,v 1.10 2021/03/02 12:01:02 rin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pckbc_elb.c,v 1.11 2021/03/05 06:14:47 rin Exp $"); #include #include @@ -116,7 +116,7 @@ pckbc_elb_intr_establish(struct pckbc_so */ if (irq >= 0) - intr_establish_xname(irq, IST_LEVEL, IPL_SERIAL, pckbcintr, sc, + intr_establish_xname(irq, IST_LEVEL, IPL_TTY, pckbcintr, sc, device_xname(sc->sc_dv)); msc->sc_irq = -1;
CVS commit: src/sys/arch/evbppc/ev64260
Module Name:src Committed By: thorpej Date: Thu Mar 4 03:13:54 UTC 2021 Modified Files: src/sys/arch/evbppc/ev64260: machdep.c Log Message: Don't forget to 0-terminate the BAT mapping list passed to oea_batinit()! To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.34 src/sys/arch/evbppc/ev64260/machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbppc/ev64260/machdep.c diff -u src/sys/arch/evbppc/ev64260/machdep.c:1.33 src/sys/arch/evbppc/ev64260/machdep.c:1.34 --- src/sys/arch/evbppc/ev64260/machdep.c:1.33 Sun Jul 15 05:16:42 2018 +++ src/sys/arch/evbppc/ev64260/machdep.c Thu Mar 4 03:13:54 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.33 2018/07/15 05:16:42 maxv Exp $ */ +/* $NetBSD: machdep.c,v 1.34 2021/03/04 03:13:54 thorpej Exp $ */ /* * Copyright (C) 1995, 1996 Wolfgang Solfrank. @@ -32,7 +32,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.33 2018/07/15 05:16:42 maxv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.34 2021/03/04 03:13:54 thorpej Exp $"); #include "opt_marvell.h" #include "opt_modular.h" @@ -214,7 +214,7 @@ initppc(u_int startkernel, u_int endkern ev64260_gt_bs_tag.pbs_offset = gt_base; ev64260_gt_bs_tag.pbs_base = gt_base; ev64260_gt_bs_tag.pbs_limit += gt_base; - oea_batinit(gt_base, BAT_BL_256M); + oea_batinit(gt_base, BAT_BL_256M, 0); oea_init(NULL);
CVS commit: src/sys/arch/evbppc/include
Module Name:src Committed By: rin Date: Tue Mar 2 13:44:58 UTC 2021 Modified Files: src/sys/arch/evbppc/include: explora.h Log Message: Adjust tabs. Add NetBSD RCSID. No binary changes. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbppc/include/explora.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbppc/include/explora.h diff -u src/sys/arch/evbppc/include/explora.h:1.3 src/sys/arch/evbppc/include/explora.h:1.4 --- src/sys/arch/evbppc/include/explora.h:1.3 Mon Oct 23 06:49:17 2006 +++ src/sys/arch/evbppc/include/explora.h Tue Mar 2 13:44:58 2021 @@ -1,3 +1,4 @@ +/* $NetBSD: explora.h,v 1.4 2021/03/02 13:44:58 rin Exp $ */ #ifndef _EVBPPC_EXPLORA_H_ #define _EVBPPC_EXPLORA_H_ @@ -9,10 +10,10 @@ #define BASE_LE 0x7080 #define BASE_FB2 0x7100 #define BASE_ISA 0x7400 -#define BASE_PCKBC 0x74c0 -#define BASE_PCKBC2 0x74c8 -#define BASE_COM 0x740005f0 -#define BASE_LPT 0x740006f0 +#define BASE_PCKBC 0x74c0 +#define BASE_PCKBC2 0x74c8 +#define BASE_COM 0x740005f0 +#define BASE_LPT 0x740006f0 #define SIZE_FB (2*1024*1024)
CVS commit: src/sys/arch/evbppc/explora/dev
Module Name:src Committed By: rin Date: Tue Mar 2 12:01:02 UTC 2021 Modified Files: src/sys/arch/evbppc/explora/dev: com_elb.c le_elb.c pckbc_elb.c Log Message: Convert to intr_establish_xname(). To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbppc/explora/dev/com_elb.c cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbppc/explora/dev/le_elb.c \ src/sys/arch/evbppc/explora/dev/pckbc_elb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbppc/explora/dev/com_elb.c diff -u src/sys/arch/evbppc/explora/dev/com_elb.c:1.10 src/sys/arch/evbppc/explora/dev/com_elb.c:1.11 --- src/sys/arch/evbppc/explora/dev/com_elb.c:1.10 Sat Dec 8 17:46:11 2018 +++ src/sys/arch/evbppc/explora/dev/com_elb.c Tue Mar 2 12:01:02 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: com_elb.c,v 1.10 2018/12/08 17:46:11 thorpej Exp $ */ +/* $NetBSD: com_elb.c,v 1.11 2021/03/02 12:01:02 rin Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: com_elb.c,v 1.10 2018/12/08 17:46:11 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: com_elb.c,v 1.11 2021/03/02 12:01:02 rin Exp $"); #include #include @@ -87,5 +87,6 @@ com_elb_attach(device_t parent, device_t com_attach_subr(sc); - intr_establish(eaa->elb_irq, IST_LEVEL, IPL_SERIAL, comintr, sc); + intr_establish_xname(eaa->elb_irq, IST_LEVEL, IPL_SERIAL, comintr, sc, + device_xname(self)); } Index: src/sys/arch/evbppc/explora/dev/le_elb.c diff -u src/sys/arch/evbppc/explora/dev/le_elb.c:1.9 src/sys/arch/evbppc/explora/dev/le_elb.c:1.10 --- src/sys/arch/evbppc/explora/dev/le_elb.c:1.9 Fri Jul 1 19:02:32 2011 +++ src/sys/arch/evbppc/explora/dev/le_elb.c Tue Mar 2 12:01:02 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: le_elb.c,v 1.9 2011/07/01 19:02:32 dyoung Exp $ */ +/* $NetBSD: le_elb.c,v 1.10 2021/03/02 12:01:02 rin Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: le_elb.c,v 1.9 2011/07/01 19:02:32 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: le_elb.c,v 1.10 2021/03/02 12:01:02 rin Exp $"); #include #include @@ -170,7 +170,8 @@ le_elb_attach(device_t parent, device_t /* Chip is stopped. Set "software style" to 32-bit. */ le_wrcsr(sc, LE_CSR58, 2); - intr_establish(eaa->elb_irq, IST_LEVEL, IPL_NET, am79900_intr, sc); + intr_establish_xname(eaa->elb_irq, IST_LEVEL, IPL_NET, am79900_intr, + sc, device_xname(self)); } /* Index: src/sys/arch/evbppc/explora/dev/pckbc_elb.c diff -u src/sys/arch/evbppc/explora/dev/pckbc_elb.c:1.9 src/sys/arch/evbppc/explora/dev/pckbc_elb.c:1.10 --- src/sys/arch/evbppc/explora/dev/pckbc_elb.c:1.9 Tue Mar 2 11:59:49 2021 +++ src/sys/arch/evbppc/explora/dev/pckbc_elb.c Tue Mar 2 12:01:02 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: pckbc_elb.c,v 1.9 2021/03/02 11:59:49 rin Exp $ */ +/* $NetBSD: pckbc_elb.c,v 1.10 2021/03/02 12:01:02 rin Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: pckbc_elb.c,v 1.9 2021/03/02 11:59:49 rin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pckbc_elb.c,v 1.10 2021/03/02 12:01:02 rin Exp $"); #include #include @@ -116,7 +116,8 @@ pckbc_elb_intr_establish(struct pckbc_so */ if (irq >= 0) - intr_establish(irq, IST_LEVEL, IPL_SERIAL, pckbcintr, sc); + intr_establish_xname(irq, IST_LEVEL, IPL_SERIAL, pckbcintr, sc, + device_xname(sc->sc_dv)); msc->sc_irq = -1; }
CVS commit: src/sys/arch/evbppc/explora/dev
Module Name:src Committed By: rin Date: Tue Mar 2 11:59:49 UTC 2021 Modified Files: src/sys/arch/evbppc/explora/dev: pckbc_elb.c Log Message: Stop registering same function twice, i.e., for pckbd(4) and pms(4), via intr_establish(). To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbppc/explora/dev/pckbc_elb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbppc/explora/dev/pckbc_elb.c diff -u src/sys/arch/evbppc/explora/dev/pckbc_elb.c:1.8 src/sys/arch/evbppc/explora/dev/pckbc_elb.c:1.9 --- src/sys/arch/evbppc/explora/dev/pckbc_elb.c:1.8 Sat Nov 21 15:42:20 2020 +++ src/sys/arch/evbppc/explora/dev/pckbc_elb.c Tue Mar 2 11:59:49 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: pckbc_elb.c,v 1.8 2020/11/21 15:42:20 thorpej Exp $ */ +/* $NetBSD: pckbc_elb.c,v 1.9 2021/03/02 11:59:49 rin Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: pckbc_elb.c,v 1.8 2020/11/21 15:42:20 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pckbc_elb.c,v 1.9 2021/03/02 11:59:49 rin Exp $"); #include #include @@ -118,5 +118,5 @@ pckbc_elb_intr_establish(struct pckbc_so if (irq >= 0) intr_establish(irq, IST_LEVEL, IPL_SERIAL, pckbcintr, sc); - irq = -1; + msc->sc_irq = -1; }
CVS commit: src/sys/arch/evbppc/explora
Module Name:src Committed By: rin Date: Tue Mar 2 07:44:08 UTC 2021 Modified Files: src/sys/arch/evbppc/explora: explora_start.S machdep.c Log Message: Establish kernel MMU context before turning on MMU. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbppc/explora/explora_start.S cvs rdiff -u -r1.40 -r1.41 src/sys/arch/evbppc/explora/machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbppc/explora/explora_start.S diff -u src/sys/arch/evbppc/explora/explora_start.S:1.11 src/sys/arch/evbppc/explora/explora_start.S:1.12 --- src/sys/arch/evbppc/explora/explora_start.S:1.11 Thu Oct 3 22:28:38 2013 +++ src/sys/arch/evbppc/explora/explora_start.S Tue Mar 2 07:44:08 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: explora_start.S,v 1.11 2013/10/03 22:28:38 matt Exp $ */ +/* $NetBSD: explora_start.S,v 1.12 2021/03/02 07:44:08 rin Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -186,6 +186,11 @@ stage2: cmpw 7,4 bne+ 1b +/* Set kernel MMU context. */ + li 0,KERNEL_PID + mtpid 0 + sync + INIT_CPUINFO(4,1,9,0) lis 3,__start@h Index: src/sys/arch/evbppc/explora/machdep.c diff -u src/sys/arch/evbppc/explora/machdep.c:1.40 src/sys/arch/evbppc/explora/machdep.c:1.41 --- src/sys/arch/evbppc/explora/machdep.c:1.40 Thu Jun 11 19:20:43 2020 +++ src/sys/arch/evbppc/explora/machdep.c Tue Mar 2 07:44:08 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.40 2020/06/11 19:20:43 ad Exp $ */ +/* $NetBSD: machdep.c,v 1.41 2021/03/02 07:44:08 rin Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.40 2020/06/11 19:20:43 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.41 2021/03/02 07:44:08 rin Exp $"); #include "opt_explora.h" #include "opt_modular.h" @@ -117,11 +117,6 @@ initppc(vaddr_t startkernel, vaddr_t end avail_mem[0].start = startkernel; avail_mem[0].size = size-startkernel; - __asm volatile( - " mtpid %0 \n" - " sync \n" - : : "r" (KERNEL_PID) ); - /* * Setup initial tlbs. * Kernel memory and console device are
CVS commit: src/sys/arch/evbppc/explora
Module Name:src
Committed By: rin
Date: Tue Mar 2 07:38:48 UTC 2021
Modified Files:
src/sys/arch/evbppc/explora: autoconf.c
Log Message:
Switch to genppc_cpu_configure().
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/evbppc/explora/autoconf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbppc/explora/autoconf.c
diff -u src/sys/arch/evbppc/explora/autoconf.c:1.13 src/sys/arch/evbppc/explora/autoconf.c:1.14
--- src/sys/arch/evbppc/explora/autoconf.c:1.13 Sun Jul 29 18:05:42 2012
+++ src/sys/arch/evbppc/explora/autoconf.c Tue Mar 2 07:38:48 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.13 2012/07/29 18:05:42 mlelstv Exp $ */
+/* $NetBSD: autoconf.c,v 1.14 2021/03/02 07:38:48 rin Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.13 2012/07/29 18:05:42 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.14 2021/03/02 07:38:48 rin Exp $");
#include
#include
@@ -48,10 +48,7 @@ cpu_configure(void)
if (config_rootfound("elb", NULL) == NULL)
panic("configure: elb not configured");
- printf("biomask %x netmask %x ttymask %x\n",
- imask[IPL_BIO], imask[IPL_NET], imask[IPL_TTY]);
-
- (void)spl0();
+ genppc_cpu_configure();
}
void
CVS commit: src/sys/arch/evbppc/obs405
Module Name:src
Committed By: rin
Date: Tue Mar 2 07:27:24 UTC 2021
Modified Files:
src/sys/arch/evbppc/obs405: obs600_autoconf.c obs600_machdep.c
Log Message:
Invoke calc_delayconst() before read_eeprom(), which uses delay(9).
Fix unintended looong waiting time during boot.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbppc/obs405/obs600_autoconf.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbppc/obs405/obs600_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbppc/obs405/obs600_autoconf.c
diff -u src/sys/arch/evbppc/obs405/obs600_autoconf.c:1.9 src/sys/arch/evbppc/obs405/obs600_autoconf.c:1.10
--- src/sys/arch/evbppc/obs405/obs600_autoconf.c:1.9 Tue Mar 2 07:21:01 2021
+++ src/sys/arch/evbppc/obs405/obs600_autoconf.c Tue Mar 2 07:27:24 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: obs600_autoconf.c,v 1.9 2021/03/02 07:21:01 rin Exp $ */
+/* $NetBSD: obs600_autoconf.c,v 1.10 2021/03/02 07:27:24 rin Exp $ */
/*
* Copyright 2004 Shigeyuki Fukushima.
@@ -33,7 +33,7 @@
* DAMAGE.
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: obs600_autoconf.c,v 1.9 2021/03/02 07:21:01 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obs600_autoconf.c,v 1.10 2021/03/02 07:27:24 rin Exp $");
#include "dwctwo.h"
@@ -101,8 +101,6 @@ cpu_configure(void)
pic_add(_uic1);
pic_add(_uic2);
- calc_delayconst();
-
/* Make sure that timers run at CPU frequency */
mtdcr(DCR_CPC0_CR1, mfdcr(DCR_CPC0_CR1) & ~CPC0_CR1_CETE);
Index: src/sys/arch/evbppc/obs405/obs600_machdep.c
diff -u src/sys/arch/evbppc/obs405/obs600_machdep.c:1.10 src/sys/arch/evbppc/obs405/obs600_machdep.c:1.11
--- src/sys/arch/evbppc/obs405/obs600_machdep.c:1.10 Sun Jul 15 05:16:42 2018
+++ src/sys/arch/evbppc/obs405/obs600_machdep.c Tue Mar 2 07:27:24 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: obs600_machdep.c,v 1.10 2018/07/15 05:16:42 maxv Exp $ */
+/* $NetBSD: obs600_machdep.c,v 1.11 2021/03/02 07:27:24 rin Exp $ */
/* Original: md_machdep.c,v 1.3 2005/01/24 18:47:37 shige Exp $ */
/*
@@ -68,7 +68,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: obs600_machdep.c,v 1.10 2018/07/15 05:16:42 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obs600_machdep.c,v 1.11 2021/03/02 07:27:24 rin Exp $");
#include "opt_compat_netbsd.h"
#include "opt_ddb.h"
@@ -206,10 +206,6 @@ cpu_startup(void)
*/
board_info_init();
- read_eeprom(sizeof(buf), buf);
- macaddr = [0];
- macaddr1 = [8];
-
/*
* Now that we have VM, malloc()s are OK in bus_space.
*/
@@ -228,8 +224,14 @@ cpu_startup(void)
panic("setting mem-size");
prop_object_release(pn);
+ calc_delayconst(); /* required by read_eeprom() */
+
#define ETHER_ADDR_LEN 6
+ read_eeprom(sizeof(buf), buf);
+ macaddr = [0];
+ macaddr1 = [8];
+
pd = prop_data_create_data_nocopy(macaddr, ETHER_ADDR_LEN);
KASSERT(pd != NULL);
if (prop_dictionary_set(board_properties, "emac0-mac-addr", pd) ==
CVS commit: src/sys/arch/evbppc/obs405
Module Name:src Committed By: rin Date: Tue Mar 2 07:23:22 UTC 2021 Modified Files: src/sys/arch/evbppc/obs405: obs600_locore.S Log Message: Do not forcibly turn off PPC_4XX_NOCACHE option. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbppc/obs405/obs600_locore.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbppc/obs405/obs600_locore.S diff -u src/sys/arch/evbppc/obs405/obs600_locore.S:1.6 src/sys/arch/evbppc/obs405/obs600_locore.S:1.7 --- src/sys/arch/evbppc/obs405/obs600_locore.S:1.6 Tue Aug 5 16:28:39 2014 +++ src/sys/arch/evbppc/obs405/obs600_locore.S Tue Mar 2 07:23:22 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: obs600_locore.S,v 1.6 2014/08/05 16:28:39 joerg Exp $ */ +/* $NetBSD: obs600_locore.S,v 1.7 2021/03/02 07:23:22 rin Exp $ */ /* * Copyright (c) 2009 KIYOHARA Takashi @@ -26,8 +26,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#undef PPC_4XX_NOCACHE - #include "opt_ddb.h" #include "opt_ppcarch.h" #include "opt_ppcparam.h"
CVS commit: src/sys/arch/evbppc/obs405
Module Name:src
Committed By: rin
Date: Tue Mar 2 07:21:01 UTC 2021
Modified Files:
src/sys/arch/evbppc/obs405: obs200_autoconf.c obs266_autoconf.c
obs600_autoconf.c
Log Message:
Use genppc_cpu_configure() instead of calling spl0() directly
(and optionally printing out imask).
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbppc/obs405/obs200_autoconf.c \
src/sys/arch/evbppc/obs405/obs266_autoconf.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbppc/obs405/obs600_autoconf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbppc/obs405/obs200_autoconf.c
diff -u src/sys/arch/evbppc/obs405/obs200_autoconf.c:1.7 src/sys/arch/evbppc/obs405/obs200_autoconf.c:1.8
--- src/sys/arch/evbppc/obs405/obs200_autoconf.c:1.7 Mon Dec 12 11:23:57 2011
+++ src/sys/arch/evbppc/obs405/obs200_autoconf.c Tue Mar 2 07:21:01 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: obs200_autoconf.c,v 1.7 2011/12/12 11:23:57 kiyohara Exp $ */
+/* $NetBSD: obs200_autoconf.c,v 1.8 2021/03/02 07:21:01 rin Exp $ */
/*
* Copyright 2004 Shigeyuki Fukushima.
@@ -33,7 +33,7 @@
* DAMAGE.
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: obs200_autoconf.c,v 1.7 2011/12/12 11:23:57 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obs200_autoconf.c,v 1.8 2021/03/02 07:21:01 rin Exp $");
#include
#include
@@ -63,10 +63,7 @@ cpu_configure(void)
if (config_rootfound("plb", NULL) == NULL)
panic("configure: mainbus not configured");
- printf("biomask %x netmask %x ttymask %x\n",
- imask[IPL_BIO], imask[IPL_NET], imask[IPL_TTY]);
-
- (void)spl0();
+ genppc_cpu_configure();
}
void device_register(device_t dev, void *aux)
Index: src/sys/arch/evbppc/obs405/obs266_autoconf.c
diff -u src/sys/arch/evbppc/obs405/obs266_autoconf.c:1.7 src/sys/arch/evbppc/obs405/obs266_autoconf.c:1.8
--- src/sys/arch/evbppc/obs405/obs266_autoconf.c:1.7 Mon Dec 12 11:23:57 2011
+++ src/sys/arch/evbppc/obs405/obs266_autoconf.c Tue Mar 2 07:21:01 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: obs266_autoconf.c,v 1.7 2011/12/12 11:23:57 kiyohara Exp $ */
+/* $NetBSD: obs266_autoconf.c,v 1.8 2021/03/02 07:21:01 rin Exp $ */
/*
* Copyright 2004 Shigeyuki Fukushima.
@@ -33,7 +33,7 @@
* DAMAGE.
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: obs266_autoconf.c,v 1.7 2011/12/12 11:23:57 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obs266_autoconf.c,v 1.8 2021/03/02 07:21:01 rin Exp $");
#include
#include
@@ -62,7 +62,7 @@ cpu_configure(void)
if (config_rootfound("plb", NULL) == NULL)
panic("configure: mainbus not configured");
- (void)spl0();
+ genppc_cpu_configure();
}
void
Index: src/sys/arch/evbppc/obs405/obs600_autoconf.c
diff -u src/sys/arch/evbppc/obs405/obs600_autoconf.c:1.8 src/sys/arch/evbppc/obs405/obs600_autoconf.c:1.9
--- src/sys/arch/evbppc/obs405/obs600_autoconf.c:1.8 Mon Feb 18 06:27:10 2019
+++ src/sys/arch/evbppc/obs405/obs600_autoconf.c Tue Mar 2 07:21:01 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: obs600_autoconf.c,v 1.8 2019/02/18 06:27:10 msaitoh Exp $ */
+/* $NetBSD: obs600_autoconf.c,v 1.9 2021/03/02 07:21:01 rin Exp $ */
/*
* Copyright 2004 Shigeyuki Fukushima.
@@ -33,7 +33,7 @@
* DAMAGE.
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: obs600_autoconf.c,v 1.8 2019/02/18 06:27:10 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obs600_autoconf.c,v 1.9 2021/03/02 07:21:01 rin Exp $");
#include "dwctwo.h"
@@ -111,10 +111,7 @@ cpu_configure(void)
pic_finish_setup();
- printf("biomask %x netmask %x ttymask %x\n",
- imask[IPL_BIO], imask[IPL_NET], imask[IPL_TTY]);
-
- (void)spl0();
+ genppc_cpu_configure();
}
void
CVS commit: src/sys/arch/evbppc
Module Name:src
Committed By: thorpej
Date: Sat Nov 21 15:42:21 UTC 2020
Modified Files:
src/sys/arch/evbppc/explora/dev: fb_elb.c pckbc_elb.c
src/sys/arch/evbppc/pmppc: pic_cpc700.c
src/sys/arch/evbppc/pmppc/dev: cpc_mainbus.c
src/sys/arch/evbppc/virtex: design_gsrd1.c
src/sys/arch/evbppc/walnut/dev: pckbc_pbus.c
Log Message:
malloc(9) -> kmem(9)
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/evbppc/explora/dev/fb_elb.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbppc/explora/dev/pckbc_elb.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbppc/pmppc/pic_cpc700.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbppc/pmppc/dev/cpc_mainbus.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbppc/virtex/design_gsrd1.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbppc/walnut/dev/pckbc_pbus.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbppc/explora/dev/fb_elb.c
diff -u src/sys/arch/evbppc/explora/dev/fb_elb.c:1.13 src/sys/arch/evbppc/explora/dev/fb_elb.c:1.14
--- src/sys/arch/evbppc/explora/dev/fb_elb.c:1.13 Fri Jul 1 19:02:32 2011
+++ src/sys/arch/evbppc/explora/dev/fb_elb.c Sat Nov 21 15:42:20 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: fb_elb.c,v 1.13 2011/07/01 19:02:32 dyoung Exp $ */
+/* $NetBSD: fb_elb.c,v 1.14 2020/11/21 15:42:20 thorpej Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -30,13 +30,13 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: fb_elb.c,v 1.13 2011/07/01 19:02:32 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fb_elb.c,v 1.14 2020/11/21 15:42:20 thorpej Exp $");
#include
#include
#include
#include
-#include
+#include
#include
#include
@@ -143,8 +143,7 @@ fb_elb_attach(device_t parent, device_t
sc->sc_fb = _dev;
sc->sc_fb->fb_ri.ri_flg &= ~RI_NO_AUTO;
} else {
- sc->sc_fb = malloc(sizeof(struct fb_dev), M_DEVBUF, M_WAITOK);
- memset(sc->sc_fb, 0, sizeof(struct fb_dev));
+ sc->sc_fb = kmem_zalloc(sizeof(struct fb_dev), KM_SLEEP);
}
sc->sc_fb->fb_iot = eaa->elb_bt;
Index: src/sys/arch/evbppc/explora/dev/pckbc_elb.c
diff -u src/sys/arch/evbppc/explora/dev/pckbc_elb.c:1.7 src/sys/arch/evbppc/explora/dev/pckbc_elb.c:1.8
--- src/sys/arch/evbppc/explora/dev/pckbc_elb.c:1.7 Fri Jul 1 19:02:32 2011
+++ src/sys/arch/evbppc/explora/dev/pckbc_elb.c Sat Nov 21 15:42:20 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pckbc_elb.c,v 1.7 2011/07/01 19:02:32 dyoung Exp $ */
+/* $NetBSD: pckbc_elb.c,v 1.8 2020/11/21 15:42:20 thorpej Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -30,13 +30,13 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pckbc_elb.c,v 1.7 2011/07/01 19:02:32 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pckbc_elb.c,v 1.8 2020/11/21 15:42:20 thorpej Exp $");
#include
#include
#include
#include
-#include
+#include
#include
@@ -88,8 +88,7 @@ pckbc_elb_attach(device_t parent, device
t = _consdata;
pckbc_console_attached = 1;
} else {
- t = malloc(sizeof(struct pckbc_internal), M_DEVBUF, M_WAITOK);
- memset(t, 0, sizeof(struct pckbc_internal));
+ t = kmem_zalloc(sizeof(struct pckbc_internal), KM_SLEEP);
}
t->t_iot = eaa->elb_bt;
Index: src/sys/arch/evbppc/pmppc/pic_cpc700.c
diff -u src/sys/arch/evbppc/pmppc/pic_cpc700.c:1.7 src/sys/arch/evbppc/pmppc/pic_cpc700.c:1.8
--- src/sys/arch/evbppc/pmppc/pic_cpc700.c:1.7 Sun Nov 10 21:16:26 2019
+++ src/sys/arch/evbppc/pmppc/pic_cpc700.c Sat Nov 21 15:42:20 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pic_cpc700.c,v 1.7 2019/11/10 21:16:26 chs Exp $ */
+/* $NetBSD: pic_cpc700.c,v 1.8 2020/11/21 15:42:20 thorpej Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -30,10 +30,10 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pic_cpc700.c,v 1.7 2019/11/10 21:16:26 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pic_cpc700.c,v 1.8 2020/11/21 15:42:20 thorpej Exp $");
#include
-#include
+#include
#include
#include
@@ -60,7 +60,7 @@ setup_cpc700(void)
struct cpc700_ops *cpc700;
struct pic_ops *pic;
- cpc700 = malloc(sizeof(struct cpc700_ops), M_DEVBUF, M_WAITOK);
+ cpc700 = kmem_alloc(sizeof(struct cpc700_ops), KM_SLEEP);
pic = >pic;
pic->pic_numintrs = 32;
Index: src/sys/arch/evbppc/pmppc/dev/cpc_mainbus.c
diff -u src/sys/arch/evbppc/pmppc/dev/cpc_mainbus.c:1.7 src/sys/arch/evbppc/pmppc/dev/cpc_mainbus.c:1.8
--- src/sys/arch/evbppc/pmppc/dev/cpc_mainbus.c:1.7 Sun Nov 10 21:16:26 2019
+++ src/sys/arch/evbppc/pmppc/dev/cpc_mainbus.c Sat Nov 21 15:42:20 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: cpc_mainbus.c,v 1.7 2019/11/10 21:16:26 chs Exp $ */
+/* $NetBSD: cpc_mainbus.c,v 1.8 2020/11/21 15:42:20 thorpej Exp $ */
/*
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,12 +30,12 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: cpc_mainbus.c,v 1.7 2019/11/10 21:16:26 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpc_mainbus.c,v 1.8 2020/11/21 15:42:20 thorpej Exp $");
#include
CVS commit: src/sys/arch/evbppc/conf
Module Name:src Committed By: rin Date: Tue Nov 10 11:19:58 UTC 2020 Modified Files: src/sys/arch/evbppc/conf: RB800 Log Message: Add nvme(4) and ahcisata(4). Both work fine via miniPCIe to M.2 adapter. To generate a diff of this commit: cvs rdiff -u -r1.37 -r1.38 src/sys/arch/evbppc/conf/RB800 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbppc/conf/RB800 diff -u src/sys/arch/evbppc/conf/RB800:1.37 src/sys/arch/evbppc/conf/RB800:1.38 --- src/sys/arch/evbppc/conf/RB800:1.37 Fri Apr 26 21:40:29 2019 +++ src/sys/arch/evbppc/conf/RB800 Tue Nov 10 11:19:57 2020 @@ -1,4 +1,4 @@ -# $NetBSD: RB800,v 1.37 2019/04/26 21:40:29 sevan Exp $ +# $NetBSD: RB800,v 1.38 2020/11/10 11:19:57 rin Exp $ # # RB800 -- everything that's currently supported # @@ -7,7 +7,7 @@ include "arch/evbppc/conf/std.mpc85xx" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -ident "RB800-$Revision: 1.37 $" +ident "RB800-$Revision: 1.38 $" maxusers 32 @@ -190,6 +190,13 @@ pci* at ppb? alc* at pci? dev ? function ? +# NVM Express controllers and devices +nvme* at pci? dev ? function ? +ld* at nvme? nsid ? + +ahcisata* at pci? dev ? function ? # AHCI SATA controllers +atabus* at ahcisata? channel ? + #ehci* at pci? dev ? function ? #ohci* at pci? dev ? function ? #uhci* at pci? dev ? function ?
CVS commit: src/sys/arch/evbppc/conf
Module Name:src Committed By: martin Date: Fri Nov 6 18:36:35 UTC 2020 Modified Files: src/sys/arch/evbppc/conf: INSTALL.inc Log Message: Bump ramdisk size slightly To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbppc/conf/INSTALL.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbppc/conf/INSTALL.inc diff -u src/sys/arch/evbppc/conf/INSTALL.inc:1.4 src/sys/arch/evbppc/conf/INSTALL.inc:1.5 --- src/sys/arch/evbppc/conf/INSTALL.inc:1.4 Thu Feb 9 15:24:08 2017 +++ src/sys/arch/evbppc/conf/INSTALL.inc Fri Nov 6 18:36:34 2020 @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL.inc,v 1.4 2017/02/09 15:24:08 joerg Exp $ +# $NetBSD: INSTALL.inc,v 1.5 2020/11/06 18:36:34 martin Exp $ # DEBUG options turned on: @@ -17,5 +17,5 @@ options MEMORY_DISK_IS_ROOT # force roo options MEMORY_DISK_SERVER=0 # no userspace memory disk support ## The ramdisk size must be kept in sync manually with the size of ## the `ramdisk' image (which is built in distrib/evbppc/ramdisk/ramdisk). -options MEMORY_DISK_ROOT_SIZE=6560 # size of memory disk, in blocks +options MEMORY_DISK_ROOT_SIZE=7072 # size of memory disk, in blocks options MEMORY_DISK_RBFLAGS=RB_SINGLE # boot in single-user mode
CVS commit: src/sys/arch/evbppc/conf
Module Name:src
Committed By: rin
Date: Mon Jul 6 10:38:46 UTC 2020
Modified Files:
src/sys/arch/evbppc/conf: files.explora
Log Message:
Now, sys/arch/powerpc/ibm4xx/pic_uic.c requires opt_uic.h.
XXX
Switch to powerpc/conf/files.ibm4xx.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbppc/conf/files.explora
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbppc/conf/files.explora
diff -u src/sys/arch/evbppc/conf/files.explora:1.9 src/sys/arch/evbppc/conf/files.explora:1.10
--- src/sys/arch/evbppc/conf/files.explora:1.9 Mon Jun 20 17:44:33 2011
+++ src/sys/arch/evbppc/conf/files.explora Mon Jul 6 10:38:46 2020
@@ -1,4 +1,4 @@
-# $NetBSD: files.explora,v 1.9 2011/06/20 17:44:33 matt Exp $
+# $NetBSD: files.explora,v 1.10 2020/07/06 10:38:46 rin Exp $
# maxpartitions must be first item in files.${ARCH}
@@ -16,6 +16,7 @@ file arch/evbppc/explora/autoconf.c
file arch/evbppc/explora/consinit.c
file arch/evbppc/explora/machdep.c
file arch/powerpc/ibm4xx/ibm4xx_machdep.c
+defflag opt_uic.h MULTIUIC
file arch/powerpc/ibm4xx/pic_uic.c
file dev/md_root.cmemory_disk_hooks
CVS commit: src/sys/arch/evbppc/virtex/dev
Module Name:src Committed By: skrll Date: Tue Feb 4 07:36:04 UTC 2020 Modified Files: src/sys/arch/evbppc/virtex/dev: if_temac.c Log Message: Adopt To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/arch/evbppc/virtex/dev/if_temac.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbppc/virtex/dev/if_temac.c diff -u src/sys/arch/evbppc/virtex/dev/if_temac.c:1.15 src/sys/arch/evbppc/virtex/dev/if_temac.c:1.16 --- src/sys/arch/evbppc/virtex/dev/if_temac.c:1.15 Wed May 29 06:21:57 2019 +++ src/sys/arch/evbppc/virtex/dev/if_temac.c Tue Feb 4 07:36:04 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: if_temac.c,v 1.15 2019/05/29 06:21:57 msaitoh Exp $ */ +/* $NetBSD: if_temac.c,v 1.16 2020/02/04 07:36:04 skrll Exp $ */ /* * Copyright (c) 2006 Jachym Holecek @@ -40,7 +40,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_temac.c,v 1.15 2019/05/29 06:21:57 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_temac.c,v 1.16 2020/02/04 07:36:04 skrll Exp $"); #include @@ -1212,7 +1212,7 @@ temac_rxreap(struct temac_softc *sc) (TEMAC_ISINTR(tail) ? CDMAC_STAT_INTR : 0) | (TEMAC_ISLAST(tail) ? CDMAC_STAT_STOP : 0); - ifp->if_ierrors++; + if_statinc(ifp, if_ierrors); continue; }
CVS commit: src/sys/arch/evbppc/mpc85xx
Module Name:src Committed By: kamil Date: Thu Apr 11 14:47:06 UTC 2019 Modified Files: src/sys/arch/evbppc/mpc85xx: machdep.c Log Message: Fix incorrect CVS Id To generate a diff of this commit: cvs rdiff -u -r1.43 -r1.44 src/sys/arch/evbppc/mpc85xx/machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbppc/mpc85xx/machdep.c diff -u src/sys/arch/evbppc/mpc85xx/machdep.c:1.43 src/sys/arch/evbppc/mpc85xx/machdep.c:1.44 --- src/sys/arch/evbppc/mpc85xx/machdep.c:1.43 Sat Jan 27 10:07:41 2018 +++ src/sys/arch/evbppc/mpc85xx/machdep.c Thu Apr 11 14:47:06 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.43 2018/01/27 10:07:41 flxd Exp $ */ +/* $NetBSD: machdep.c,v 1.44 2019/04/11 14:47:06 kamil Exp $ */ /*- * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc. * All rights reserved. @@ -36,7 +36,7 @@ #include -__KERNEL_RCSID(0, "$NetSBD$"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.44 2019/04/11 14:47:06 kamil Exp $"); #include "opt_altivec.h" #include "opt_ddb.h"
CVS commit: src/sys/arch/evbppc/obs405
Module Name:src Committed By: msaitoh Date: Mon Feb 18 06:27:10 UTC 2019 Modified Files: src/sys/arch/evbppc/obs405: obs600_autoconf.c Log Message: Fix compile error reported by Kazuhiro Ito in PR kern/52704. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbppc/obs405/obs600_autoconf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbppc/obs405/obs600_autoconf.c diff -u src/sys/arch/evbppc/obs405/obs600_autoconf.c:1.7 src/sys/arch/evbppc/obs405/obs600_autoconf.c:1.8 --- src/sys/arch/evbppc/obs405/obs600_autoconf.c:1.7 Thu Nov 21 13:52:27 2013 +++ src/sys/arch/evbppc/obs405/obs600_autoconf.c Mon Feb 18 06:27:10 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: obs600_autoconf.c,v 1.7 2013/11/21 13:52:27 kiyohara Exp $ */ +/* $NetBSD: obs600_autoconf.c,v 1.8 2019/02/18 06:27:10 msaitoh Exp $ */ /* * Copyright 2004 Shigeyuki Fukushima. @@ -33,7 +33,7 @@ * DAMAGE. */ #include -__KERNEL_RCSID(0, "$NetBSD: obs600_autoconf.c,v 1.7 2013/11/21 13:52:27 kiyohara Exp $"); +__KERNEL_RCSID(0, "$NetBSD: obs600_autoconf.c,v 1.8 2019/02/18 06:27:10 msaitoh Exp $"); #include "dwctwo.h" @@ -55,6 +55,7 @@ __KERNEL_RCSID(0, "$NetBSD: obs600_autoc #include #include +#include #include "dwc2_core.h" /* This parameters was set from u-boot. */
CVS commit: src/sys/arch/evbppc/obs405
Module Name:src Committed By: gutteridge Date: Tue Jan 29 22:59:03 UTC 2019 Modified Files: src/sys/arch/evbppc/obs405: rbus_machdep.c Log Message: Fix typo in error message. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbppc/obs405/rbus_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbppc/obs405/rbus_machdep.c diff -u src/sys/arch/evbppc/obs405/rbus_machdep.c:1.9 src/sys/arch/evbppc/obs405/rbus_machdep.c:1.10 --- src/sys/arch/evbppc/obs405/rbus_machdep.c:1.9 Mon Apr 9 14:44:01 2012 +++ src/sys/arch/evbppc/obs405/rbus_machdep.c Tue Jan 29 22:59:03 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: rbus_machdep.c,v 1.9 2012/04/09 14:44:01 kiyohara Exp $ */ +/* $NetBSD: rbus_machdep.c,v 1.10 2019/01/29 22:59:03 gutteridge Exp $ */ /* * Copyright (c) 2003 @@ -45,7 +45,7 @@ #include "opt_pci.h" #ifndef PCI_NETBSD_CONFIGURE -#error requird macro PCI_NETBSD_CONFIGURE +#error requires macro PCI_NETBSD_CONFIGURE #endif #ifdef RBUS_DEBUG
CVS commit: src/sys/arch/evbppc/conf
Module Name:src Committed By: christos Date: Fri Sep 15 03:07:55 UTC 2017 Modified Files: src/sys/arch/evbppc/conf: EV64260 Log Message: fix path miff To generate a diff of this commit: cvs rdiff -u -r1.69 -r1.70 src/sys/arch/evbppc/conf/EV64260 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbppc/conf/EV64260 diff -u src/sys/arch/evbppc/conf/EV64260:1.69 src/sys/arch/evbppc/conf/EV64260:1.70 --- src/sys/arch/evbppc/conf/EV64260:1.69 Thu Sep 14 03:58:40 2017 +++ src/sys/arch/evbppc/conf/EV64260 Thu Sep 14 23:07:55 2017 @@ -1,4 +1,4 @@ -# $NetBSD: EV64260,v 1.69 2017/09/14 07:58:40 mrg Exp $ +# $NetBSD: EV64260,v 1.70 2017/09/15 03:07:55 christos Exp $ # # MVP -- Motorola's Multiprocessing Verification Platform # @@ -63,7 +63,7 @@ makeoptions COPY_SYMTAB=1 # size for emb makeoptions DEBUG="-g" # Compatibility options -include "arch/evbppc/conf/compat_netbsd16.config" +include "conf/compat_netbsd16.config" #options COMPAT_386BSD_MBRPART # recognize old partition ID # File systems
CVS commit: src/sys/arch/evbppc/conf
Module Name:src
Committed By: rin
Date: Sat Feb 18 05:08:47 UTC 2017
Modified Files:
src/sys/arch/evbppc/conf: files.evbppc files.mpc85xx files.obs600
files.pmppc
Log Message:
Factorize kern/subr_disk_mbr.c into files.evbppc, and make EVBPPC_HAS_MBR
more like a normal option. No functional changes.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbppc/conf/files.evbppc \
src/sys/arch/evbppc/conf/files.pmppc
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbppc/conf/files.mpc85xx
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbppc/conf/files.obs600
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbppc/conf/files.evbppc
diff -u src/sys/arch/evbppc/conf/files.evbppc:1.6 src/sys/arch/evbppc/conf/files.evbppc:1.7
--- src/sys/arch/evbppc/conf/files.evbppc:1.6 Wed Oct 17 19:54:16 2007
+++ src/sys/arch/evbppc/conf/files.evbppc Sat Feb 18 05:08:47 2017
@@ -1,10 +1,11 @@
-# $NetBSD: files.evbppc,v 1.6 2007/10/17 19:54:16 garbled Exp $
+# $NetBSD: files.evbppc,v 1.7 2017/02/18 05:08:47 rin Exp $
# maxpartitions must be first item in files.${ARCH}
maxpartitions 16
maxusers 2 8 64
+file kern/subr_disk_mbr.c disk & evbppc_has_mbr
file arch/evbppc/evbppc/disksubr.c disk & !evbppc_has_mbr
file arch/evbppc/evbppc/evbppc_machdep.c ppc_ibm4xx
Index: src/sys/arch/evbppc/conf/files.pmppc
diff -u src/sys/arch/evbppc/conf/files.pmppc:1.6 src/sys/arch/evbppc/conf/files.pmppc:1.7
--- src/sys/arch/evbppc/conf/files.pmppc:1.6 Wed Jun 22 18:06:32 2011
+++ src/sys/arch/evbppc/conf/files.pmppc Sat Feb 18 05:08:47 2017
@@ -1,4 +1,4 @@
-# $NetBSD: files.pmppc,v 1.6 2011/06/22 18:06:32 matt Exp $
+# $NetBSD: files.pmppc,v 1.7 2017/02/18 05:08:47 rin Exp $
#
#
maxpartitions 16
@@ -9,7 +9,6 @@ include "arch/powerpc/pic/files.pic"
file arch/evbppc/pmppc/autoconf.c
file arch/powerpc/powerpc/clock.c
-file kern/subr_disk_mbr.c disk
file arch/evbppc/pmppc/pic_cpc700.c
file arch/evbppc/pmppc/machdep.c
Index: src/sys/arch/evbppc/conf/files.mpc85xx
diff -u src/sys/arch/evbppc/conf/files.mpc85xx:1.10 src/sys/arch/evbppc/conf/files.mpc85xx:1.11
--- src/sys/arch/evbppc/conf/files.mpc85xx:1.10 Sat Dec 27 16:19:33 2014
+++ src/sys/arch/evbppc/conf/files.mpc85xx Sat Feb 18 05:08:47 2017
@@ -1,4 +1,4 @@
-# $NetBSD: files.mpc85xx,v 1.10 2014/12/27 16:19:33 nonaka Exp $
+# $NetBSD: files.mpc85xx,v 1.11 2017/02/18 05:08:47 rin Exp $
#
# mpc85xx-specific configuration info
@@ -13,9 +13,6 @@ file arch/powerpc/booke/e500_intr.c
file arch/powerpc/booke/e500_timer.c
file arch/powerpc/booke/e500_tlb.c
-# we usr MBR
-file kern/subr_disk_mbr.c disk
-
# Memory Disk for install kernel
file dev/md_root.cmemory_disk_hooks
Index: src/sys/arch/evbppc/conf/files.obs600
diff -u src/sys/arch/evbppc/conf/files.obs600:1.2 src/sys/arch/evbppc/conf/files.obs600:1.3
--- src/sys/arch/evbppc/conf/files.obs600:1.2 Thu Nov 21 14:03:02 2013
+++ src/sys/arch/evbppc/conf/files.obs600 Sat Feb 18 05:08:47 2017
@@ -1,12 +1,10 @@
-# $NetBSD: files.obs600,v 1.2 2013/11/21 14:03:02 kiyohara Exp $
+# $NetBSD: files.obs600,v 1.3 2017/02/18 05:08:47 rin Exp $
#
# obs600-specific configuration info
file arch/evbppc/obs405/obs600_autoconf.c
file arch/evbppc/obs405/obs600_machdep.c
-file kern/subr_disk_mbr.c disk
-
include "dev/usb/files.usb"
include "dev/bluetooth/files.bluetooth"
CVS commit: src/sys/arch/evbppc/conf
Module Name:src
Committed By: maya
Date: Thu Jul 28 22:46:48 UTC 2016
Modified Files:
src/sys/arch/evbppc/conf: Makefile.ev64260.inc Makefile.obs405.inc
Makefile.walnut.inc
Log Message:
Fix typo in Makefile which resulted in kernel image not being generated
>From Rin Okuyama in PR/51369
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbppc/conf/Makefile.ev64260.inc
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbppc/conf/Makefile.obs405.inc
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbppc/conf/Makefile.walnut.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbppc/conf/Makefile.ev64260.inc
diff -u src/sys/arch/evbppc/conf/Makefile.ev64260.inc:1.7 src/sys/arch/evbppc/conf/Makefile.ev64260.inc:1.8
--- src/sys/arch/evbppc/conf/Makefile.ev64260.inc:1.7 Mon Mar 3 19:08:46 2014
+++ src/sys/arch/evbppc/conf/Makefile.ev64260.inc Thu Jul 28 22:46:48 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.ev64260.inc,v 1.7 2014/03/03 19:08:46 joerg Exp $
+# $NetBSD: Makefile.ev64260.inc,v 1.8 2016/07/28 22:46:48 maya Exp $
MKIMG?= ${HOST_SH} ${THISPPC}/compile/walnut-mkimg.sh
@@ -9,5 +9,5 @@ SYSTEM_FIRST_SFILE= ${THISPPC}/${BOARDTY
SYSTEM_LD_TAIL_EXTRA+=; \
echo ${MKIMG} $@ $@.img ; \
- OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; STAT=${TOOL_STAT]; \
+ OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; STAT=${TOOL_STAT}; \
export OBJDUMP OBJCOPY STAT; ${MKIMG} $@ $@.img
Index: src/sys/arch/evbppc/conf/Makefile.obs405.inc
diff -u src/sys/arch/evbppc/conf/Makefile.obs405.inc:1.12 src/sys/arch/evbppc/conf/Makefile.obs405.inc:1.13
--- src/sys/arch/evbppc/conf/Makefile.obs405.inc:1.12 Tue Aug 5 15:40:59 2014
+++ src/sys/arch/evbppc/conf/Makefile.obs405.inc Thu Jul 28 22:46:48 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.obs405.inc,v 1.12 2014/08/05 15:40:59 apb Exp $
+# $NetBSD: Makefile.obs405.inc,v 1.13 2016/07/28 22:46:48 maya Exp $
CFLAGS+=-mcpu=405
AFLAGS+=-mcpu=405
@@ -15,7 +15,7 @@ SYSTEM_FIRST_SFILE= ${THISPPC}/obs405/ob
SYSTEM_LD_TAIL_EXTRA+=; \
echo ${MKIMG} $@ $@.img ; \
- OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; STAT=${TOOL_STAT]; \
+ OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; STAT=${TOOL_STAT}; \
export OBJDUMP OBJCOPY STAT; ${MKIMG} $@ $@.img
@@ -30,7 +30,7 @@ SYSTEM_FIRST_SFILE= ${POWERPC}/${PPCDIR}
SYSTEM_LD_TAIL_EXTRA+=; \
echo ${MKIMG} $@ $@.img ; \
- OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; STAT=${TOOL_STAT]; \
+ OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; STAT=${TOOL_STAT}; \
export OBJDUMP OBJCOPY STAT; ${MKIMG} $@ $@.img
Index: src/sys/arch/evbppc/conf/Makefile.walnut.inc
diff -u src/sys/arch/evbppc/conf/Makefile.walnut.inc:1.8 src/sys/arch/evbppc/conf/Makefile.walnut.inc:1.9
--- src/sys/arch/evbppc/conf/Makefile.walnut.inc:1.8 Mon Mar 3 19:08:46 2014
+++ src/sys/arch/evbppc/conf/Makefile.walnut.inc Thu Jul 28 22:46:48 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.walnut.inc,v 1.8 2014/03/03 19:08:46 joerg Exp $
+# $NetBSD: Makefile.walnut.inc,v 1.9 2016/07/28 22:46:48 maya Exp $
MKIMG?= ${HOST_SH} ${THISPPC}/compile/walnut-mkimg.sh
CFLAGS+=-mcpu=403
@@ -10,5 +10,5 @@ SYSTEM_FIRST_SFILE= ${THISPPC}/walnut/wa
SYSTEM_LD_TAIL_EXTRA_EXTRA+=; \
echo ${MKIMG} $@ $@.img ; \
- OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; STAT=${TOOL_STAT]; \
+ OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; STAT=${TOOL_STAT}; \
export OBJDUMP OBJCOPY STAT; ${MKIMG} $@ $@.img
CVS commit: src/sys/arch/evbppc/conf
Module Name:src Committed By: matt Date: Fri Jun 26 21:54:41 UTC 2015 Modified Files: src/sys/arch/evbppc/conf: TWRP1025 Log Message: Add cinlude TWRP1025.local To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/sys/arch/evbppc/conf/TWRP1025 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbppc/conf/TWRP1025 diff -u src/sys/arch/evbppc/conf/TWRP1025:1.20 src/sys/arch/evbppc/conf/TWRP1025:1.21 --- src/sys/arch/evbppc/conf/TWRP1025:1.20 Fri Jan 30 14:54:46 2015 +++ src/sys/arch/evbppc/conf/TWRP1025 Fri Jun 26 21:54:41 2015 @@ -1,4 +1,4 @@ -# $NetBSD: TWRP1025,v 1.20 2015/01/30 14:54:46 nonaka Exp $ +# $NetBSD: TWRP1025,v 1.21 2015/06/26 21:54:41 matt Exp $ # # TWRP1025 -- everything that's currently supported # @@ -7,7 +7,7 @@ include arch/evbppc/conf/std.mpc85xx options INCLUDE_CONFIG_FILE # embed config file in kernel binary -ident TWRP1025-$Revision: 1.20 $ +ident TWRP1025-$Revision: 1.21 $ maxusers 32 @@ -231,3 +231,5 @@ pseudo-device pty # pseudo-terminals pseudo-device kttcp # kernel ttcp pseudo-device vlan # 802.1Q VLANs pseudo-device lockstat # lock profiling + +cinclude arch/evbppc/conf/TWRP1025.local
CVS commit: src/sys/arch/evbppc/conf
Module Name:src Committed By: nonaka Date: Fri Mar 6 14:18:14 UTC 2015 Modified Files: src/sys/arch/evbppc/conf: RB800 Log Message: RouterBOARD RB800 don't use u-boot. To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/sys/arch/evbppc/conf/RB800 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbppc/conf/RB800 diff -u src/sys/arch/evbppc/conf/RB800:1.30 src/sys/arch/evbppc/conf/RB800:1.31 --- src/sys/arch/evbppc/conf/RB800:1.30 Sun Aug 24 07:59:22 2014 +++ src/sys/arch/evbppc/conf/RB800 Fri Mar 6 14:18:14 2015 @@ -1,4 +1,4 @@ -# $NetBSD: RB800,v 1.30 2014/08/24 07:59:22 jnemeth Exp $ +# $NetBSD: RB800,v 1.31 2015/03/06 14:18:14 nonaka Exp $ # # RB800 -- everything that's currently supported # @@ -7,7 +7,7 @@ include arch/evbppc/conf/std.mpc85xx options INCLUDE_CONFIG_FILE # embed config file in kernel binary -ident RB800-$Revision: 1.30 $ +ident RB800-$Revision: 1.31 $ maxusers 32 @@ -18,6 +18,7 @@ options MPC8544 options PPC_HAVE_SPE no options GUR_BASE options GUR_BASE=0xe000 +options ROUTERBOOT options PAX_ASLR=0
CVS commit: src/sys/arch/evbppc/conf
Module Name:src Committed By: nonaka Date: Fri Jan 30 14:54:46 UTC 2015 Modified Files: src/sys/arch/evbppc/conf: TWRP1025 Log Message: Added lockstat To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/arch/evbppc/conf/TWRP1025 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbppc/conf/TWRP1025 diff -u src/sys/arch/evbppc/conf/TWRP1025:1.19 src/sys/arch/evbppc/conf/TWRP1025:1.20 --- src/sys/arch/evbppc/conf/TWRP1025:1.19 Fri Dec 26 11:56:14 2014 +++ src/sys/arch/evbppc/conf/TWRP1025 Fri Jan 30 14:54:46 2015 @@ -1,4 +1,4 @@ -# $NetBSD: TWRP1025,v 1.19 2014/12/26 11:56:14 nonaka Exp $ +# $NetBSD: TWRP1025,v 1.20 2015/01/30 14:54:46 nonaka Exp $ # # TWRP1025 -- everything that's currently supported # @@ -7,7 +7,7 @@ include arch/evbppc/conf/std.mpc85xx options INCLUDE_CONFIG_FILE # embed config file in kernel binary -ident TWRP1025-$Revision: 1.19 $ +ident TWRP1025-$Revision: 1.20 $ maxusers 32 @@ -230,3 +230,4 @@ pseudo-device ksyms # /dev/ksyms pseudo-device pty # pseudo-terminals pseudo-device kttcp # kernel ttcp pseudo-device vlan # 802.1Q VLANs +pseudo-device lockstat # lock profiling
CVS commit: src/sys/arch/evbppc/mpc85xx
Module Name:src Committed By: nonaka Date: Mon Jan 5 08:40:56 UTC 2015 Modified Files: src/sys/arch/evbppc/mpc85xx: machdep.c Log Message: Initialize TLB for non cpu0. To generate a diff of this commit: cvs rdiff -u -r1.37 -r1.38 src/sys/arch/evbppc/mpc85xx/machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbppc/mpc85xx/machdep.c diff -u src/sys/arch/evbppc/mpc85xx/machdep.c:1.37 src/sys/arch/evbppc/mpc85xx/machdep.c:1.38 --- src/sys/arch/evbppc/mpc85xx/machdep.c:1.37 Sat Dec 27 16:19:33 2014 +++ src/sys/arch/evbppc/mpc85xx/machdep.c Mon Jan 5 08:40:56 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.37 2014/12/27 16:19:33 nonaka Exp $ */ +/* $NetBSD: machdep.c,v 1.38 2015/01/05 08:40:56 nonaka Exp $ */ /*- * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc. * All rights reserved. @@ -997,6 +997,11 @@ e500_cpu_hatch(struct cpu_info *ci) */ cpu_write_4(OPENPIC_BASE + OPENPIC_CTPR, 15); /* IPL_HIGH */ + /* Initialize TLB */ + e500_tlb1_sync(); + mtspr(SPR_MAS4, MAS4_TSIZED_4KB | MAS4_MD); + tlb_invalidate_all(); + intr_cpu_hatch(ci); cpu_probe_cache();
CVS commit: src/sys/arch/evbppc/mpc85xx
Module Name:src Committed By: nonaka Date: Tue Jan 6 01:23:24 UTC 2015 Modified Files: src/sys/arch/evbppc/mpc85xx: machdep.c Log Message: No need to call e500_tlb1_sync() at e500_cpu_hatch(). It has already been called at e500_spinup_trampoline(). Pointed by mrg@. To generate a diff of this commit: cvs rdiff -u -r1.38 -r1.39 src/sys/arch/evbppc/mpc85xx/machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbppc/mpc85xx/machdep.c diff -u src/sys/arch/evbppc/mpc85xx/machdep.c:1.38 src/sys/arch/evbppc/mpc85xx/machdep.c:1.39 --- src/sys/arch/evbppc/mpc85xx/machdep.c:1.38 Mon Jan 5 08:40:56 2015 +++ src/sys/arch/evbppc/mpc85xx/machdep.c Tue Jan 6 01:23:24 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.38 2015/01/05 08:40:56 nonaka Exp $ */ +/* $NetBSD: machdep.c,v 1.39 2015/01/06 01:23:24 nonaka Exp $ */ /*- * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc. * All rights reserved. @@ -997,8 +997,7 @@ e500_cpu_hatch(struct cpu_info *ci) */ cpu_write_4(OPENPIC_BASE + OPENPIC_CTPR, 15); /* IPL_HIGH */ - /* Initialize TLB */ - e500_tlb1_sync(); + /* Set the MAS4 defaults */ mtspr(SPR_MAS4, MAS4_TSIZED_4KB | MAS4_MD); tlb_invalidate_all();
CVS commit: src/sys/arch/evbppc/conf
Module Name:src Committed By: nonaka Date: Fri Dec 26 11:56:14 UTC 2014 Modified Files: src/sys/arch/evbppc/conf: TWRP1025 Log Message: Uncommented out INET6. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/arch/evbppc/conf/TWRP1025 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbppc/conf/TWRP1025 diff -u src/sys/arch/evbppc/conf/TWRP1025:1.18 src/sys/arch/evbppc/conf/TWRP1025:1.19 --- src/sys/arch/evbppc/conf/TWRP1025:1.18 Sun Aug 24 07:59:22 2014 +++ src/sys/arch/evbppc/conf/TWRP1025 Fri Dec 26 11:56:14 2014 @@ -1,4 +1,4 @@ -# $NetBSD: TWRP1025,v 1.18 2014/08/24 07:59:22 jnemeth Exp $ +# $NetBSD: TWRP1025,v 1.19 2014/12/26 11:56:14 nonaka Exp $ # # TWRP1025 -- everything that's currently supported # @@ -7,7 +7,7 @@ include arch/evbppc/conf/std.mpc85xx options INCLUDE_CONFIG_FILE # embed config file in kernel binary -ident TWRP1025-$Revision: 1.18 $ +ident TWRP1025-$Revision: 1.19 $ maxusers 32 @@ -107,7 +107,7 @@ options INET # IP + ICMP + TCP + UDP options INET_CSUM_COUNTERS options TCP_CSUM_COUNTERS options UDP_CSUM_COUNTERS -#options INET6 # IPV6 +options INET6 # IPV6 #options IPSEC # IP security #options IPSEC_DEBUG # debug for IP security #options MROUTING # IP multicast routing
CVS commit: src/sys/arch/evbppc/mpc85xx
Module Name:src
Committed By: nonaka
Date: Fri Dec 19 04:07:13 UTC 2014
Modified Files:
src/sys/arch/evbppc/mpc85xx: machdep.c
Log Message:
Increase timeout for the hatching to complete.
cpu1: hatch successful (24321 spins, timebase adjusted by -940718014)
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/evbppc/mpc85xx/machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbppc/mpc85xx/machdep.c
diff -u src/sys/arch/evbppc/mpc85xx/machdep.c:1.33 src/sys/arch/evbppc/mpc85xx/machdep.c:1.34
--- src/sys/arch/evbppc/mpc85xx/machdep.c:1.33 Mon Aug 4 23:31:36 2014
+++ src/sys/arch/evbppc/mpc85xx/machdep.c Fri Dec 19 04:07:13 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.33 2014/08/04 23:31:36 joerg Exp $ */
+/* $NetBSD: machdep.c,v 1.34 2014/12/19 04:07:13 nonaka Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -939,15 +939,15 @@ e500_cpu_spinup(device_t self, struct cp
+ (uint64_t)h-hatch_tbl),
h-hatch_running);
/*
- * Now we wait for the hatching to complete. 10ms
+ * Now we wait for the hatching to complete. 30ms
* should be long enough.
*/
- for (u_int timo = 1; timo-- 0; ) {
+ for (u_int timo = 3; timo-- 0; ) {
if (kcpuset_isset(hatchlings, id)) {
aprint_normal_dev(self,
hatch successful (%u spins,
timebase adjusted by %PRId64)\n,
- 1 - timo,
+ 3 - timo,
(int64_t)
(((uint64_t)h-hatch_tbu 32)
+ (uint64_t)h-hatch_tbl));
CVS commit: src/sys/arch/evbppc/mpc85xx
Module Name:src Committed By: nonaka Date: Fri Dec 19 04:15:37 UTC 2014 Modified Files: src/sys/arch/evbppc/mpc85xx: machdep.c Log Message: Do probe cpu cache on !cpu0. Avoid panic: kernel diagnostic assertion line_size 0 failed: file /usr/src/sys/arch/powerpc/booke/booke_cache.c, line 90. To generate a diff of this commit: cvs rdiff -u -r1.34 -r1.35 src/sys/arch/evbppc/mpc85xx/machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbppc/mpc85xx/machdep.c diff -u src/sys/arch/evbppc/mpc85xx/machdep.c:1.34 src/sys/arch/evbppc/mpc85xx/machdep.c:1.35 --- src/sys/arch/evbppc/mpc85xx/machdep.c:1.34 Fri Dec 19 04:07:13 2014 +++ src/sys/arch/evbppc/mpc85xx/machdep.c Fri Dec 19 04:15:36 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.34 2014/12/19 04:07:13 nonaka Exp $ */ +/* $NetBSD: machdep.c,v 1.35 2014/12/19 04:15:36 nonaka Exp $ */ /*- * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc. * All rights reserved. @@ -983,6 +983,7 @@ e500_cpu_hatch(struct cpu_info *ci) intr_cpu_hatch(ci); + cpu_probe_cache(); cpu_print_info(ci); /*
CVS commit: src/sys/arch/evbppc/mpc85xx
Module Name:src
Committed By: nonaka
Date: Fri Dec 19 04:31:41 UTC 2014
Modified Files:
src/sys/arch/evbppc/mpc85xx: machdep.c
Log Message:
do page recolor.
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/evbppc/mpc85xx/machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbppc/mpc85xx/machdep.c
diff -u src/sys/arch/evbppc/mpc85xx/machdep.c:1.35 src/sys/arch/evbppc/mpc85xx/machdep.c:1.36
--- src/sys/arch/evbppc/mpc85xx/machdep.c:1.35 Fri Dec 19 04:15:36 2014
+++ src/sys/arch/evbppc/mpc85xx/machdep.c Fri Dec 19 04:31:41 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.35 2014/12/19 04:15:36 nonaka Exp $ */
+/* $NetBSD: machdep.c,v 1.36 2014/12/19 04:31:41 nonaka Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -639,6 +639,7 @@ cpu_probe_cache(void)
{
struct cpu_info * const ci = curcpu();
const uint32_t l1cfg0 = mfspr(SPR_L1CFG0);
+ const int dcache_assoc = L1CFG_CNWAY_GET(l1cfg0);
ci-ci_ci.dcache_size = L1CFG_CSIZE_GET(l1cfg0);
ci-ci_ci.dcache_line_size = 32 L1CFG_CBSIZE_GET(l1cfg0);
@@ -653,6 +654,11 @@ cpu_probe_cache(void)
ci-ci_ci.icache_line_size = ci-ci_ci.dcache_line_size;
}
+ /*
+ * Possibly recolor.
+ */
+ uvm_page_recolor(atop(curcpu()-ci_ci.dcache_size / dcache_assoc));
+
#ifdef DEBUG
uint32_t l1csr0 = mfspr(SPR_L1CSR0);
if ((L1CSR_CE l1csr0) == 0)
CVS commit: src/sys/arch/evbppc/conf
Module Name:src Committed By: uebayasi Date: Wed Oct 15 08:14:44 UTC 2014 Modified Files: src/sys/arch/evbppc/conf: OPENBLOCKS266_OPT OPENBLOCKS600 PMPPC Log Message: Fix builds. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/sys/arch/evbppc/conf/OPENBLOCKS266_OPT cvs rdiff -u -r1.19 -r1.20 src/sys/arch/evbppc/conf/OPENBLOCKS600 cvs rdiff -u -r1.34 -r1.35 src/sys/arch/evbppc/conf/PMPPC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbppc/conf/OPENBLOCKS266_OPT diff -u src/sys/arch/evbppc/conf/OPENBLOCKS266_OPT:1.17 src/sys/arch/evbppc/conf/OPENBLOCKS266_OPT:1.18 --- src/sys/arch/evbppc/conf/OPENBLOCKS266_OPT:1.17 Sat Sep 1 18:17:50 2012 +++ src/sys/arch/evbppc/conf/OPENBLOCKS266_OPT Wed Oct 15 08:14:44 2014 @@ -1,4 +1,4 @@ -# $NetBSD: OPENBLOCKS266_OPT,v 1.17 2012/09/01 18:17:50 jakllsch Exp $ +# $NetBSD: OPENBLOCKS266_OPT,v 1.18 2014/10/15 08:14:44 uebayasi Exp $ # include arch/evbppc/conf/OPENBLOCKS266 @@ -195,6 +195,7 @@ audio* at uaudio? # USB MIDI umidi* at uhub? port ? configuration ? +midi* at midibus? # USB IrDA # USB-IrDA bridge spec Index: src/sys/arch/evbppc/conf/OPENBLOCKS600 diff -u src/sys/arch/evbppc/conf/OPENBLOCKS600:1.19 src/sys/arch/evbppc/conf/OPENBLOCKS600:1.20 --- src/sys/arch/evbppc/conf/OPENBLOCKS600:1.19 Sat Aug 23 20:26:57 2014 +++ src/sys/arch/evbppc/conf/OPENBLOCKS600 Wed Oct 15 08:14:44 2014 @@ -1,4 +1,4 @@ -# $NetBSD: OPENBLOCKS600,v 1.19 2014/08/23 20:26:57 dholland Exp $ +# $NetBSD: OPENBLOCKS600,v 1.20 2014/10/15 08:14:44 uebayasi Exp $ # # GENERIC -- everything that's currently supported # @@ -7,7 +7,7 @@ include arch/evbppc/conf/std.obs600 #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident OPENBLOCKS600-$Revision: 1.19 $ +#ident OPENBLOCKS600-$Revision: 1.20 $ maxusers 32 @@ -149,7 +149,7 @@ config netbsd root on ? type ? plb0 at root# Processor Local Bus cpu0 at plb?# CPU ecc0 at plb? irq 17 # On-chip ECC controller -dwctwo at plb? addr 0xef6c irq 94 # On-chip USB controller +dwctwo0 at plb? addr 0xef6c irq 94 # On-chip USB controller # On-chip Peripheral Bus support opb* at plb?# On-chip Peripheral Bus Index: src/sys/arch/evbppc/conf/PMPPC diff -u src/sys/arch/evbppc/conf/PMPPC:1.34 src/sys/arch/evbppc/conf/PMPPC:1.35 --- src/sys/arch/evbppc/conf/PMPPC:1.34 Sat Aug 23 20:26:57 2014 +++ src/sys/arch/evbppc/conf/PMPPC Wed Oct 15 08:14:44 2014 @@ -1,4 +1,4 @@ -# $NetBSD: PMPPC,v 1.34 2014/08/23 20:26:57 dholland Exp $ +# $NetBSD: PMPPC,v 1.35 2014/10/15 08:14:44 uebayasi Exp $ # # PMPPC # @@ -348,6 +348,7 @@ uaudio* at uhub? port ? configuration ? # USB MIDI umidi* at uhub? port ? configuration ? +midi* at midibus? # USB IrDA # USB-IrDA bridge spec
CVS commit: src/sys/arch/evbppc/conf
Module Name:src Committed By: uebayasi Date: Tue Oct 14 17:43:14 UTC 2014 Modified Files: src/sys/arch/evbppc/conf: EV64260 Log Message: Don't enable wscons options without wscons. To generate a diff of this commit: cvs rdiff -u -r1.63 -r1.64 src/sys/arch/evbppc/conf/EV64260 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbppc/conf/EV64260 diff -u src/sys/arch/evbppc/conf/EV64260:1.63 src/sys/arch/evbppc/conf/EV64260:1.64 --- src/sys/arch/evbppc/conf/EV64260:1.63 Sat Aug 23 20:26:57 2014 +++ src/sys/arch/evbppc/conf/EV64260 Tue Oct 14 17:43:14 2014 @@ -1,4 +1,4 @@ -# $NetBSD: EV64260,v 1.63 2014/08/23 20:26:57 dholland Exp $ +# $NetBSD: EV64260,v 1.64 2014/10/14 17:43:14 uebayasi Exp $ # # MVP -- Motorola's Multiprocessing Verification Platform # @@ -140,9 +140,9 @@ options PCI_NETBSD_CONFIGURE # Do not r # wscons options #options WSEMUL_SUN # sun terminal emulation -options WSEMUL_VT100 # VT100 / VT220 emulation -options WSDISPLAY_COMPAT_USL # wsconscfg VT handling -options WSDISPLAY_DEFAULTSCREENS=1 +#options WSEMUL_VT100 # VT100 / VT220 emulation +#options WSDISPLAY_COMPAT_USL # wsconscfg VT handling +#options WSDISPLAY_DEFAULTSCREENS=1 # Kernel root file system and dump configuration. config netbsd root on ? type ?
CVS commit: src/sys/arch/evbppc/conf
Module Name:src Committed By: joerg Date: Sun Aug 10 17:56:23 UTC 2014 Modified Files: src/sys/arch/evbppc/conf: EXPLORA451 P2020DS PMPPC WALNUT Log Message: LLVM builds have a slightly larger symbol table, so bump the space. To generate a diff of this commit: cvs rdiff -u -r1.54 -r1.55 src/sys/arch/evbppc/conf/EXPLORA451 cvs rdiff -u -r1.20 -r1.21 src/sys/arch/evbppc/conf/P2020DS cvs rdiff -u -r1.30 -r1.31 src/sys/arch/evbppc/conf/PMPPC cvs rdiff -u -r1.66 -r1.67 src/sys/arch/evbppc/conf/WALNUT Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbppc/conf/EXPLORA451 diff -u src/sys/arch/evbppc/conf/EXPLORA451:1.54 src/sys/arch/evbppc/conf/EXPLORA451:1.55 --- src/sys/arch/evbppc/conf/EXPLORA451:1.54 Sun Jun 30 21:38:56 2013 +++ src/sys/arch/evbppc/conf/EXPLORA451 Sun Aug 10 17:56:23 2014 @@ -1,4 +1,4 @@ -# $NetBSD: EXPLORA451,v 1.54 2013/06/30 21:38:56 rmind Exp $ +# $NetBSD: EXPLORA451,v 1.55 2014/08/10 17:56:23 joerg Exp $ # # GENERIC -- everything that's currently supported # @@ -52,7 +52,7 @@ options DDB_HISTORY_SIZE=512 # enable h #options KGDB # remote debugger #options KGDB_DEVNAME=\com\,KGDB_DEVADDR=0x3f8,KGDB_DEVRATE=9600 makeoptions DEBUG=-g # compile full symbol table -options SYMTAB_SPACE=43 +options SYMTAB_SPACE=44 # Compatibility options options COMPAT_NOMID # compatibility with 386BSD, BSDI, NetBSD 0.8, Index: src/sys/arch/evbppc/conf/P2020DS diff -u src/sys/arch/evbppc/conf/P2020DS:1.20 src/sys/arch/evbppc/conf/P2020DS:1.21 --- src/sys/arch/evbppc/conf/P2020DS:1.20 Sun Jun 30 21:38:56 2013 +++ src/sys/arch/evbppc/conf/P2020DS Sun Aug 10 17:56:23 2014 @@ -1,4 +1,4 @@ -# $NetBSD: P2020DS,v 1.20 2013/06/30 21:38:56 rmind Exp $ +# $NetBSD: P2020DS,v 1.21 2014/08/10 17:56:23 joerg Exp $ # # P2020DS -- everything that's currently supported # @@ -8,7 +8,7 @@ include arch/evbppc/conf/std.mpc85xx options INCLUDE_CONFIG_FILE # embed config file in kernel binary -ident P2020DS-$Revision: 1.20 $ +ident P2020DS-$Revision: 1.21 $ maxusers 32 @@ -46,7 +46,7 @@ options DEBUG # expensive debugging ch options DDB # in-kernel debugger options DDB_HISTORY_SIZE=512 # enable history editing in DDB options TRAP_PANICWAIT -options SYMTAB_SPACE=425000 # size for embedded symbol table +options SYMTAB_SPACE=435000 # size for embedded symbol table makeoptions DEBUG=-g # compile full symbol table Index: src/sys/arch/evbppc/conf/PMPPC diff -u src/sys/arch/evbppc/conf/PMPPC:1.30 src/sys/arch/evbppc/conf/PMPPC:1.31 --- src/sys/arch/evbppc/conf/PMPPC:1.30 Sun Jun 30 21:38:56 2013 +++ src/sys/arch/evbppc/conf/PMPPC Sun Aug 10 17:56:23 2014 @@ -1,4 +1,4 @@ -# $NetBSD: PMPPC,v 1.30 2013/06/30 21:38:56 rmind Exp $ +# $NetBSD: PMPPC,v 1.31 2014/08/10 17:56:23 joerg Exp $ # # PMPPC # @@ -33,7 +33,7 @@ options DIAGNOSTIC # cheap kernel consi options DDB # in-kernel debugger options DDB_HISTORY_SIZE=512 # enable history editing in DDB #options TRAP_PANICWAIT -options SYMTAB_SPACE=58 # size for embedded symbol table +options SYMTAB_SPACE=59 # size for embedded symbol table #options KGDB # remote debugger #options KGDB_DEVNAME=\com\,KGDB_DEVADDR=0xff600400,KGDB_DEVRATE=9600 Index: src/sys/arch/evbppc/conf/WALNUT diff -u src/sys/arch/evbppc/conf/WALNUT:1.66 src/sys/arch/evbppc/conf/WALNUT:1.67 --- src/sys/arch/evbppc/conf/WALNUT:1.66 Sun Jun 30 21:38:56 2013 +++ src/sys/arch/evbppc/conf/WALNUT Sun Aug 10 17:56:23 2014 @@ -1,4 +1,4 @@ -# $NetBSD: WALNUT,v 1.66 2013/06/30 21:38:56 rmind Exp $ +# $NetBSD: WALNUT,v 1.67 2014/08/10 17:56:23 joerg Exp $ # # GENERIC -- everything that's currently supported # @@ -39,7 +39,7 @@ options USERCONF # userconf(4) support options DDB # in-kernel debugger options DDB_HISTORY_SIZE=512 # enable history editing in DDB options TRAP_PANICWAIT -options SYMTAB_SPACE=47 # size for embedded symbol table +options SYMTAB_SPACE=49 # size for embedded symbol table makeoptions DEBUG=-g # compile full symbol table
CVS commit: src/sys/arch/evbppc/mpc85xx
Module Name:src Committed By: joerg Date: Sun Aug 10 18:01:29 UTC 2014 Modified Files: src/sys/arch/evbppc/mpc85xx: mpc85xx_start.S Log Message: Drop .machine, Makefile.mpc85xx provides -me500 already. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbppc/mpc85xx/mpc85xx_start.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbppc/mpc85xx/mpc85xx_start.S diff -u src/sys/arch/evbppc/mpc85xx/mpc85xx_start.S:1.8 src/sys/arch/evbppc/mpc85xx/mpc85xx_start.S:1.9 --- src/sys/arch/evbppc/mpc85xx/mpc85xx_start.S:1.8 Wed Jul 30 23:15:23 2014 +++ src/sys/arch/evbppc/mpc85xx/mpc85xx_start.S Sun Aug 10 18:01:29 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: mpc85xx_start.S,v 1.8 2014/07/30 23:15:23 joerg Exp $ */ +/* $NetBSD: mpc85xx_start.S,v 1.9 2014/08/10 18:01:29 joerg Exp $ */ /*- * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc. * All rights reserved. @@ -37,7 +37,7 @@ #include sys/cdefs.h #include powerpc/asm.h -RCSID($NetBSD: mpc85xx_start.S,v 1.8 2014/07/30 23:15:23 joerg Exp $) +RCSID($NetBSD: mpc85xx_start.S,v 1.9 2014/08/10 18:01:29 joerg Exp $) #include opt_altivec.h #include opt_ddb.h @@ -64,7 +64,6 @@ RCSID($NetBSD: mpc85xx_start.S,v 1.8 20 #define INTSTK 0 - .machine e500 /* * This symbol is here for the benefit of kvm_mkdb, and is supposed to * mark the start of kernel text.
CVS commit: src/sys/arch/evbppc/mpc85xx
Module Name:src
Committed By: joerg
Date: Mon Aug 4 23:31:36 UTC 2014
Modified Files:
src/sys/arch/evbppc/mpc85xx: machdep.c
Log Message:
mpc85xx_extirq_names is not used for the MPC8548 branch.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/evbppc/mpc85xx/machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbppc/mpc85xx/machdep.c
diff -u src/sys/arch/evbppc/mpc85xx/machdep.c:1.32 src/sys/arch/evbppc/mpc85xx/machdep.c:1.33
--- src/sys/arch/evbppc/mpc85xx/machdep.c:1.32 Thu Jul 24 23:30:38 2014
+++ src/sys/arch/evbppc/mpc85xx/machdep.c Mon Aug 4 23:31:36 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.32 2014/07/24 23:30:38 joerg Exp $ */
+/* $NetBSD: machdep.c,v 1.33 2014/08/04 23:31:36 joerg Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -1293,6 +1293,7 @@ static const char * const mpc8548cds_ext
};
#endif
+#ifndef MPC8548
static const char * const mpc85xx_extirq_names[] = {
[0] = extirq 0,
[1] = extirq 1,
@@ -1307,6 +1308,7 @@ static const char * const mpc85xx_extirq
[10] = extirq 10,
[11] = extirq 11,
};
+#endif
static void
mpc85xx_extirq_setup(void)
CVS commit: src/sys/arch/evbppc/walnut
Module Name:src Committed By: joerg Date: Wed Jul 30 19:33:56 UTC 2014 Modified Files: src/sys/arch/evbppc/walnut: autoconf.c Log Message: Second argument of config_rootfound is void *, so discard const explicitly. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/sys/arch/evbppc/walnut/autoconf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbppc/walnut/autoconf.c diff -u src/sys/arch/evbppc/walnut/autoconf.c:1.21 src/sys/arch/evbppc/walnut/autoconf.c:1.22 --- src/sys/arch/evbppc/walnut/autoconf.c:1.21 Sun Jul 29 18:05:42 2012 +++ src/sys/arch/evbppc/walnut/autoconf.c Wed Jul 30 19:33:56 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: autoconf.c,v 1.21 2012/07/29 18:05:42 mlelstv Exp $ */ +/* $NetBSD: autoconf.c,v 1.22 2014/07/30 19:33:56 joerg Exp $ */ /* * Copyright (C) 1995, 1996 Wolfgang Solfrank. @@ -32,7 +32,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: autoconf.c,v 1.21 2012/07/29 18:05:42 mlelstv Exp $); +__KERNEL_RCSID(0, $NetBSD: autoconf.c,v 1.22 2014/07/30 19:33:56 joerg Exp $); #include sys/param.h #include sys/conf.h @@ -68,7 +68,7 @@ cpu_configure(void) /* Make sure that timers run at CPU frequency */ mtdcr(DCR_CPC0_CR1, mfdcr(DCR_CPC0_CR1) ~CPC0_CR1_CETE); - if (config_rootfound(plb, local_plb_devs) == NULL) + if (config_rootfound(plb, __UNCONST(local_plb_devs)) == NULL) panic(configure: plb not configured); (void)spl0();
CVS commit: src/sys/arch/evbppc/mpc85xx
Module Name:src Committed By: joerg Date: Thu Jul 24 23:30:38 UTC 2014 Modified Files: src/sys/arch/evbppc/mpc85xx: machdep.c Log Message: Use volatile when writing to NULL. To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/sys/arch/evbppc/mpc85xx/machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbppc/mpc85xx/machdep.c diff -u src/sys/arch/evbppc/mpc85xx/machdep.c:1.31 src/sys/arch/evbppc/mpc85xx/machdep.c:1.32 --- src/sys/arch/evbppc/mpc85xx/machdep.c:1.31 Tue Mar 18 18:20:41 2014 +++ src/sys/arch/evbppc/mpc85xx/machdep.c Thu Jul 24 23:30:38 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.31 2014/03/18 18:20:41 riastradh Exp $ */ +/* $NetBSD: machdep.c,v 1.32 2014/07/24 23:30:38 joerg Exp $ */ /*- * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc. * All rights reserved. @@ -1183,7 +1183,7 @@ initppc(vaddr_t startkernel, vaddr_t end /* * fill in with an absolute branch to a routine that will panic. */ - *(int *)0 = 0x4802 | (int) calltozero; + *(volatile int *)0 = 0x4802 | (int) calltozero; /* * Get the cache sizes.
CVS commit: src/sys/arch/evbppc/conf
Module Name:src Committed By: matt Date: Thu Mar 6 19:55:37 UTC 2014 Modified Files: src/sys/arch/evbppc/conf: TWRP1025 Log Message: Add options MODULAR To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbppc/conf/TWRP1025 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbppc/conf/TWRP1025 diff -u src/sys/arch/evbppc/conf/TWRP1025:1.12 src/sys/arch/evbppc/conf/TWRP1025:1.13 --- src/sys/arch/evbppc/conf/TWRP1025:1.12 Sun Jun 30 21:38:56 2013 +++ src/sys/arch/evbppc/conf/TWRP1025 Thu Mar 6 19:55:37 2014 @@ -1,4 +1,4 @@ -# $NetBSD: TWRP1025,v 1.12 2013/06/30 21:38:56 rmind Exp $ +# $NetBSD: TWRP1025,v 1.13 2014/03/06 19:55:37 matt Exp $ # # TWRP1025 -- everything that's currently supported # @@ -7,7 +7,7 @@ include arch/evbppc/conf/std.mpc85xx options INCLUDE_CONFIG_FILE # embed config file in kernel binary -ident TWRP1025-$Revision: 1.12 $ +ident TWRP1025-$Revision: 1.13 $ maxusers 32 @@ -24,6 +24,7 @@ options SYS_CLK=6667 #options INSECURE # disable kernel security levels #options NTP # NTP phase/frequency locked loop options KTRACE # system call tracing via ktrace(1) +options MODULAR # new style module(7) framework options SYSVMSG # System V message queues options SYSVSEM # System V semaphores
CVS commit: src/sys/arch/evbppc/conf
Module Name:src Committed By: joerg Date: Thu Mar 6 23:13:58 UTC 2014 Modified Files: src/sys/arch/evbppc/conf: EV64260 Log Message: Bump symtab space slightly. To generate a diff of this commit: cvs rdiff -u -r1.59 -r1.60 src/sys/arch/evbppc/conf/EV64260 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbppc/conf/EV64260 diff -u src/sys/arch/evbppc/conf/EV64260:1.59 src/sys/arch/evbppc/conf/EV64260:1.60 --- src/sys/arch/evbppc/conf/EV64260:1.59 Sun Jun 30 21:38:56 2013 +++ src/sys/arch/evbppc/conf/EV64260 Thu Mar 6 23:13:58 2014 @@ -1,4 +1,4 @@ -# $NetBSD: EV64260,v 1.59 2013/06/30 21:38:56 rmind Exp $ +# $NetBSD: EV64260,v 1.60 2014/03/06 23:13:58 joerg Exp $ # # MVP -- Motorola's Multiprocessing Verification Platform # @@ -57,7 +57,7 @@ options DIAGNOSTIC # cheap kernel consi #options DEBUG # expensive debugging checks/support options DDB # in-kernel debugger options DDB_HISTORY_SIZE=512 # enable history editing in DDB -options SYMTAB_SPACE=33 # size for embedded symbol table +options SYMTAB_SPACE=34 # size for embedded symbol table #makeoptions DEFCOPTS=-g # compile full symbol table makeoptions DEBUG=-g
CVS commit: src/sys/arch/evbppc/conf
Module Name:src Committed By: joerg Date: Thu Mar 6 23:14:16 UTC 2014 Modified Files: src/sys/arch/evbppc/conf: INSTALL.inc Log Message: Give memory disk a bit more breathing room. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbppc/conf/INSTALL.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbppc/conf/INSTALL.inc diff -u src/sys/arch/evbppc/conf/INSTALL.inc:1.1 src/sys/arch/evbppc/conf/INSTALL.inc:1.2 --- src/sys/arch/evbppc/conf/INSTALL.inc:1.1 Wed Jun 8 05:03:43 2011 +++ src/sys/arch/evbppc/conf/INSTALL.inc Thu Mar 6 23:14:16 2014 @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL.inc,v 1.1 2011/06/08 05:03:43 matt Exp $ +# $NetBSD: INSTALL.inc,v 1.2 2014/03/06 23:14:16 joerg Exp $ # DEBUG options turned on: @@ -17,5 +17,5 @@ options MEMORY_DISK_IS_ROOT # force roo options MEMORY_DISK_SERVER=0 # no userspace memory disk support ## The ramdisk size must be kept in sync manually with the size of ## the `ramdisk' image (which is built in distrib/evbppc/ramdisk/ramdisk). -options MEMORY_DISK_ROOT_SIZE=6144 # size of memory disk, in blocks +options MEMORY_DISK_ROOT_SIZE=6400 # size of memory disk, in blocks options MEMORY_DISK_RBFLAGS=RB_SINGLE # boot in single-user mode
CVS commit: src/sys/arch/evbppc/conf
Module Name:src Committed By: joerg Date: Thu Mar 6 23:30:28 UTC 2014 Modified Files: src/sys/arch/evbppc/conf: TWRP1025 Log Message: Add config variant for root-on-SD. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/arch/evbppc/conf/TWRP1025 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbppc/conf/TWRP1025 diff -u src/sys/arch/evbppc/conf/TWRP1025:1.13 src/sys/arch/evbppc/conf/TWRP1025:1.14 --- src/sys/arch/evbppc/conf/TWRP1025:1.13 Thu Mar 6 19:55:37 2014 +++ src/sys/arch/evbppc/conf/TWRP1025 Thu Mar 6 23:30:28 2014 @@ -1,4 +1,4 @@ -# $NetBSD: TWRP1025,v 1.13 2014/03/06 19:55:37 matt Exp $ +# $NetBSD: TWRP1025,v 1.14 2014/03/06 23:30:28 joerg Exp $ # # TWRP1025 -- everything that's currently supported # @@ -7,7 +7,7 @@ include arch/evbppc/conf/std.mpc85xx options INCLUDE_CONFIG_FILE # embed config file in kernel binary -ident TWRP1025-$Revision: 1.13 $ +ident TWRP1025-$Revision: 1.14 $ maxusers 32 @@ -135,6 +135,7 @@ options SCSIVERBOSE # human readable SC # Kernel root file system and dump configuration. config netbsd root on ? type ? +config netbsd-ld0a root on ld0a type ffs config netbsd-sd0a root on sd0a type ffs config nfsnetbsd root on tsec0 type nfs
CVS commit: src/sys/arch/evbppc
Module Name:src
Committed By: joerg
Date: Mon Mar 3 18:25:14 UTC 2014
Modified Files:
src/sys/arch/evbppc/compile: walnut-mkimg.sh
src/sys/arch/evbppc/conf: Makefile.ev64260.inc Makefile.obs405.inc
Makefile.walnut.inc
Log Message:
Use nbstat when cross-compiling, unbreaks build on Linux.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbppc/compile/walnut-mkimg.sh
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbppc/conf/Makefile.ev64260.inc
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbppc/conf/Makefile.obs405.inc
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbppc/conf/Makefile.walnut.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbppc/compile/walnut-mkimg.sh
diff -u src/sys/arch/evbppc/compile/walnut-mkimg.sh:1.4 src/sys/arch/evbppc/compile/walnut-mkimg.sh:1.5
--- src/sys/arch/evbppc/compile/walnut-mkimg.sh:1.4 Sat Nov 6 16:23:35 2010
+++ src/sys/arch/evbppc/compile/walnut-mkimg.sh Mon Mar 3 18:25:14 2014
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: walnut-mkimg.sh,v 1.4 2010/11/06 16:23:35 uebayasi Exp $
+# $NetBSD: walnut-mkimg.sh,v 1.5 2014/03/03 18:25:14 joerg Exp $
# Convert an input to a TFTP image loadable by the IBM PowerPC OpenBIOS.
@@ -18,6 +18,7 @@ output=$1; shift
: ${OBJDUMP=objdump}
: ${OBJCOPY=objcopy}
+: ${STAT=stat}
file=$( file $input )
case $file in
@@ -36,7 +37,7 @@ case $file in
;;
esac
-size=`stat -f '%z' ${input}.bin.$$`
+size=$(${STAT} -f '%z' ${input}.bin.$$)
size=$(( ( $size + 511 ) / 512 ))
enc()
Index: src/sys/arch/evbppc/conf/Makefile.ev64260.inc
diff -u src/sys/arch/evbppc/conf/Makefile.ev64260.inc:1.5 src/sys/arch/evbppc/conf/Makefile.ev64260.inc:1.6
--- src/sys/arch/evbppc/conf/Makefile.ev64260.inc:1.5 Sat Oct 30 03:46:03 2010
+++ src/sys/arch/evbppc/conf/Makefile.ev64260.inc Mon Mar 3 18:25:14 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.ev64260.inc,v 1.5 2010/10/30 03:46:03 uebayasi Exp $
+# $NetBSD: Makefile.ev64260.inc,v 1.6 2014/03/03 18:25:14 joerg Exp $
MKIMG?= ${HOST_SH} ${THISPPC}/compile/walnut-mkimg.sh
@@ -9,5 +9,5 @@ SYSTEM_FIRST_SFILE= ${THISPPC}/${BOARDTY
SYSTEM_LD_TAIL_EXTRA+=; \
echo ${MKIMG} $@ $@.img ; \
- OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; export OBJDUMP OBJCOPY; \
- ${MKIMG} $@ $@.img
+ OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; STAT=${STAT}; \
+ export OBJDUMP OBJCOPY STAT; ${MKIMG} $@ $@.img
Index: src/sys/arch/evbppc/conf/Makefile.obs405.inc
diff -u src/sys/arch/evbppc/conf/Makefile.obs405.inc:1.9 src/sys/arch/evbppc/conf/Makefile.obs405.inc:1.10
--- src/sys/arch/evbppc/conf/Makefile.obs405.inc:1.9 Mon Jan 27 21:37:17 2014
+++ src/sys/arch/evbppc/conf/Makefile.obs405.inc Mon Mar 3 18:25:14 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.obs405.inc,v 1.9 2014/01/27 21:37:17 apb Exp $
+# $NetBSD: Makefile.obs405.inc,v 1.10 2014/03/03 18:25:14 joerg Exp $
CFLAGS+=-mcpu=405
AFLAGS+=-mcpu=405
@@ -15,8 +15,8 @@ SYSTEM_FIRST_SFILE= ${THISPPC}/obs405/ob
SYSTEM_LD_TAIL_EXTRA+=; \
echo ${MKIMG} $@ $@.img ; \
- OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; export OBJDUMP OBJCOPY; \
- ${MKIMG} $@ $@.img
+ OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; STAT=${STAT}; \
+ export OBJDUMP OBJCOPY STAT; ${MKIMG} $@ $@.img
.elif ${PRDCTTYPE} == obs266
@@ -30,8 +30,8 @@ SYSTEM_FIRST_SFILE= ${POWERPC}/${PPCDIR}
SYSTEM_LD_TAIL_EXTRA+=; \
echo ${MKIMG} $@ $@.img ; \
- OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; export OBJDUMP OBJCOPY; \
- ${MKIMG} $@ $@.img
+ OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; STAT=${STAT}; \
+ export OBJDUMP OBJCOPY STAT; ${MKIMG} $@ $@.img
.elif ${PRDCTTYPE} == obs600
Index: src/sys/arch/evbppc/conf/Makefile.walnut.inc
diff -u src/sys/arch/evbppc/conf/Makefile.walnut.inc:1.6 src/sys/arch/evbppc/conf/Makefile.walnut.inc:1.7
--- src/sys/arch/evbppc/conf/Makefile.walnut.inc:1.6 Wed Feb 1 21:46:02 2012
+++ src/sys/arch/evbppc/conf/Makefile.walnut.inc Mon Mar 3 18:25:14 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.walnut.inc,v 1.6 2012/02/01 21:46:02 matt Exp $
+# $NetBSD: Makefile.walnut.inc,v 1.7 2014/03/03 18:25:14 joerg Exp $
MKIMG?= ${HOST_SH} ${THISPPC}/compile/walnut-mkimg.sh
CFLAGS+=-mcpu=403
@@ -10,5 +10,5 @@ SYSTEM_FIRST_SFILE= ${THISPPC}/walnut/wa
SYSTEM_LD_TAIL_EXTRA_EXTRA+=; \
echo ${MKIMG} $@ $@.img ; \
- OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; export OBJDUMP OBJCOPY; \
- ${MKIMG} $@ $@.img
+ OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; STAT=${STAT}; \
+ export OBJDUMP OBJCOPY STAT; ${MKIMG} $@ $@.img
CVS commit: src/sys/arch/evbppc/conf
Module Name:src
Committed By: joerg
Date: Mon Mar 3 19:08:46 UTC 2014
Modified Files:
src/sys/arch/evbppc/conf: Makefile.ev64260.inc Makefile.obs405.inc
Makefile.walnut.inc
Log Message:
Spell it TOOL_STAT.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbppc/conf/Makefile.ev64260.inc
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbppc/conf/Makefile.obs405.inc
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbppc/conf/Makefile.walnut.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbppc/conf/Makefile.ev64260.inc
diff -u src/sys/arch/evbppc/conf/Makefile.ev64260.inc:1.6 src/sys/arch/evbppc/conf/Makefile.ev64260.inc:1.7
--- src/sys/arch/evbppc/conf/Makefile.ev64260.inc:1.6 Mon Mar 3 18:25:14 2014
+++ src/sys/arch/evbppc/conf/Makefile.ev64260.inc Mon Mar 3 19:08:46 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.ev64260.inc,v 1.6 2014/03/03 18:25:14 joerg Exp $
+# $NetBSD: Makefile.ev64260.inc,v 1.7 2014/03/03 19:08:46 joerg Exp $
MKIMG?= ${HOST_SH} ${THISPPC}/compile/walnut-mkimg.sh
@@ -9,5 +9,5 @@ SYSTEM_FIRST_SFILE= ${THISPPC}/${BOARDTY
SYSTEM_LD_TAIL_EXTRA+=; \
echo ${MKIMG} $@ $@.img ; \
- OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; STAT=${STAT}; \
+ OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; STAT=${TOOL_STAT]; \
export OBJDUMP OBJCOPY STAT; ${MKIMG} $@ $@.img
Index: src/sys/arch/evbppc/conf/Makefile.obs405.inc
diff -u src/sys/arch/evbppc/conf/Makefile.obs405.inc:1.10 src/sys/arch/evbppc/conf/Makefile.obs405.inc:1.11
--- src/sys/arch/evbppc/conf/Makefile.obs405.inc:1.10 Mon Mar 3 18:25:14 2014
+++ src/sys/arch/evbppc/conf/Makefile.obs405.inc Mon Mar 3 19:08:46 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.obs405.inc,v 1.10 2014/03/03 18:25:14 joerg Exp $
+# $NetBSD: Makefile.obs405.inc,v 1.11 2014/03/03 19:08:46 joerg Exp $
CFLAGS+=-mcpu=405
AFLAGS+=-mcpu=405
@@ -15,7 +15,7 @@ SYSTEM_FIRST_SFILE= ${THISPPC}/obs405/ob
SYSTEM_LD_TAIL_EXTRA+=; \
echo ${MKIMG} $@ $@.img ; \
- OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; STAT=${STAT}; \
+ OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; STAT=${TOOL_STAT]; \
export OBJDUMP OBJCOPY STAT; ${MKIMG} $@ $@.img
@@ -30,7 +30,7 @@ SYSTEM_FIRST_SFILE= ${POWERPC}/${PPCDIR}
SYSTEM_LD_TAIL_EXTRA+=; \
echo ${MKIMG} $@ $@.img ; \
- OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; STAT=${STAT}; \
+ OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; STAT=${TOOL_STAT]; \
export OBJDUMP OBJCOPY STAT; ${MKIMG} $@ $@.img
Index: src/sys/arch/evbppc/conf/Makefile.walnut.inc
diff -u src/sys/arch/evbppc/conf/Makefile.walnut.inc:1.7 src/sys/arch/evbppc/conf/Makefile.walnut.inc:1.8
--- src/sys/arch/evbppc/conf/Makefile.walnut.inc:1.7 Mon Mar 3 18:25:14 2014
+++ src/sys/arch/evbppc/conf/Makefile.walnut.inc Mon Mar 3 19:08:46 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.walnut.inc,v 1.7 2014/03/03 18:25:14 joerg Exp $
+# $NetBSD: Makefile.walnut.inc,v 1.8 2014/03/03 19:08:46 joerg Exp $
MKIMG?= ${HOST_SH} ${THISPPC}/compile/walnut-mkimg.sh
CFLAGS+=-mcpu=403
@@ -10,5 +10,5 @@ SYSTEM_FIRST_SFILE= ${THISPPC}/walnut/wa
SYSTEM_LD_TAIL_EXTRA_EXTRA+=; \
echo ${MKIMG} $@ $@.img ; \
- OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; STAT=${STAT}; \
+ OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; STAT=${TOOL_STAT]; \
export OBJDUMP OBJCOPY STAT; ${MKIMG} $@ $@.img
CVS commit: src/sys/arch/evbppc/ev64260
Module Name:src
Committed By: martin
Date: Tue Feb 25 14:33:32 UTC 2014
Modified Files:
src/sys/arch/evbppc/ev64260: machdep.c
Log Message:
Remove an unused variable
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/evbppc/ev64260/machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbppc/ev64260/machdep.c
diff -u src/sys/arch/evbppc/ev64260/machdep.c:1.30 src/sys/arch/evbppc/ev64260/machdep.c:1.31
--- src/sys/arch/evbppc/ev64260/machdep.c:1.30 Fri Mar 1 18:25:39 2013
+++ src/sys/arch/evbppc/ev64260/machdep.c Tue Feb 25 14:33:32 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.30 2013/03/01 18:25:39 joerg Exp $ */
+/* $NetBSD: machdep.c,v 1.31 2014/02/25 14:33:32 martin Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.30 2013/03/01 18:25:39 joerg Exp $);
+__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.31 2014/02/25 14:33:32 martin Exp $);
#include opt_marvell.h
#include opt_modular.h
@@ -397,10 +397,10 @@ gt_bus_space_init(void)
{
const struct gt_decode_info *di;
uint32_t datal, datah;
- int error, bs, i;
+ int bs, i;
bs = 0;
- error = bus_space_init(ev64260_gt_bs_tag, gt,
+ bus_space_init(ev64260_gt_bs_tag, gt,
ex_storage[bs], sizeof(ex_storage[bs]));
bs++;
@@ -418,7 +418,7 @@ gt_bus_space_init(void)
memt-pbs_limit = GT_HighAddr_GET(datah) + 1 -
memt-pbs_offset;
- error = bus_space_init(memt, obio2,
+ bus_space_init(memt, obio2,
ex_storage[bs], sizeof(ex_storage[bs]));
bs++;
}
@@ -438,7 +438,7 @@ gt_bus_space_init(void)
ev64260_pci0_mem_bs_tag.pbs_base = GT_LowAddr_GET(datal);
ev64260_pci0_mem_bs_tag.pbs_limit = GT_HighAddr_GET(datah) + 1;
- error = bus_space_init(ev64260_pci0_mem_bs_tag, pci0-mem,
+ bus_space_init(ev64260_pci0_mem_bs_tag, pci0-mem,
ex_storage[bs], sizeof(ex_storage[bs]));
bs++;
@@ -472,7 +472,7 @@ gt_bus_space_init(void)
ev64260_pci0_io_bs_tag.pbs_limit = GT_HighAddr_GET(datah) + 1 -
ev64260_pci0_io_bs_tag.pbs_offset;
- error = bus_space_init(ev64260_pci0_io_bs_tag, pci0-ioport,
+ bus_space_init(ev64260_pci0_io_bs_tag, pci0-ioport,
ex_storage[bs], sizeof(ex_storage[bs]));
bs++;
@@ -491,7 +491,7 @@ gt_bus_space_init(void)
ev64260_pci1_mem_bs_tag.pbs_base = GT_LowAddr_GET(datal);
ev64260_pci1_mem_bs_tag.pbs_limit = GT_HighAddr_GET(datah) + 1;
- error = bus_space_init(ev64260_pci1_mem_bs_tag, pci1-mem,
+ bus_space_init(ev64260_pci1_mem_bs_tag, pci1-mem,
ex_storage[bs], sizeof(ex_storage[bs]));
bs++;
@@ -525,7 +525,7 @@ gt_bus_space_init(void)
ev64260_pci1_io_bs_tag.pbs_limit = GT_HighAddr_GET(datah) + 1 -
ev64260_pci1_io_bs_tag.pbs_offset;
- error = bus_space_init(ev64260_pci1_io_bs_tag, pci1-ioport,
+ bus_space_init(ev64260_pci1_io_bs_tag, pci1-ioport,
ex_storage[bs], sizeof(ex_storage[bs]));
bs++;
}
CVS commit: src/sys/arch/evbppc/explora
Module Name:src Committed By: matt Date: Thu Oct 3 22:28:38 UTC 2013 Modified Files: src/sys/arch/evbppc/explora: explora_start.S Log Message: Binutils 2.23.2 doesn't do the right thing HI16/LO16 reloc using . So do it manually to appease gas. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbppc/explora/explora_start.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbppc/explora/explora_start.S diff -u src/sys/arch/evbppc/explora/explora_start.S:1.10 src/sys/arch/evbppc/explora/explora_start.S:1.11 --- src/sys/arch/evbppc/explora/explora_start.S:1.10 Mon Jun 20 19:56:11 2011 +++ src/sys/arch/evbppc/explora/explora_start.S Thu Oct 3 22:28:38 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: explora_start.S,v 1.10 2011/06/20 19:56:11 matt Exp $ */ +/* $NetBSD: explora_start.S,v 1.11 2013/10/03 22:28:38 matt Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -126,8 +126,13 @@ _next: /* Jump into the staging area so we can remap the dram. */ +#if 0 lis 0,stage1reloc@h ori 0,0,stage1reloc@l +#else + lis 0,((stage1reloc 16) 0x) + ori 0,0,(stage1reloc 0x) +#endif mtlr 0 blr
CVS commit: src/sys/arch/evbppc/mpc85xx
Module Name:src
Committed By: matt
Date: Wed Jul 17 23:25:25 UTC 2013
Modified Files:
src/sys/arch/evbppc/mpc85xx: machdep.c
Log Message:
kcpuset_t changes
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/evbppc/mpc85xx/machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbppc/mpc85xx/machdep.c
diff -u src/sys/arch/evbppc/mpc85xx/machdep.c:1.29 src/sys/arch/evbppc/mpc85xx/machdep.c:1.30
--- src/sys/arch/evbppc/mpc85xx/machdep.c:1.29 Sun Jul 29 21:39:43 2012
+++ src/sys/arch/evbppc/mpc85xx/machdep.c Wed Jul 17 23:25:25 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.29 2012/07/29 21:39:43 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.30 2013/07/17 23:25:25 matt Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -75,7 +75,6 @@ __KERNEL_RCSID(0, $NetSBD$);
#include net/if_media.h
#include dev/mii/miivar.h
-#include powerpc/cpuset.h
#include powerpc/pcb.h
#include powerpc/spr.h
#include powerpc/booke/spr.h
@@ -807,7 +806,7 @@ e500_cpu_spinup(device_t self, struct cp
struct uboot_spinup_entry * const e = (void *)spinup_table_addr;
volatile struct cpu_hatch_data * const h = cpu_hatch_data;
const size_t id = cpu_index(ci);
- volatile __cpuset_t * const hatchlings = cpuset_info.cpus_hatched;
+ kcpuset_t * const hatchlings = cpuset_info.cpus_hatched;
if (h-hatch_sp == 0) {
int error = uvm_pglistalloc(PAGE_SIZE, PAGE_SIZE,
@@ -839,6 +838,9 @@ e500_cpu_spinup(device_t self, struct cp
h-hatch_running = -1;
h-hatch_pir = e[i].entry_pir;
h-hatch_hid0 = mfspr(SPR_HID0);
+ u_int tlbidx;
+ e500_tlb_lookup_xtlb(0, tlbidx);
+ h-hatch_tlbidx = tlbidx;
KASSERT(h-hatch_sp != 0);
/*
* Get new timebase. We don't want to deal with
@@ -859,7 +861,6 @@ e500_cpu_spinup(device_t self, struct cp
__asm(sync;isync);
dcache_wbinv((vaddr_t)h, sizeof(*h));
-#if 1
/*
* And here we go...
*/
@@ -872,19 +873,23 @@ e500_cpu_spinup(device_t self, struct cp
for (u_int timo = 0; timo++ 1; ) {
dcache_inv((vaddr_t)e[i], sizeof(e[i]));
if (e[i].entry_addr_lower == 3) {
+#if 0
printf(
%s: cpu%u started in %u spins\n,
__func__, cpu_index(ci), timo);
+#endif
break;
}
}
for (u_int timo = 0; timo++ 1; ) {
dcache_inv((vaddr_t)h, sizeof(*h));
if (h-hatch_running == 0) {
+#if 0
printf(
%s: cpu%u cracked in %u spins: (running=%d)\n,
__func__, cpu_index(ci),
timo, h-hatch_running);
+#endif
break;
}
}
@@ -895,7 +900,6 @@ e500_cpu_spinup(device_t self, struct cp
h-hatch_running, e[i].entry_addr_lower);
goto out;
}
-#endif
/*
* First then we do is to synchronize timebases.
@@ -908,6 +912,8 @@ e500_cpu_spinup(device_t self, struct cp
dcache_wbinv((vaddr_t)h, sizeof(*h));
__asm(sync;isync);
__insn_barrier();
+ printf(%s: cpu%u set to running\n,
+ __func__, cpu_index(ci));
for (u_int timo = 1; timo-- 0; ) {
dcache_inv((vaddr_t)h, sizeof(*h));
@@ -937,7 +943,7 @@ e500_cpu_spinup(device_t self, struct cp
* should be long enough.
*/
for (u_int timo = 1; timo-- 0; ) {
-if (CPUSET_HAS_P(*hatchlings, id)) {
+if (kcpuset_isset(hatchlings, id)) {
aprint_normal_dev(self,
hatch successful (%u spins,
timebase adjusted by %PRId64)\n,
CVS commit: src/sys/arch/evbppc/conf
Module Name:src
Committed By: kiyohara
Date: Wed Mar 20 06:35:49 UTC 2013
Modified Files:
src/sys/arch/evbppc/conf: Makefile.obs405.inc
Log Message:
Use mkubootimage, if obs600.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbppc/conf/Makefile.obs405.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbppc/conf/Makefile.obs405.inc
diff -u src/sys/arch/evbppc/conf/Makefile.obs405.inc:1.6 src/sys/arch/evbppc/conf/Makefile.obs405.inc:1.7
--- src/sys/arch/evbppc/conf/Makefile.obs405.inc:1.6 Sat Oct 30 03:46:03 2010
+++ src/sys/arch/evbppc/conf/Makefile.obs405.inc Wed Mar 20 06:35:49 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.obs405.inc,v 1.6 2010/10/30 03:46:03 uebayasi Exp $
+# $NetBSD: Makefile.obs405.inc,v 1.7 2013/03/20 06:35:49 kiyohara Exp $
CFLAGS+=-mcpu=405
AFLAGS+=-mcpu=405
@@ -41,8 +41,25 @@ TEXTADDR?= 25000
SYSTEM_FIRST_OBJ= obs600_locore.o
SYSTEM_FIRST_SFILE= ${THISPPC}/obs405/obs600_locore.S
+.if ${USETOOLS} == yes
+MKUBOOTIMAGE= ${TOOLDIR}/bin/${_TOOL_PREFIX}mkubootimage
+.else
+MKUBOOTIMAGE= mkubootimage
+.endif
+MKUBOOTIMAGEARGS= -A powerpc -T kernel
+MKUBOOTIMAGEARGS+= -a $(TEXTADDR)
+MKUBOOTIMAGEARGS+= -n NetBSD/openblocks600 ${_OSRELEASE}
+MKUBOOTIMAGEARGS_NONE= ${MKUBOOTIMAGEARGS} -C none
+MKUBOOTIMAGEARGS_GZ=${MKUBOOTIMAGEARGS} -C gz
+
SYSTEM_LD_TAIL_EXTRA+=; \
echo ${OBJCOPY} -S -O binary $@ $@.bin; \
- ${OBJCOPY} -S -O binary $@ $@.bin;
+ ${OBJCOPY} -S -O binary $@ $@.bin; \
+ echo gzip -c $@.bin $@.bin.gz; \
+ gzip -c $@.bin $@.bin.gz; \
+ echo ${MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_GZ} $@.bin.gz $@.gz.ub; \
+ ${MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_GZ} $@.bin.gz $@.gz.ub; \
+ echo ${MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_NONE} $@.bin $@.ub; \
+ ${MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_NONE} $@.bin $@.ub;
.endif
CVS commit: src/sys/arch/evbppc/evbppc
Module Name:src Committed By: kiyohara Date: Fri Jan 18 14:04:16 UTC 2013 Modified Files: src/sys/arch/evbppc/evbppc: disksubr.c Log Message: Fix KASSERT() in biodone(). Clear BO_DONE in writedisklabel(). To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/arch/evbppc/evbppc/disksubr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbppc/evbppc/disksubr.c diff -u src/sys/arch/evbppc/evbppc/disksubr.c:1.16 src/sys/arch/evbppc/evbppc/disksubr.c:1.17 --- src/sys/arch/evbppc/evbppc/disksubr.c:1.16 Wed Jan 2 11:48:24 2008 +++ src/sys/arch/evbppc/evbppc/disksubr.c Fri Jan 18 14:04:16 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: disksubr.c,v 1.16 2008/01/02 11:48:24 ad Exp $ */ +/* $NetBSD: disksubr.c,v 1.17 2013/01/18 14:04:16 kiyohara Exp $ */ /* * Copyright (c) 1982, 1986, 1988 Regents of the University of California. @@ -32,7 +32,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: disksubr.c,v 1.16 2008/01/02 11:48:24 ad Exp $); +__KERNEL_RCSID(0, $NetBSD: disksubr.c,v 1.17 2013/01/18 14:04:16 kiyohara Exp $); #include sys/param.h #include sys/systm.h @@ -248,6 +248,7 @@ writedisklabel(dev_t dev, void (*strat)( *dlp = *lp; bp-b_cflags = BC_BUSY; bp-b_flags = B_WRITE; + CLR(bp-b_oflags, BO_DONE); (*strat)(bp); error = biowait(bp); goto done;
CVS commit: src/sys/arch/evbppc/mpc85xx
Module Name:src Committed By: matt Date: Sun Jul 29 21:36:27 UTC 2012 Modified Files: src/sys/arch/evbppc/mpc85xx: mpc85xx_start.S Log Message: Make sure r8 isn't used. Document args passed by uboot To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbppc/mpc85xx/mpc85xx_start.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbppc/mpc85xx/mpc85xx_start.S diff -u src/sys/arch/evbppc/mpc85xx/mpc85xx_start.S:1.5 src/sys/arch/evbppc/mpc85xx/mpc85xx_start.S:1.6 --- src/sys/arch/evbppc/mpc85xx/mpc85xx_start.S:1.5 Sat Jun 18 06:37:38 2011 +++ src/sys/arch/evbppc/mpc85xx/mpc85xx_start.S Sun Jul 29 21:36:27 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: mpc85xx_start.S,v 1.5 2011/06/18 06:37:38 matt Exp $ */ +/* $NetBSD: mpc85xx_start.S,v 1.6 2012/07/29 21:36:27 matt Exp $ */ /*- * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc. * All rights reserved. @@ -37,7 +37,7 @@ #include sys/cdefs.h #include powerpc/asm.h -RCSID($NetBSD: mpc85xx_start.S,v 1.5 2011/06/18 06:37:38 matt Exp $) +RCSID($NetBSD: mpc85xx_start.S,v 1.6 2012/07/29 21:36:27 matt Exp $) #include opt_altivec.h #include opt_ddb.h @@ -78,10 +78,10 @@ __start: /* * Startup entry. Note, this must be the first thing in the text segment! */ - mr %r8,%r6 - mr %r7,%r5 - mr %r6,%r4 - mr %r5,%r3 + mr %r8,%r6 /* cmdline (char *) */ + mr %r7,%r5 /* consdev (char *) */ + mr %r6,%r4 /* os_hdr * */ + mr %r5,%r3 /* board info * */ #ifdef DEBUG /* * Set all the registers we don't care about to a known junk value. @@ -231,11 +231,11 @@ __start: /* * Force all dirty lines in the kernel area to memory. */ - lis %r8,kernel_text@ha - addi %r8,%r8,kernel_text@l -4: dcbst %r0,%r8 - addi %r8,%r8,32 - cmplw %r8,%r4 + lis %r9,kernel_text@ha + addi %r9,%r9,kernel_text@l +4: dcbst %r0,%r9 + addi %r9,%r9,32 + cmplw %r9,%r4 blt %cr0,4b mbar 1 msync
CVS commit: src/sys/arch/evbppc/conf
Module Name:src Committed By: matt Date: Tue Jul 24 22:37:08 UTC 2012 Modified Files: src/sys/arch/evbppc/conf: MPC8536DS MPC8548CDS P2020DS RB800 TWRP1025 Log Message: Add drvctl To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbppc/conf/MPC8536DS cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbppc/conf/MPC8548CDS cvs rdiff -u -r1.13 -r1.14 src/sys/arch/evbppc/conf/P2020DS cvs rdiff -u -r1.18 -r1.19 src/sys/arch/evbppc/conf/RB800 cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbppc/conf/TWRP1025 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbppc/conf/MPC8536DS diff -u src/sys/arch/evbppc/conf/MPC8536DS:1.12 src/sys/arch/evbppc/conf/MPC8536DS:1.13 --- src/sys/arch/evbppc/conf/MPC8536DS:1.12 Mon Jul 23 16:27:44 2012 +++ src/sys/arch/evbppc/conf/MPC8536DS Tue Jul 24 22:37:08 2012 @@ -1,4 +1,4 @@ -# $NetBSD: MPC8536DS,v 1.12 2012/07/23 16:27:44 matt Exp $ +# $NetBSD: MPC8536DS,v 1.13 2012/07/24 22:37:08 matt Exp $ # # MPC8536DS -- everything that's currently supported # @@ -7,7 +7,7 @@ include arch/evbppc/conf/std.mpc85xx options INCLUDE_CONFIG_FILE # embed config file in kernel binary -ident MPC8536DS-$Revision: 1.12 $ +ident MPC8536DS-$Revision: 1.13 $ maxusers 32 @@ -226,6 +226,7 @@ makphy* at mii? phy ? # Marvell PHYs pseudo-device loop # network loopback pseudo-device bpfilter # packet filter pseudo-device clockctl # user control of clock subsystem +pseudo-device drvctl # user control of disk subsystem pseudo-device ksyms # /dev/ksyms pseudo-device pty # pseudo-terminals pseudo-device kttcp # kernel ttcp Index: src/sys/arch/evbppc/conf/MPC8548CDS diff -u src/sys/arch/evbppc/conf/MPC8548CDS:1.11 src/sys/arch/evbppc/conf/MPC8548CDS:1.12 --- src/sys/arch/evbppc/conf/MPC8548CDS:1.11 Mon Jul 23 16:27:44 2012 +++ src/sys/arch/evbppc/conf/MPC8548CDS Tue Jul 24 22:37:08 2012 @@ -1,4 +1,4 @@ -# $NetBSD: MPC8548CDS,v 1.11 2012/07/23 16:27:44 matt Exp $ +# $NetBSD: MPC8548CDS,v 1.12 2012/07/24 22:37:08 matt Exp $ # # MPC8548CDS -- everything that's currently supported # @@ -7,7 +7,7 @@ include arch/evbppc/conf/std.mpc85xx options INCLUDE_CONFIG_FILE # embed config file in kernel binary -ident MPC8548CDS-$Revision: 1.11 $ +ident MPC8548CDS-$Revision: 1.12 $ maxusers 32 @@ -214,6 +214,7 @@ wd* at atabus? drive ? pseudo-device loop # network loopback pseudo-device bpfilter # packet filter pseudo-device clockctl # user control of clock subsystem +pseudo-device drvctl # user control of drive subsystem pseudo-device ksyms # /dev/ksyms pseudo-device pty # pseudo-terminals pseudo-device kttcp # kernel ttcp Index: src/sys/arch/evbppc/conf/P2020DS diff -u src/sys/arch/evbppc/conf/P2020DS:1.13 src/sys/arch/evbppc/conf/P2020DS:1.14 --- src/sys/arch/evbppc/conf/P2020DS:1.13 Mon Jul 23 16:27:44 2012 +++ src/sys/arch/evbppc/conf/P2020DS Tue Jul 24 22:37:08 2012 @@ -1,4 +1,4 @@ -# $NetBSD: P2020DS,v 1.13 2012/07/23 16:27:44 matt Exp $ +# $NetBSD: P2020DS,v 1.14 2012/07/24 22:37:08 matt Exp $ # # P2020DS -- everything that's currently supported # @@ -8,7 +8,7 @@ include arch/evbppc/conf/std.mpc85xx options INCLUDE_CONFIG_FILE # embed config file in kernel binary -ident P2020DS-$Revision: 1.13 $ +ident P2020DS-$Revision: 1.14 $ maxusers 32 @@ -237,6 +237,7 @@ ukphy* at mii? phy ? # generic unknow pseudo-device loop # network loopback pseudo-device bpfilter # packet filter pseudo-device clockctl # user control of clock subsystem +pseudo-device drvctl # user control of drive subsystem pseudo-device ksyms # /dev/ksyms pseudo-device pty # pseudo-terminals pseudo-device kttcp # kernel ttcp Index: src/sys/arch/evbppc/conf/RB800 diff -u src/sys/arch/evbppc/conf/RB800:1.18 src/sys/arch/evbppc/conf/RB800:1.19 --- src/sys/arch/evbppc/conf/RB800:1.18 Mon Jul 23 16:27:44 2012 +++ src/sys/arch/evbppc/conf/RB800 Tue Jul 24 22:37:08 2012 @@ -1,4 +1,4 @@ -# $NetBSD: RB800,v 1.18 2012/07/23 16:27:44 matt Exp $ +# $NetBSD: RB800,v 1.19 2012/07/24 22:37:08 matt Exp $ # # RB800 -- everything that's currently supported # @@ -7,7 +7,7 @@ include arch/evbppc/conf/std.mpc85xx options INCLUDE_CONFIG_FILE # embed config file in kernel binary -ident RB800-$Revision: 1.18 $ +ident RB800-$Revision: 1.19 $ maxusers 32 @@ -230,6 +230,7 @@ pseudo-device md 1 # memory disk device pseudo-device loop # network loopback pseudo-device bpfilter # packet filter pseudo-device clockctl # user control of clock subsystem +pseudo-device drvctl # user control of drive subsystem pseudo-device ksyms # /dev/ksyms pseudo-device pty # pseudo-terminals pseudo-device kttcp # kernel ttcp Index: src/sys/arch/evbppc/conf/TWRP1025 diff -u src/sys/arch/evbppc/conf/TWRP1025:1.5 src/sys/arch/evbppc/conf/TWRP1025:1.6 --- src/sys/arch/evbppc/conf/TWRP1025:1.5 Sun Jul 22 23:46:10 2012 +++
CVS commit: src/sys/arch/evbppc/conf
Module Name:src Committed By: matt Date: Mon Jul 23 16:27:44 UTC 2012 Modified Files: src/sys/arch/evbppc/conf: MPC8536DS MPC8548CDS P2020DS P2020RDB RB800 Log Message: Add DKWEDGE_AUTODISCOVERY and DKWEDGE_GPT support. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbppc/conf/MPC8536DS cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbppc/conf/MPC8548CDS cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbppc/conf/P2020DS cvs rdiff -u -r1.13 -r1.14 src/sys/arch/evbppc/conf/P2020RDB cvs rdiff -u -r1.17 -r1.18 src/sys/arch/evbppc/conf/RB800 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbppc/conf/MPC8536DS diff -u src/sys/arch/evbppc/conf/MPC8536DS:1.11 src/sys/arch/evbppc/conf/MPC8536DS:1.12 --- src/sys/arch/evbppc/conf/MPC8536DS:1.11 Sun Jul 22 23:46:10 2012 +++ src/sys/arch/evbppc/conf/MPC8536DS Mon Jul 23 16:27:44 2012 @@ -1,4 +1,4 @@ -# $NetBSD: MPC8536DS,v 1.11 2012/07/22 23:46:10 matt Exp $ +# $NetBSD: MPC8536DS,v 1.12 2012/07/23 16:27:44 matt Exp $ # # MPC8536DS -- everything that's currently supported # @@ -7,7 +7,7 @@ include arch/evbppc/conf/std.mpc85xx options INCLUDE_CONFIG_FILE # embed config file in kernel binary -ident MPC8536DS-$Revision: 1.11 $ +ident MPC8536DS-$Revision: 1.12 $ maxusers 32 @@ -62,6 +62,10 @@ options COMPAT_43 # and 4.3BSD #options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended. options COMPAT_BSDPTY # /dev/[pt]ty?? ptys. +# Wedge support +options DKWEDGE_AUTODISCOVER # Automatically add dk(4) instances +options DKWEDGE_METHOD_GPT # Supports GPT partitions as wedges + # File systems file-system FFS # UFS file-system EXT2FS # second extended file system (linux) Index: src/sys/arch/evbppc/conf/MPC8548CDS diff -u src/sys/arch/evbppc/conf/MPC8548CDS:1.10 src/sys/arch/evbppc/conf/MPC8548CDS:1.11 --- src/sys/arch/evbppc/conf/MPC8548CDS:1.10 Sun Jul 22 23:46:10 2012 +++ src/sys/arch/evbppc/conf/MPC8548CDS Mon Jul 23 16:27:44 2012 @@ -1,4 +1,4 @@ -# $NetBSD: MPC8548CDS,v 1.10 2012/07/22 23:46:10 matt Exp $ +# $NetBSD: MPC8548CDS,v 1.11 2012/07/23 16:27:44 matt Exp $ # # MPC8548CDS -- everything that's currently supported # @@ -7,7 +7,7 @@ include arch/evbppc/conf/std.mpc85xx options INCLUDE_CONFIG_FILE # embed config file in kernel binary -ident MPC8548CDS-$Revision: 1.10 $ +ident MPC8548CDS-$Revision: 1.11 $ maxusers 32 @@ -64,6 +64,10 @@ options COMPAT_43 # and 4.3BSD #options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended. options COMPAT_BSDPTY # /dev/[pt]ty?? ptys. +# Wedge support +options DKWEDGE_AUTODISCOVER # Automatically add dk(4) instances +options DKWEDGE_METHOD_GPT # Supports GPT partitions as wedges + # File systems file-system FFS # UFS file-system EXT2FS # second extended file system (linux) Index: src/sys/arch/evbppc/conf/P2020DS diff -u src/sys/arch/evbppc/conf/P2020DS:1.12 src/sys/arch/evbppc/conf/P2020DS:1.13 --- src/sys/arch/evbppc/conf/P2020DS:1.12 Sun Jul 22 23:46:10 2012 +++ src/sys/arch/evbppc/conf/P2020DS Mon Jul 23 16:27:44 2012 @@ -1,4 +1,4 @@ -# $NetBSD: P2020DS,v 1.12 2012/07/22 23:46:10 matt Exp $ +# $NetBSD: P2020DS,v 1.13 2012/07/23 16:27:44 matt Exp $ # # P2020DS -- everything that's currently supported # @@ -8,7 +8,7 @@ include arch/evbppc/conf/std.mpc85xx options INCLUDE_CONFIG_FILE # embed config file in kernel binary -ident P2020DS-$Revision: 1.12 $ +ident P2020DS-$Revision: 1.13 $ maxusers 32 @@ -68,6 +68,10 @@ options COMPAT_43 # and 4.3BSD #options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended. options COMPAT_BSDPTY # /dev/[pt]ty?? ptys. +# Wedge support +options DKWEDGE_AUTODISCOVER # Automatically add dk(4) instances +options DKWEDGE_METHOD_GPT # Supports GPT partitions as wedges + # File systems file-system FFS # UFS file-system EXT2FS # second extended file system (linux) Index: src/sys/arch/evbppc/conf/P2020RDB diff -u src/sys/arch/evbppc/conf/P2020RDB:1.13 src/sys/arch/evbppc/conf/P2020RDB:1.14 --- src/sys/arch/evbppc/conf/P2020RDB:1.13 Sun Jul 22 23:46:10 2012 +++ src/sys/arch/evbppc/conf/P2020RDB Mon Jul 23 16:27:44 2012 @@ -1,4 +1,4 @@ -# $NetBSD: P2020RDB,v 1.13 2012/07/22 23:46:10 matt Exp $ +# $NetBSD: P2020RDB,v 1.14 2012/07/23 16:27:44 matt Exp $ # # P2020RBD -- everything that's currently supported # @@ -7,7 +7,7 @@ include arch/evbppc/conf/std.mpc85xx options INCLUDE_CONFIG_FILE # embed config file in kernel binary -ident P2020RBD-$Revision: 1.13 $ +ident P2020RBD-$Revision: 1.14 $ maxusers 32 @@ -64,6 +64,10 @@ options COMPAT_43 # and 4.3BSD #options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended. options COMPAT_BSDPTY # /dev/[pt]ty?? ptys. +# Wedge support +options DKWEDGE_AUTODISCOVER # Automatically add dk(4) instances +options DKWEDGE_METHOD_GPT # Supports GPT partitions as wedges + # File systems
CVS commit: src/sys/arch/evbppc/virtex/dev
Module Name:src Committed By: matt Date: Sun Jul 22 14:02:45 UTC 2012 Modified Files: src/sys/arch/evbppc/virtex/dev: tft.c Log Message: Silence a gcc warning. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbppc/virtex/dev/tft.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbppc/virtex/dev/tft.c diff -u src/sys/arch/evbppc/virtex/dev/tft.c:1.4 src/sys/arch/evbppc/virtex/dev/tft.c:1.5 --- src/sys/arch/evbppc/virtex/dev/tft.c:1.4 Fri Jul 1 19:03:50 2011 +++ src/sys/arch/evbppc/virtex/dev/tft.c Sun Jul 22 14:02:45 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: tft.c,v 1.4 2011/07/01 19:03:50 dyoung Exp $ */ +/* $NetBSD: tft.c,v 1.5 2012/07/22 14:02:45 matt Exp $ */ /* * Copyright (c) 2006 Jachym Holecek @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: tft.c,v 1.4 2011/07/01 19:03:50 dyoung Exp $); +__KERNEL_RCSID(0, $NetBSD: tft.c,v 1.5 2012/07/22 14:02:45 matt Exp $); #include sys/param.h #include sys/systm.h @@ -92,8 +92,7 @@ tft_attach(device_t self, struct wsdispl sc-sc_ws_descr_storage[0] = tft_screen; /* struct copy */ sc-sc_ws_descr = sc-sc_ws_descr_storage; sc-sc_ws_scrlist.nscreens = 1; - sc-sc_ws_scrlist.screens = - (const struct wsscreen_descr **)sc-sc_ws_descr; + sc-sc_ws_scrlist.screens = (void *) sc-sc_ws_descr; vcons_init(sc-sc_vc_data, self, sc-sc_ws_descr, accessops);
CVS commit: src/sys/arch/evbppc/conf
Module Name:src Committed By: matt Date: Wed Jul 18 16:58:15 UTC 2012 Modified Files: src/sys/arch/evbppc/conf: INSTALL_TWRP1025.MP Log Message: Fix two typos To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbppc/conf/INSTALL_TWRP1025.MP Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbppc/conf/INSTALL_TWRP1025.MP diff -u src/sys/arch/evbppc/conf/INSTALL_TWRP1025.MP:1.1 src/sys/arch/evbppc/conf/INSTALL_TWRP1025.MP:1.2 --- src/sys/arch/evbppc/conf/INSTALL_TWRP1025.MP:1.1 Sun Jul 15 08:44:56 2012 +++ src/sys/arch/evbppc/conf/INSTALL_TWRP1025.MP Wed Jul 18 16:58:15 2012 @@ -1,8 +1,8 @@ -# $NetBSD: INSTALL_TWRP1025.MP,v 1.1 2012/07/15 08:44:56 matt Exp $ +# $NetBSD: INSTALL_TWRP1025.MP,v 1.2 2012/07/18 16:58:15 matt Exp $ -include arch/evbppc/conf/TWRP1205.MP +include arch/evbppc/conf/TWRP1025.MP -#ident INSTALL_TWRP1205.MP-$Revision: 1.1 $ +#ident INSTALL_TWRP1025.MP-$Revision: 1.2 $ include arch/evbppc/conf/INSTALL.inc
CVS commit: src/sys/arch/evbppc/conf
Module Name:src Committed By: matt Date: Wed Jul 18 16:59:41 UTC 2012 Modified Files: src/sys/arch/evbppc/conf: TWRP1025 Log Message: Add gpt/dkwedge support. Cleanup a few options sptab problems To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbppc/conf/TWRP1025 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbppc/conf/TWRP1025 diff -u src/sys/arch/evbppc/conf/TWRP1025:1.2 src/sys/arch/evbppc/conf/TWRP1025:1.3 --- src/sys/arch/evbppc/conf/TWRP1025:1.2 Tue Jul 17 01:36:12 2012 +++ src/sys/arch/evbppc/conf/TWRP1025 Wed Jul 18 16:59:41 2012 @@ -1,4 +1,4 @@ -# $NetBSD: TWRP1025,v 1.2 2012/07/17 01:36:12 matt Exp $ +# $NetBSD: TWRP1025,v 1.3 2012/07/18 16:59:41 matt Exp $ # # TWRP1025 -- everything that's currently supported # @@ -7,7 +7,7 @@ include arch/evbppc/conf/std.mpc85xx options INCLUDE_CONFIG_FILE # embed config file in kernel binary -ident TWRP1025-$Revision: 1.2 $ +ident TWRP1025-$Revision: 1.3 $ maxusers 32 @@ -32,7 +32,7 @@ options SYSVSEM # System V semaphores options SYSVSHM # System V shared memory options USERCONF # userconf(4) support -#options PIPE_SOCKETPAIR # smaller, but slower pipe(2) +#options PIPE_SOCKETPAIR # smaller, but slower pipe(2) #options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel # Diagnostic/debugging support options @@ -62,7 +62,11 @@ options COMPAT_50 # NetBSD 5.0 compatib options COMPAT_43 # and 4.3BSD #options COMPAT_386BSD_MBRPART # recognize old partition ID #options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended. -options COMPAT_BSDPTY # /dev/[pt]ty?? ptys. +options COMPAT_BSDPTY # /dev/[pt]ty?? ptys. + +# Wedge support +options DKWEDGE_AUTODISCOVER # Automatically add dk(4) instances +options DKWEDGE_METHOD_GPT # Supports GPT partitions as wedges # File systems file-system FFS # UFS @@ -165,7 +169,7 @@ e500wdog* at cpunode? # Watchdog timer ddrc* at cpunode? duart* at cpunode? com* at duart? port ? -options CONSADDR=DUART1_BASE +options CONSADDR=DUART1_BASE tsec0 at cpunode? instance 1 flags 0x003 # Enhanced 3-Speed Ethernet Controller tsec1 at cpunode? instance 3 flags 0x102 # Enhanced 3-Speed Ethernet Controller
CVS commit: src/sys/arch/evbppc/conf
Module Name:src Committed By: matt Date: Wed Jul 18 19:39:54 UTC 2012 Modified Files: src/sys/arch/evbppc/conf: TWRP1025 Log Message: This has a 64MB NOR, not 16MB. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbppc/conf/TWRP1025 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbppc/conf/TWRP1025 diff -u src/sys/arch/evbppc/conf/TWRP1025:1.3 src/sys/arch/evbppc/conf/TWRP1025:1.4 --- src/sys/arch/evbppc/conf/TWRP1025:1.3 Wed Jul 18 16:59:41 2012 +++ src/sys/arch/evbppc/conf/TWRP1025 Wed Jul 18 19:39:54 2012 @@ -1,4 +1,4 @@ -# $NetBSD: TWRP1025,v 1.3 2012/07/18 16:59:41 matt Exp $ +# $NetBSD: TWRP1025,v 1.4 2012/07/18 19:39:54 matt Exp $ # # TWRP1025 -- everything that's currently supported # @@ -7,7 +7,7 @@ include arch/evbppc/conf/std.mpc85xx options INCLUDE_CONFIG_FILE # embed config file in kernel binary -ident TWRP1025-$Revision: 1.3 $ +ident TWRP1025-$Revision: 1.4 $ maxusers 32 @@ -162,7 +162,7 @@ obio0 at cpunode? # On-chip Peripheral #options NOR_VERBOSE cfi0 at obio0 cs 0 nor* at cfi? -flash* at nor? offset 0 size 0x100 +flash* at nor? offset 0 size 0x400 e500wdog* at cpunode? # Watchdog timer
CVS commit: src/sys/arch/evbppc/mpc85xx
Module Name:src Committed By: skrll Date: Sat Jul 7 08:06:51 UTC 2012 Modified Files: src/sys/arch/evbppc/mpc85xx: machdep.c Log Message: Whitespace. To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/sys/arch/evbppc/mpc85xx/machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbppc/mpc85xx/machdep.c diff -u src/sys/arch/evbppc/mpc85xx/machdep.c:1.23 src/sys/arch/evbppc/mpc85xx/machdep.c:1.24 --- src/sys/arch/evbppc/mpc85xx/machdep.c:1.23 Thu Mar 29 15:49:08 2012 +++ src/sys/arch/evbppc/mpc85xx/machdep.c Sat Jul 7 08:06:51 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.23 2012/03/29 15:49:08 matt Exp $ */ +/* $NetBSD: machdep.c,v 1.24 2012/07/07 08:06:51 skrll Exp $ */ /*- * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc. * All rights reserved. @@ -1152,7 +1152,7 @@ initppc(vaddr_t startkernel, vaddr_t end cpu_md_ops.md_cpunode_attach = pq3gpio_attach; #endif - printf( initppc done!\n); + printf( initppc done!\n); /* * Look for the Book-E modules in the right place.
CVS commit: src/sys/arch/evbppc/obs405
Module Name:src
Committed By: kiyohara
Date: Thu Jul 5 02:56:40 UTC 2012
Modified Files:
src/sys/arch/evbppc/obs405: obs600_machdep.c
Log Message:
Change read_eeprom(). We don't use bus_space(9) here. This is MD-part and,
don't support bus_space_unmap() to a space on reserved space?
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbppc/obs405/obs600_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbppc/obs405/obs600_machdep.c
diff -u src/sys/arch/evbppc/obs405/obs600_machdep.c:1.8 src/sys/arch/evbppc/obs405/obs600_machdep.c:1.9
--- src/sys/arch/evbppc/obs405/obs600_machdep.c:1.8 Mon Dec 12 11:31:46 2011
+++ src/sys/arch/evbppc/obs405/obs600_machdep.c Thu Jul 5 02:56:40 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: obs600_machdep.c,v 1.8 2011/12/12 11:31:46 kiyohara Exp $ */
+/* $NetBSD: obs600_machdep.c,v 1.9 2012/07/05 02:56:40 kiyohara Exp $ */
/* Original: md_machdep.c,v 1.3 2005/01/24 18:47:37 shige Exp $ */
/*
@@ -68,7 +68,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: obs600_machdep.c,v 1.8 2011/12/12 11:31:46 kiyohara Exp $);
+__KERNEL_RCSID(0, $NetBSD: obs600_machdep.c,v 1.9 2012/07/05 02:56:40 kiyohara Exp $);
#include opt_compat_netbsd.h
#include opt_ddb.h
@@ -215,15 +215,15 @@ cpu_startup(void)
*/
board_info_init();
+ read_eeprom(sizeof(buf), buf);
+ macaddr = buf[0];
+ macaddr1 = buf[8];
+
/*
* Now that we have VM, malloc()s are OK in bus_space.
*/
bus_space_mallocok();
- read_eeprom(sizeof(buf), buf);
- macaddr = buf[0];
- macaddr1 = buf[8];
-
pn = prop_number_create_integer(OBS600_CPU_FREQ);
KASSERT(pn != NULL);
if (prop_dictionary_set(board_properties, processor-frequency, pn) ==
@@ -353,51 +353,59 @@ cpu_reboot(int howto, char *what)
#endif
}
-/* This function assume already initialized for I2C... */
+/*
+ * Read EEPROM via I2C. We don't use bus_space(9) here. This is MD-part and,
+ * don't support bus_space_unmap() to a space on reserved space? X-
+ *
+ * : Also this function assume already initialized for I2C...
+ */
static int
read_eeprom(int len, char *buf)
{
- bus_space_tag_t bst = opb_get_bus_space_tag();
- bus_space_handle_t bsh;
- uint8_t mdcntl, sts;
+ volatile uint8_t *iic0;
+#define IIC0_READ(r) (*(iic0 + (r)))
+#define IIC0_WRITE(r, v) (*(iic0 + (r)) = (v))
+ uint8_t sts;
int cnt, i = 0;
#define I2C_EEPROM_ADDR 0x52
- if (bus_space_map(bst, AMCC405EX_IIC0_BASE, IIC_NREG, 0, bsh))
+ if ((iic0 = ppc4xx_tlb_mapiodev(AMCC405EX_IIC0_BASE, IIC_NREG)) == NULL)
return ENOMEM; /* ??? */
/* Clear Stop Complete Bit */
- bus_space_write_1(bst, bsh, IIC_STS, IIC_STS_SCMP);
+ IIC0_WRITE(IIC_STS, IIC_STS_SCMP);
/* Check init */
do {
/* Get status */
- sts = bus_space_read_1(bst, bsh, IIC_STS);
+ sts = IIC0_READ(IIC_STS);
} while ((sts IIC_STS_PT));
- mdcntl = bus_space_read_1(bst, bsh, IIC_MDCNTL);
- bus_space_write_1(bst, bsh, IIC_MDCNTL,
- mdcntl | IIC_MDCNTL_FMDB | IIC_MDCNTL_FSDB);
+ IIC0_WRITE(IIC_MDCNTL,
+ IIC0_READ(IIC_MDCNTL) | IIC_MDCNTL_FMDB | IIC_MDCNTL_FSDB);
/* 7-bit adressing */
- bus_space_write_1(bst, bsh, IIC_HMADR, 0);
- bus_space_write_1(bst, bsh, IIC_LMADR, I2C_EEPROM_ADDR 1);
+ IIC0_WRITE(IIC_HMADR, 0);
+ IIC0_WRITE(IIC_LMADR, I2C_EEPROM_ADDR 1);
- bus_space_write_1(bst, bsh, IIC_MDBUF, 0);
- bus_space_write_1(bst, bsh, IIC_CNTL, IIC_CNTL_PT);
+ IIC0_WRITE(IIC_MDBUF, 0);
+ IIC0_WRITE(IIC_CNTL, IIC_CNTL_PT);
do {
/* Get status */
- sts = bus_space_read_1(bst, bsh, IIC_STS);
+ sts = IIC0_READ(IIC_STS);
} while ((sts IIC_STS_PT) !(sts IIC_STS_ERR));
cnt = 0;
while (cnt len) {
/* always read 4byte */
- bus_space_write_1(bst, bsh, IIC_CNTL,
- IIC_CNTL_PT | IIC_CNTL_RW | IIC_CNTL_TCT);
+ IIC0_WRITE(IIC_CNTL,
+ IIC_CNTL_PT|
+ IIC_CNTL_RW|
+ ((cnt == 0) ? IIC_CNTL_RPST : 0) |
+ IIC_CNTL_TCT);
do {
/* Get status */
- sts = bus_space_read_1(bst, bsh, IIC_STS);
+ sts = IIC0_READ(IIC_STS);
} while ((sts IIC_STS_PT) !(sts IIC_STS_ERR));
if ((sts IIC_STS_PT) || (sts IIC_STS_ERR))
@@ -406,16 +414,11 @@ read_eeprom(int len, char *buf)
delay(1);
/* read 4byte */
for (i = 0; i 4 cnt len; i++, cnt++)
-buf[cnt] =
-bus_space_read_1(bst, bsh, IIC_MDBUF);
+buf[cnt] = IIC0_READ(IIC_MDBUF);
}
}
for ( ; i 4; i++)
- (void) bus_space_read_1(bst, bsh, IIC_MDBUF);
-
-#if 0 /* Ooops, can't unmap here... */
- bus_space_unmap(bst, bsh, IIC_NREG);
-#endif
+ (void) IIC0_READ(IIC_MDBUF);
return (cnt == len) ? 0 : EINVAL;
}
