Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/evbarm Support options MVSOC_INTERREGS_PBASE for *o...
details: https://anonhg.NetBSD.org/src/rev/b6a57e1c7418
branches: trunk
changeset: 794468:b6a57e1c7418
user: kiyohara <kiyohara%NetBSD.org@localhost>
date: Sat Mar 15 13:56:19 2014 +0000
description:
Support options MVSOC_INTERREGS_PBASE for *old* Armada {XP,370} machines.
diffstat:
sys/arch/evbarm/conf/OPENBLOCKS_AX3 | 3 ++-
sys/arch/evbarm/conf/files.marvell | 5 +++--
sys/arch/evbarm/marvell/marvellreg.h | 11 +++++------
3 files changed, 10 insertions(+), 9 deletions(-)
diffs (66 lines):
diff -r 3dd326c2cb29 -r b6a57e1c7418 sys/arch/evbarm/conf/OPENBLOCKS_AX3
--- a/sys/arch/evbarm/conf/OPENBLOCKS_AX3 Sat Mar 15 13:50:01 2014 +0000
+++ b/sys/arch/evbarm/conf/OPENBLOCKS_AX3 Sat Mar 15 13:56:19 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: OPENBLOCKS_AX3,v 1.5 2013/12/23 02:37:35 kiyohara Exp $
+# $NetBSD: OPENBLOCKS_AX3,v 1.6 2014/03/15 13:56:19 kiyohara Exp $
#
# OPENBLOCKS_AX3 -- Plat'Home. OpenBlockS AX3 kernel
#
@@ -165,6 +165,7 @@
# Marvell MV88F78260 ARMADA XP System-on-chip
mvsoc0 at mainbus?
+options MVSOC_INTERREGS_PBASE=0xd0000000
options MVSOC_FIXUP_DEVID=0x7826
# On-chip Serial-ATA II Host Controller (SATAHC)
diff -r 3dd326c2cb29 -r b6a57e1c7418 sys/arch/evbarm/conf/files.marvell
--- a/sys/arch/evbarm/conf/files.marvell Sat Mar 15 13:50:01 2014 +0000
+++ b/sys/arch/evbarm/conf/files.marvell Sat Mar 15 13:56:19 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.marvell,v 1.3 2013/10/05 02:43:16 kiyohara Exp $
+# $NetBSD: files.marvell,v 1.4 2014/03/15 13:56:19 kiyohara Exp $
#
# Marvell Orion, Discovery Innovation and Kirkwood NASs configuration info
#
@@ -13,4 +13,5 @@
include "arch/arm/marvell/files.marvell"
# Some SoC(ARMADAXP) reports false DeviceID.
-defparam opt_mvsoc.h MVSOC_FIXUP_DEVID
+defparam opt_mvsoc.h MVSOC_INTERREGS_PBASE
+ MVSOC_FIXUP_DEVID
diff -r 3dd326c2cb29 -r b6a57e1c7418 sys/arch/evbarm/marvell/marvellreg.h
--- a/sys/arch/evbarm/marvell/marvellreg.h Sat Mar 15 13:50:01 2014 +0000
+++ b/sys/arch/evbarm/marvell/marvellreg.h Sat Mar 15 13:56:19 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: marvellreg.h,v 1.3 2013/09/30 12:57:53 kiyohara Exp $ */
+/* $NetBSD: marvellreg.h,v 1.4 2014/03/15 13:56:19 kiyohara Exp $ */
/*
* Copyright (c) 2007 KIYOHARA Takashi
* All rights reserved.
@@ -27,6 +27,7 @@
#ifndef _EVBARM_MARVELLREG_H_
#define _EVBARM_MARVELLREG_H_
+#include "opt_mvsoc.h"
/*
* Logical mapping for onboard/integrated peripherals
@@ -34,12 +35,10 @@
*/
#define MARVELL_PEXMEM_PBASE 0xe0000000
#define MARVELL_PEXMEM_SIZE 0x01000000
-#if !defined(ARMADAXP)
+#if defined(MVSOC_INTERREGS_PBASE)
+#define MARVELL_INTERREGS_PBASE MVSOC_INTERREGS_PBASE
+#else
#define MARVELL_INTERREGS_PBASE 0xf1000000
-#elif !defined(ORION) && !defined(KIRKWOOD) && !defined(MV78XX0)
-#define MARVELL_INTERREGS_PBASE 0xd0000000
-#else
-#define MARVELL_INTERREGS_PBASE marvell_interregs_pbase
#endif
#define MARVELL_INTERREGS_SIZE 0x00100000
#define MARVELL_PEXIO_PBASE 0xf2000000
Home |
Main Index |
Thread Index |
Old Index