Module Name: src
Committed By: tsutsui
Date: Sat Jan 11 01:43:22 UTC 2014
Modified Files:
src/sys/arch/luna68k/luna68k: mainbus.c
Log Message:
Use the same address as LUNA to probe LANCE on LUNA-II.
It looks the device is mapped at both regions.
4.4BSD/luna68k probes it at 0xf1000000, but UniOS-Mach for LUNA-II
attaches the lance at 0xf0000000. It is probably because
the UniOS needs to map DS1220 NVRAM (mapped at 0xf1000004 and
used to store the MAC address) to the different kernel page,
but there is no reason for us to use different addresses.
(Note our bootloader already use the same address for both machines.)
This change will make (forthcoming) booted device check easier.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/luna68k/luna68k/mainbus.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/luna68k/luna68k/mainbus.c
diff -u src/sys/arch/luna68k/luna68k/mainbus.c:1.12 src/sys/arch/luna68k/luna68k/mainbus.c:1.13
--- src/sys/arch/luna68k/luna68k/mainbus.c:1.12 Mon Sep 23 17:11:22 2013
+++ src/sys/arch/luna68k/luna68k/mainbus.c Sat Jan 11 01:43:22 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.12 2013/09/23 17:11:22 tsutsui Exp $ */
+/* $NetBSD: mainbus.c,v 1.13 2014/01/11 01:43:22 tsutsui Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.12 2013/09/23 17:11:22 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.13 2014/01/11 01:43:22 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -50,7 +50,7 @@ static const struct mainbus_attach_args
static const struct mainbus_attach_args luna2_devs[] = {
{ "clock", 0x45000000, -1 }, /* Dallas TimeKeeper */
- { "le", 0xf0000000, 3 }, /* Am7990 */
+ { "le", 0xf1000000, 3 }, /* Am7990 */
{ "sio", 0x51000000, 6 }, /* uPD7201A */
{ "fb", 0xc1100000, -1 }, /* BrookTree RAMDAC */
{ "spc", 0xe1000000, 2 }, /* internal MB89352 */
