Added Vr4122 and Vr4131 support to GENERIC configuration.
This commit is contained in:
takemura
parent
6f566032d7
commit
47c249a13d
@ -1,4 +1,4 @@
|
||||
# $NetBSD: GENERIC,v 1.106 2002/02/11 07:55:49 takemura Exp $
|
||||
# $NetBSD: GENERIC,v 1.107 2002/02/11 11:44:36 takemura Exp $
|
||||
#
|
||||
# GENERIC machine description file
|
||||
#
|
||||
@ -22,13 +22,15 @@ include "arch/hpcmips/conf/std.hpcmips"
|
||||
include "arch/hpcmips/conf/std.hpcmips.vr41"
|
||||
include "arch/hpcmips/conf/std.hpcmips.tx39"
|
||||
|
||||
#ident "GENERIC-$Revision: 1.106 $"
|
||||
#ident "GENERIC-$Revision: 1.107 $"
|
||||
|
||||
maxusers 16
|
||||
|
||||
options VR4102 # NEC VR4102
|
||||
options VR4111 # NEC VR4111
|
||||
options VR4121 # NEC VR4121
|
||||
options VR4122 # NEC VR4122
|
||||
options VR4131 # NEC VR4131
|
||||
options TX392X # Toshiba TX3922
|
||||
|
||||
# Standard system options
|
||||
@ -100,10 +102,12 @@ options INET6 # IPV6
|
||||
# NetBSD backwards compatibility
|
||||
options COMPAT_43
|
||||
|
||||
options NFS_BOOT_DHCP
|
||||
#options NFS_BOOT_DHCP
|
||||
options NFS_BOOT_BOOTP
|
||||
#options NFS_BOOT_BOOTPARAM
|
||||
|
||||
# compile options
|
||||
makeoptions DEFGP="-G 18"
|
||||
makeoptions DEFGP="-G 14"
|
||||
|
||||
config netbsd root on ? type ?
|
||||
|
||||
@ -317,6 +321,24 @@ vrisab5 at vrc4172gpio0 isaportoffset 0x1000000
|
||||
isa5 at vrisab5
|
||||
pcic0 at isa5 port 0x3e0 iomem 0x70000 iosiz 0x4000 irq 0x00010003
|
||||
|
||||
#
|
||||
# SigmarionII
|
||||
#
|
||||
com* at vrgiu? platform NEC_MCR_SIGMARION2 addr 0x0b600000 port 8
|
||||
vrisab6 at vrgiu? platform NEC_MCR_SIGMARION2 isaportoffset 0xf780f800
|
||||
isa6 at vrisab6
|
||||
ne* at isa6 port 0x300 irq 0x00090003 # port 9, active high and thorough
|
||||
#wdc* at isa6 port 0x170 irq 0x00090003 flags 0x0002 # single drive
|
||||
hpcioman6 at vrgiu? platform NEC_MCR_SIGMARION2
|
||||
hpcin* at hpcioman6 evtype PCIINTR id PCIINTR_00_12_02 port 0 level 1 connect 1
|
||||
|
||||
#
|
||||
# MP-C303/304
|
||||
#
|
||||
hpcioman7 at vrgiu? platform VICTOR_INTERLINK_MPC303
|
||||
hpcioman7 at vrgiu? platform VICTOR_INTERLINK_MPC304
|
||||
hpcin* at hpcioman7 evtype PCIINTR id PCIINTR_00_19_02 port 1 level 0 hold 1 connect 1
|
||||
|
||||
#
|
||||
# Sharp Telios HC-AJ1, HC-VJ1C
|
||||
#
|
||||
@ -384,6 +406,23 @@ wsmouse* at vrpiu? mux 0
|
||||
btnmgr0 at mainbus0
|
||||
wskbd* at btnmgr0 mux 1
|
||||
|
||||
# PCI bus support
|
||||
options PCIVERBOSE
|
||||
pci* at vrpciu?
|
||||
|
||||
# VRC4173
|
||||
vrc4173bcu* at pci? dev ? function ? # VRC4173 BCU
|
||||
#vrc4173cmu* at vrc4173bcu? # VRC4173 CMU
|
||||
#vrc4173piu* at vrc4173bcu? # VRC4173 PIU
|
||||
#vrc4173kiu* at vrc4173bcu? # VRC4173 KIU
|
||||
|
||||
#vrc4173cardu* at pci? dev ? function ? # VRC4173 CARDU
|
||||
#pcmcia* at vrc4173cardu?
|
||||
|
||||
# PCI USB controllers
|
||||
ohci* at pci? dev ? function ? # Open Host Controller
|
||||
#options OHCI_DEBUG, USB_DEBUG, UHUB_DEBUG
|
||||
|
||||
# PCMCIA bus support
|
||||
pcmcia* at plumpcmcia? controller ? socket ?
|
||||
pcmcia* at pcic? controller 0 socket ?
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#
|
||||
# $NetBSD: std.hpcmips.vr41,v 1.5 2002/02/11 07:55:50 takemura Exp $
|
||||
# $NetBSD: std.hpcmips.vr41,v 1.6 2002/02/11 11:44:36 takemura Exp $
|
||||
# VR41XX common configuration.
|
||||
#
|
||||
options MIPS3 # R4000/R4400/R4600 CPUs
|
||||
@ -7,13 +7,15 @@ options MIPS3_4100 # VR4100 core
|
||||
options VR41XX # NEC VR41xx series
|
||||
options MIPS3_L2CACHE_ABSENT
|
||||
|
||||
#
|
||||
# Vr4102, 4111, 4121
|
||||
#
|
||||
vr4102ip* at mainbus0 platform GENERIC_MIPS_VR_4102
|
||||
vr4102ip* at mainbus0 platform GENERIC_MIPS_VR_4111
|
||||
vr4102ip* at mainbus0 platform GENERIC_MIPS_VR_4121
|
||||
vrbcu* at vr4102ip? addr 0x0b000000 size 0x20
|
||||
vrcmu* at vr4102ip? addr 0x0b000060 size 0x20
|
||||
vrrtc* at vr4102ip? addr 0x0b0000c0 size 0x20 unit VRRTC
|
||||
|
||||
vrkiu* at vr4102ip? addr 0x0b000180 size 0x20 unit VRKIU
|
||||
hpckbd* at vrkiu?
|
||||
com* at vr4102ip? addr 0x0c000000 size 0x20 unit VRSIU pwctl PWCTL_COM0
|
||||
@ -25,6 +27,20 @@ vrled* at vr4102ip? addr 0x0b000240 size 0x10 unit VRLED
|
||||
vrdmaau* at vr4102ip? addr 0x0b000020 size 0x18 unit VRDMAAU
|
||||
vrdcu* at vr4102ip? addr 0x0b000040 size 0x0c unit VRDCU
|
||||
|
||||
#
|
||||
# Vr4122, 4131
|
||||
#
|
||||
vr4122ip* at mainbus0 platform GENERIC_MIPS_VR_4122
|
||||
vr4122ip* at mainbus0 platform GENERIC_MIPS_VR_4131
|
||||
vrbcu* at vr4122ip? addr 0x0f000000 size 0x20
|
||||
vrcmu* at vr4122ip? addr 0x0f000060 size 0x20
|
||||
vrrtc* at vr4122ip? addr 0x0f000100 size 0x20 unit VRRTC
|
||||
com* at vr4122ip? addr 0x0f000800 size 0x20 unit VRSIU pwctl PWCTL_COM0
|
||||
vrgiu* at vr4122ip? addr 0x0f000140 size 0x20 unit VRGIU
|
||||
vrpmu* at vr4122ip? addr 0x0f0000c0 size 0x20 unit VRPMU # power switch
|
||||
vrled* at vr4122ip? addr 0x0f000180 size 0x10 unit VRLED
|
||||
vrpciu* at vr4122ip? addr 0x0f000c00 size 0x200 unit VRPCIU
|
||||
|
||||
# VR-specific debug options.
|
||||
|
||||
#options DUMP_GIU_LEVEL2_INTR # Debugging use
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: icureg.h,v 1.6 2002/02/09 14:54:05 sato Exp $ */
|
||||
/* $NetBSD: icureg.h,v 1.7 2002/02/11 11:44:36 takemura Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1999 Shin Takemura. All rights reserved.
|
||||
@ -43,10 +43,6 @@
|
||||
#include "opt_vr41xx.h"
|
||||
#include <hpcmips/vr/vrcpudef.h>
|
||||
|
||||
#if !defined SINGLE_VRIP_BASE
|
||||
#error currently missconfiguraton.
|
||||
#endif
|
||||
|
||||
#define ICU_NO_REG_W 0xffffffff /* no register */
|
||||
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: vr.c,v 1.38 2002/02/11 09:21:47 takemura Exp $ */
|
||||
/* $NetBSD: vr.c,v 1.39 2002/02/11 11:44:36 takemura Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1999-2002
|
||||
@ -258,6 +258,43 @@ static struct vr_com_platdep {
|
||||
};
|
||||
#endif /* NCOM > 0 */
|
||||
|
||||
#if NVRKIU > 0
|
||||
/*
|
||||
* machine dependent keyboard info
|
||||
*/
|
||||
static struct vr_kiu_platdep {
|
||||
platid_mask_t *platidmask;
|
||||
int addr;
|
||||
} platdep_kiu_table[] = {
|
||||
#ifdef VR4102
|
||||
{
|
||||
&platid_mask_CPU_MIPS_VR_4102,
|
||||
VR4102_KIU_ADDR, /* base address */
|
||||
},
|
||||
#endif /* VR4102 */
|
||||
#ifdef VR4111
|
||||
{
|
||||
&platid_mask_CPU_MIPS_VR_4111,
|
||||
VR4102_KIU_ADDR, /* base address */
|
||||
},
|
||||
#endif /* VR4111 */
|
||||
#ifdef VR4121
|
||||
{
|
||||
&platid_mask_CPU_MIPS_VR_4121,
|
||||
VR4102_KIU_ADDR, /* base address */
|
||||
},
|
||||
#endif /* VR4121 */
|
||||
{
|
||||
&platid_wild,
|
||||
#ifdef SINGLE_VRIP_BASE
|
||||
VRIP_KIU_ADDR, /* base address */
|
||||
#else
|
||||
VRIP_NO_ADDR, /* base address */
|
||||
#endif /* SINGLE_VRIP_BASE */
|
||||
},
|
||||
};
|
||||
#endif /* NVRKIU > 0 */
|
||||
|
||||
void
|
||||
vr_init()
|
||||
{
|
||||
@ -381,6 +418,9 @@ vr_cons_init()
|
||||
#if NCOM > 0
|
||||
static struct vr_com_platdep *com_info;
|
||||
#endif
|
||||
#if NVRKIU > 0
|
||||
static struct vr_kiu_platdep *kiu_info;
|
||||
#endif
|
||||
|
||||
#if NCOM > 0
|
||||
com_info = platid_search(&platid, platdep_com_table,
|
||||
@ -419,14 +459,19 @@ vr_cons_init()
|
||||
find_keyboard:
|
||||
#endif /* NHPCFB > 0 */
|
||||
|
||||
#if NVRKIU > 0 && VRIP_KIU_ADDR != VRIP_NO_ADDR
|
||||
if (vrkiu_cnattach(iot, VRIP_KIU_ADDR)) {
|
||||
printf("%s(%d): can't init vrkiu as console",
|
||||
__FILE__, __LINE__);
|
||||
} else {
|
||||
return;
|
||||
#if NVRKIU > 0
|
||||
kiu_info = platid_search(&platid, platdep_kiu_table,
|
||||
sizeof(platdep_kiu_table)/sizeof(*platdep_kiu_table),
|
||||
sizeof(*platdep_kiu_table));
|
||||
if (kiu_info->addr != VRIP_NO_ADDR) {
|
||||
if (vrkiu_cnattach(iot, kiu_info->addr)) {
|
||||
printf("%s(%d): can't init vrkiu as console",
|
||||
__FILE__, __LINE__);
|
||||
} else {
|
||||
return;
|
||||
}
|
||||
}
|
||||
#endif /* NVRKIU > 0 && VRIP_KIU_ADDR != VRIP_NO_ADDR */
|
||||
#endif /* NVRKIU > 0 */
|
||||
}
|
||||
|
||||
void
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: vr4122ip.c,v 1.1 2002/02/11 09:21:47 takemura Exp $ */
|
||||
/* $NetBSD: vr4122ip.c,v 1.2 2002/02/11 11:44:36 takemura Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2002 TAKEMURA Shin
|
||||
@ -73,16 +73,16 @@ static const struct vrip_unit vr4122ip_units[] = {
|
||||
VR4122_DSIUINT_REG_W,VR4122_MDSIUINT_REG_W },
|
||||
[VRIP_UNIT_PCIU]= { "pciu",
|
||||
{ VRIP_INTR_PCI, },
|
||||
CMUMASK_PCIU,
|
||||
PCIINT_REG_W, MPCIINT_REG_W },
|
||||
VR4122_CMUMSKPCIU,
|
||||
VR4122_PCIINT_REG_W,VR4122_MPCIINT_REG_W },
|
||||
[VRIP_UNIT_SCU] = { "scu",
|
||||
{ VRIP_INTR_SCU, },
|
||||
0,
|
||||
SCUINT_REG_W, MSCUINT_REG_W },
|
||||
VR4122_SCUINT_REG_W,VR4122_MSCUINT_REG_W },
|
||||
[VRIP_UNIT_CSI] = { "csi",
|
||||
{ VRIP_INTR_CSI, },
|
||||
CMUMASK_CSI,
|
||||
CSIINT_REG_W, MCSIINT_REG_W },
|
||||
VR4122_CMUMSKCSI,
|
||||
VR4122_CSIINT_REG_W,VR4122_MCSIINT_REG_W },
|
||||
[VRIP_UNIT_BCU] = { "bcu",
|
||||
{ VRIP_INTR_BCU, },
|
||||
0,
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: vripreg.h,v 1.6 2001/09/30 11:33:00 sato Exp $ */
|
||||
/* $NetBSD: vripreg.h,v 1.7 2002/02/11 11:44:36 takemura Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1999
|
||||
@ -143,12 +143,7 @@
|
||||
#include "opt_vr41xx.h"
|
||||
#include <hpcmips/vr/vrcpudef.h>
|
||||
|
||||
#if !defined SINGLE_VRIP_BASE
|
||||
|
||||
#error currently missconfiguration.
|
||||
#error NEED switch VRIP_BASE_ADDR by vr cpu type.
|
||||
|
||||
#else
|
||||
#if defined SINGLE_VRIP_BASE
|
||||
|
||||
#if defined VRGROUP_4181
|
||||
#define VRIP_BASE_ADDR 0x0a000000
|
||||
|
||||
Loading…
Reference in New Issue
Block a user