From d658fd6e128699eae57e7f73e4ac38aa0f348b31 Mon Sep 17 00:00:00 2001 From: tsutsui Date: Sat, 30 Nov 2002 19:23:44 +0000 Subject: [PATCH] Add a configuration of struct platform for NEC-J96A, NEC Express5800/240 with R4400 and EISA. XXX not functionally working yet. (hangs after mountroot via NFS) --- sys/arch/arc/arc/p_nec_j96a.c | 49 +++++++++++++++++++++++++++++++++ sys/arch/arc/arc/platconf.c | 5 +++- sys/arch/arc/conf/GENERIC | 7 +++-- sys/arch/arc/conf/files.arc | 13 ++++++--- sys/arch/arc/include/platform.h | 3 +- 5 files changed, 69 insertions(+), 8 deletions(-) create mode 100644 sys/arch/arc/arc/p_nec_j96a.c diff --git a/sys/arch/arc/arc/p_nec_j96a.c b/sys/arch/arc/arc/p_nec_j96a.c new file mode 100644 index 000000000000..671fc028f015 --- /dev/null +++ b/sys/arch/arc/arc/p_nec_j96a.c @@ -0,0 +1,49 @@ +/* $NetBSD: p_nec_j96a.c,v 1.1 2002/11/30 19:23:44 tsutsui Exp $ */ + +/*- + * Copyright (C) 2002 Izumi Tsutsui. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include + +#include +#include + +#include + +struct platform platform_nec_j96a = { + "NEC-J96A", + "NEC W&S", + " R4400 EISA", + "Express5800/240", + "NEC", + 200, /* MHz */ + c_jazz_eisa_mainbusdevs, + platform_generic_match, + c_nec_eisa_init, + c_jazz_eisa_cons_init, + jazzio_reset, + c_nec_jazz_set_intr, +}; diff --git a/sys/arch/arc/arc/platconf.c b/sys/arch/arc/arc/platconf.c index 051097b88a24..f35c846ea1e5 100644 --- a/sys/arch/arc/arc/platconf.c +++ b/sys/arch/arc/arc/platconf.c @@ -1,4 +1,4 @@ -/* $NetBSD: platconf.c,v 1.1 2001/06/13 15:08:05 soda Exp $ */ +/* $NetBSD: platconf.c,v 1.2 2002/11/30 19:23:45 tsutsui Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -73,6 +73,9 @@ struct platform *const plattab[] = { #ifdef PLATFORM_NEC_JC94 &platform_nec_jc94, #endif +#ifdef PLATFORM_NEC_J96A + &platform_nec_j96a, +#endif #ifdef PLATFORM_SNI_RM200PCI &platform_sni_rm200pci, #endif diff --git a/sys/arch/arc/conf/GENERIC b/sys/arch/arc/conf/GENERIC index b51f92847126..b1bb03624426 100644 --- a/sys/arch/arc/conf/GENERIC +++ b/sys/arch/arc/conf/GENERIC @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.76 2002/11/22 12:20:59 wiz Exp $ +# $NetBSD: GENERIC,v 1.77 2002/11/30 19:23:46 tsutsui Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/arc/conf/std.arc" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.76 $" +#ident "GENERIC-$Revision: 1.77 $" maxusers 32 # estimated number of users @@ -31,6 +31,7 @@ options PLATFORM_ACER_PICA_61 # Pica, NEC ImageRISCstation options PLATFORM_DESKTECH_ARCSTATION_I # DESKstation rPC44 options PLATFORM_DESKTECH_TYNE # DESKstation Tyne options PLATFORM_MICROSOFT_JAZZ # MIPS Magnum +options PLATFORM_NEC_J96A # NEC Express 5800/240 EISA R4K options PLATFORM_NEC_JC94 # NEC Express 5800/230 PCI R4K options PLATFORM_NEC_R94 # NEC RISCstation 2200 EISA options PLATFORM_NEC_R96 # NEC Express RISCserver, RISCserver 2200 @@ -165,6 +166,7 @@ cpu* at mainbus0 # PLATFORM_ACER_PICA_61 # PLATFORM_MICROSOFT_JAZZ +# PLATFORM_NEC_J96A # PLATFORM_NEC_JC94 # PLATFORM_NEC_R94 # PLATFORM_NEC_R96 @@ -201,6 +203,7 @@ scsibus* at osiop? # PLATFORM_ACER_PICA_61 # PLATFORM_MICROSOFT_JAZZ +# PLATFORM_NEC_J96A # PLATFORM_NEC_R94 # PLATFORM_NEC_R96 jazzisabr* at mainbus0 # Jazz-(E)ISA bus bridge. diff --git a/sys/arch/arc/conf/files.arc b/sys/arch/arc/conf/files.arc index 7a741830ade6..6250e47978e7 100644 --- a/sys/arch/arc/conf/files.arc +++ b/sys/arch/arc/conf/files.arc @@ -1,4 +1,4 @@ -# $NetBSD: files.arc,v 1.40 2002/10/26 13:50:22 jdolecek Exp $ +# $NetBSD: files.arc,v 1.41 2002/11/30 19:23:46 tsutsui Exp $ # $OpenBSD: files.arc,v 1.21 1999/09/11 10:20:20 niklas Exp $ # # maxpartitions must be first item in files.${ARCH} @@ -15,6 +15,7 @@ defflag opt_platform.h PLATFORM_ACER_PICA_61 PLATFORM_DESKTECH_ARCSTATION_I PLATFORM_DESKTECH_TYNE PLATFORM_MICROSOFT_JAZZ + PLATFORM_NEC_J96A PLATFORM_NEC_JC94 PLATFORM_NEC_R94 PLATFORM_NEC_R96 @@ -26,15 +27,18 @@ file arch/arc/arc/c_isa.c platform_desktech_arcstation_i | platform_desktech_tyne file arch/arc/arc/c_jazz_eisa.c platform_acer_pica_61 | platform_microsoft_jazz | + platform_nec_j96a | platform_nec_r94 | platform_nec_r96 file arch/arc/arc/c_magnum.c platform_acer_pica_61 | platform_microsoft_jazz -file arch/arc/arc/c_nec_eisa.c platform_nec_r94 | +file arch/arc/arc/c_nec_eisa.c platform_nec_j96a | + platform_nec_r94 | platform_nec_r96 -file arch/arc/arc/c_nec_jazz.c platform_nec_r94 | - platform_nec_r96 | +file arch/arc/arc/c_nec_jazz.c platform_nec_j96a | platform_nec_jc94 | + platform_nec_r94 | + platform_nec_r96 | platform_nec_rax94 | platform_nec_rd94 file arch/arc/arc/c_nec_pci.c platform_nec_jc94 | @@ -45,6 +49,7 @@ file arch/arc/arc/p_acer_pica_61.c platform_acer_pica_61 file arch/arc/arc/p_dti_arcstation.c platform_desktech_arcstation_i file arch/arc/arc/p_dti_tyne.c platform_desktech_tyne file arch/arc/arc/p_ms_jazz.c platform_microsoft_jazz +file arch/arc/arc/p_nec_j96a.c platform_nec_j96a file arch/arc/arc/p_nec_jc94.c platform_nec_jc94 file arch/arc/arc/p_nec_r94.c platform_nec_r94 file arch/arc/arc/p_nec_r96.c platform_nec_r96 diff --git a/sys/arch/arc/include/platform.h b/sys/arch/arc/include/platform.h index 0d81f1342177..fe0a2e3c0032 100644 --- a/sys/arch/arc/include/platform.h +++ b/sys/arch/arc/include/platform.h @@ -1,4 +1,4 @@ -/* $NetBSD: platform.h,v 1.1 2001/06/13 15:08:05 soda Exp $ */ +/* $NetBSD: platform.h,v 1.2 2002/11/30 19:23:47 tsutsui Exp $ */ /* NetBSD: cpuconf.h,v 1.12 2000/06/08 03:10:06 thorpej Exp */ /* @@ -71,6 +71,7 @@ extern struct platform platform_acer_pica_61; extern struct platform platform_desktech_arcstation_i; extern struct platform platform_desktech_tyne; extern struct platform platform_microsoft_jazz; +extern struct platform platform_nec_j96a; extern struct platform platform_nec_jc94; extern struct platform platform_nec_r94; extern struct platform platform_nec_r96;