Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch PPC machine type tags haven't been used for a while.
details: https://anonhg.NetBSD.org/src/rev/c47e175be650
branches: trunk
changeset: 509397:c47e175be650
user: soren <soren%NetBSD.org@localhost>
date: Thu May 03 13:11:24 2001 +0000
description:
PPC machine type tags haven't been used for a while.
diffstat:
sys/arch/amigappc/include/machine_type.h | 3 -
sys/arch/bebox/include/Makefile | 4 +-
sys/arch/bebox/include/machine_type.h | 3 -
sys/arch/macppc/include/Makefile | 4 +-
sys/arch/macppc/include/machine_type.h | 3 -
sys/arch/macppc/stand/ofwboot/boot.c | 12 +----
sys/arch/ofppc/include/Makefile | 4 +-
sys/arch/ofppc/stand/ofwboot/boot.c | 12 +----
sys/arch/powerpc/include/Makefile | 4 +-
sys/arch/powerpc/include/machine_type.h | 72 -------------------------------
sys/arch/prep/include/Makefile | 4 +-
sys/arch/prep/include/machine_type.h | 3 -
sys/arch/sandpoint/include/Makefile | 4 +-
sys/arch/sandpoint/include/machine_type.h | 3 -
14 files changed, 16 insertions(+), 119 deletions(-)
diffs (299 lines):
diff -r 0fe4bb7b6f12 -r c47e175be650 sys/arch/amigappc/include/machine_type.h
--- a/sys/arch/amigappc/include/machine_type.h Thu May 03 11:17:36 2001 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/* $NetBSD: machine_type.h,v 1.1 2000/05/25 22:12:00 is Exp $ */
-
-#include <powerpc/machine_type.h>
diff -r 0fe4bb7b6f12 -r c47e175be650 sys/arch/bebox/include/Makefile
--- a/sys/arch/bebox/include/Makefile Thu May 03 11:17:36 2001 +0000
+++ b/sys/arch/bebox/include/Makefile Thu May 03 13:11:24 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2001/04/15 17:13:08 kleink Exp $
+# $NetBSD: Makefile,v 1.13 2001/05/03 13:11:26 soren Exp $
KDIR= /sys/arch/bebox/include
INCSDIR= /usr/include/bebox
@@ -14,7 +14,7 @@
intr.h ipkdb.h \
kcore.h kgdb.h \
limits.h lock.h \
- machine_type.h math.h mouse.h \
+ math.h mouse.h \
param.h pcb.h pccons.h pio.h pmap.h powerpc.h proc.h profile.h \
psl.h pte.h ptrace.h \
reg.h reloc.h \
diff -r 0fe4bb7b6f12 -r c47e175be650 sys/arch/bebox/include/machine_type.h
--- a/sys/arch/bebox/include/machine_type.h Thu May 03 11:17:36 2001 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/* $NetBSD: machine_type.h,v 1.2 1998/05/28 08:45:01 sakamoto Exp $ */
-
-#include <powerpc/machine_type.h>
diff -r 0fe4bb7b6f12 -r c47e175be650 sys/arch/macppc/include/Makefile
--- a/sys/arch/macppc/include/Makefile Thu May 03 11:17:36 2001 +0000
+++ b/sys/arch/macppc/include/Makefile Thu May 03 13:11:24 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2001/04/15 17:13:12 kleink Exp $
+# $NetBSD: Makefile,v 1.13 2001/05/03 13:11:24 soren Exp $
KDIR= /sys/arch/macppc/include
INCSDIR= /usr/include/macppc
@@ -15,7 +15,7 @@
intr.h ipkdb.h \
kcore.h keyboard.h \
limits.h lock.h \
- machine_type.h math.h \
+ math.h \
param.h pcb.h pio.h pmap.h powerpc.h proc.h profile.h psl.h \
pte.h ptrace.h \
reg.h reloc.h \
diff -r 0fe4bb7b6f12 -r c47e175be650 sys/arch/macppc/include/machine_type.h
--- a/sys/arch/macppc/include/machine_type.h Thu May 03 11:17:36 2001 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/* $NetBSD: machine_type.h,v 1.2 1998/05/29 10:32:53 tsubai Exp $ */
-
-#include <powerpc/machine_type.h>
diff -r 0fe4bb7b6f12 -r c47e175be650 sys/arch/macppc/stand/ofwboot/boot.c
--- a/sys/arch/macppc/stand/ofwboot/boot.c Thu May 03 11:17:36 2001 +0000
+++ b/sys/arch/macppc/stand/ofwboot/boot.c Thu May 03 13:11:24 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: boot.c,v 1.9 2000/09/24 12:32:36 jdolecek Exp $ */
+/* $NetBSD: boot.c,v 1.10 2001/05/03 13:11:25 soren Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -91,7 +91,6 @@
#include <lib/libkern/libkern.h>
#include <machine/cpu.h>
-#include <machine/machine_type.h>
#include "ofdev.h"
#include "openfirm.h"
@@ -159,7 +158,7 @@
void *ssym, *esym;
{
extern char end[];
- int l, machine_tag;
+ int l;
/*
* Stash pointer to end of symbol table after the argument
@@ -171,13 +170,6 @@
bcopy(&esym, args + l, sizeof(esym));
l += sizeof(esym);
- /*
- * Tell the kernel we're an OpenFirmware system.
- */
- machine_tag = POWERPC_MACHINE_OPENFIRMWARE;
- bcopy(&machine_tag, args + l, sizeof(machine_tag));
- l += sizeof(machine_tag);
-
OF_chain((void *)RELOC, end - (char *)RELOC, entry, args, l);
panic("chain");
}
diff -r 0fe4bb7b6f12 -r c47e175be650 sys/arch/ofppc/include/Makefile
--- a/sys/arch/ofppc/include/Makefile Thu May 03 11:17:36 2001 +0000
+++ b/sys/arch/ofppc/include/Makefile Thu May 03 13:11:24 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2001/04/15 17:13:14 kleink Exp $
+# $NetBSD: Makefile,v 1.12 2001/05/03 13:11:25 soren Exp $
KDIR= /sys/arch/ofppc/include
INCSDIR= /usr/include/ofppc
@@ -14,7 +14,7 @@
ipkdb.h irq.h \
kcore.h \
limits.h lock.h \
- machine_type.h math.h \
+ math.h \
param.h pcb.h pmap.h powerpc.h proc.h profile.h psl.h pte.h ptrace.h \
reg.h reloc.h \
setjmp.h signal.h stdarg.h \
diff -r 0fe4bb7b6f12 -r c47e175be650 sys/arch/ofppc/stand/ofwboot/boot.c
--- a/sys/arch/ofppc/stand/ofwboot/boot.c Thu May 03 11:17:36 2001 +0000
+++ b/sys/arch/ofppc/stand/ofwboot/boot.c Thu May 03 13:11:24 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: boot.c,v 1.8 2001/01/17 15:37:06 ws Exp $ */
+/* $NetBSD: boot.c,v 1.9 2001/05/03 13:11:25 soren Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -90,7 +90,6 @@
#include <lib/libkern/libkern.h>
#include <machine/cpu.h>
-#include <machine/machine_type.h>
#include "ofdev.h"
#include "openfirm.h"
@@ -151,7 +150,7 @@
void *esym;
{
extern char end[];
- int l, machine_tag;
+ int l;
freeall();
@@ -163,13 +162,6 @@
bcopy(&esym, args + l, sizeof(esym));
l += sizeof(esym);
- /*
- * Tell the kernel we're an OpenFirmware system.
- */
- machine_tag = POWERPC_MACHINE_OPENFIRMWARE;
- bcopy(&machine_tag, args + l, sizeof(machine_tag));
- l += sizeof(machine_tag);
-
OF_chain((void *)RELOC, end - (char *)RELOC, entry, args, l);
panic("chain");
}
diff -r 0fe4bb7b6f12 -r c47e175be650 sys/arch/powerpc/include/Makefile
--- a/sys/arch/powerpc/include/Makefile Thu May 03 11:17:36 2001 +0000
+++ b/sys/arch/powerpc/include/Makefile Thu May 03 13:11:24 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2001/04/15 17:13:16 kleink Exp $
+# $NetBSD: Makefile,v 1.18 2001/05/03 13:11:26 soren Exp $
KDIR= /sys/arch/powerpc/include
INCSDIR= /usr/include/powerpc
@@ -15,7 +15,7 @@
ipkdb.h \
kcore.h \
limits.h lock.h \
- machine_type.h math.h \
+ math.h \
param.h pcb.h pio.h pmap.h proc.h profile.h psl.h pte.h ptrace.h \
reg.h reloc.h \
setjmp.h signal.h stdarg.h \
diff -r 0fe4bb7b6f12 -r c47e175be650 sys/arch/powerpc/include/machine_type.h
--- a/sys/arch/powerpc/include/machine_type.h Thu May 03 11:17:36 2001 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,72 +0,0 @@
-/* $NetBSD: machine_type.h,v 1.2 1997/10/09 08:38:42 jtc Exp $ */
-
-/*-
- * Copyright (c) 1997 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef _POWERPC_MACHINE_TYPE_H_
-#define _POWERPC_MACHINE_TYPE_H_
-
-/*
- * The following types provide the kernel with information on what
- * sort of machine we're running on. This is passed at the end of
- * the boot arguments, which is a contiguous memory region which
- * looks like this:
- *
- * /pci/scsi@3/disk@0,0:1/netbsd -s<NUL><esym><tag>
- *
- * The post-<NUL> values are:
- *
- * <esym> end of the kernel symbol table (32-bits)
- *
- * <tag> machine type tag (32-bits)
- *
- * The pre-<NUL> portion of the boot arguments may be interpreted
- * differently depending on the machine tag.
- *
- * If the tag indicates that the system has OpenFirmware, then
- * OpenFirmware will be used to get additional system information.
- *
- * If the tag indicates that the system has Motorola BUG, then
- * BUG will be used to get additional system information.
- */
-
-#define POWERPC_MACHINE_OPENFIRMWARE 0 /* system has OpenFirmware */
-#define POWERPC_MACHINE_MOTOROLABUG 1 /* system has Motorola BUG */
-#define POWERPC_MACHINE_BEBOX 2 /* system is a BeBox */
-#define POWERPC_MACHINE_NUBUSPOWERMAC 3 /* system is a Nubus PowerMac */
-#define POWERPC_MACHINE_NTYPES 4 /* add them to the end, please */
-
-#endif /* _POWERPC_MACHINE_TYPE_H_ */
diff -r 0fe4bb7b6f12 -r c47e175be650 sys/arch/prep/include/Makefile
--- a/sys/arch/prep/include/Makefile Thu May 03 11:17:36 2001 +0000
+++ b/sys/arch/prep/include/Makefile Thu May 03 13:11:24 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/04/15 17:13:16 kleink Exp $
+# $NetBSD: Makefile,v 1.9 2001/05/03 13:11:25 soren Exp $
KDIR= /sys/arch/prep/include
INCSDIR= /usr/include/prep
@@ -14,7 +14,7 @@
intr.h ipkdb.h \
kcore.h kgdb.h \
limits.h lock.h \
- machine_type.h math.h mouse.h \
+ math.h mouse.h \
param.h pcb.h pccons.h pio.h pmap.h powerpc.h proc.h profile.h \
psl.h pte.h ptrace.h \
reg.h reloc.h \
diff -r 0fe4bb7b6f12 -r c47e175be650 sys/arch/prep/include/machine_type.h
--- a/sys/arch/prep/include/machine_type.h Thu May 03 11:17:36 2001 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/* $NetBSD: machine_type.h,v 1.1 2000/02/29 15:21:30 nonaka Exp $ */
-
-#include <powerpc/machine_type.h>
diff -r 0fe4bb7b6f12 -r c47e175be650 sys/arch/sandpoint/include/Makefile
--- a/sys/arch/sandpoint/include/Makefile Thu May 03 11:17:36 2001 +0000
+++ b/sys/arch/sandpoint/include/Makefile Thu May 03 13:11:24 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/04/16 13:45:31 briggs Exp $
+# $NetBSD: Makefile,v 1.8 2001/05/03 13:11:26 soren Exp $
KDIR= /sys/arch/sandpoint/include
INCSDIR= /usr/include/sandpoint
@@ -14,7 +14,7 @@
intr.h ipkdb.h \
kcore.h kgdb.h \
limits.h lock.h \
- machine_type.h math.h \
+ math.h \
param.h pcb.h pio.h pmap.h powerpc.h proc.h profile.h psl.h pte.h \
ptrace.h \
reg.h reloc.h \
diff -r 0fe4bb7b6f12 -r c47e175be650 sys/arch/sandpoint/include/machine_type.h
--- a/sys/arch/sandpoint/include/machine_type.h Thu May 03 11:17:36 2001 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/* $NetBSD: machine_type.h,v 1.1 2001/02/04 18:32:14 briggs Exp $ */
-
-#include <powerpc/machine_type.h>
Home |
Main Index |
Thread Index |
Old Index