Module Name: src
Committed By: kiyohara
Date: Sat Mar 15 13:56:19 UTC 2014
Modified Files:
src/sys/arch/evbarm/conf: OPENBLOCKS_AX3 files.marvell
src/sys/arch/evbarm/marvell: marvellreg.h
Log Message:
Support options MVSOC_INTERREGS_PBASE for *old* Armada {XP,370} machines.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/conf/OPENBLOCKS_AX3
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/conf/files.marvell
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/marvell/marvellreg.h
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/evbarm/conf/OPENBLOCKS_AX3
diff -u src/sys/arch/evbarm/conf/OPENBLOCKS_AX3:1.5 src/sys/arch/evbarm/conf/OPENBLOCKS_AX3:1.6
--- src/sys/arch/evbarm/conf/OPENBLOCKS_AX3:1.5 Mon Dec 23 02:37:35 2013
+++ src/sys/arch/evbarm/conf/OPENBLOCKS_AX3 Sat Mar 15 13:56:19 2014
@@ -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 @@ cpu0 at mainbus?
# 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)
Index: src/sys/arch/evbarm/conf/files.marvell
diff -u src/sys/arch/evbarm/conf/files.marvell:1.3 src/sys/arch/evbarm/conf/files.marvell:1.4
--- src/sys/arch/evbarm/conf/files.marvell:1.3 Sat Oct 5 02:43:16 2013
+++ src/sys/arch/evbarm/conf/files.marvell Sat Mar 15 13:56:19 2014
@@ -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 @@ file arch/evbarm/marvell/marvell_machdep
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
Index: src/sys/arch/evbarm/marvell/marvellreg.h
diff -u src/sys/arch/evbarm/marvell/marvellreg.h:1.3 src/sys/arch/evbarm/marvell/marvellreg.h:1.4
--- src/sys/arch/evbarm/marvell/marvellreg.h:1.3 Mon Sep 30 12:57:53 2013
+++ src/sys/arch/evbarm/marvell/marvellreg.h Sat Mar 15 13:56:19 2014
@@ -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)
-#define MARVELL_INTERREGS_PBASE 0xf1000000
-#elif !defined(ORION) && !defined(KIRKWOOD) && !defined(MV78XX0)
-#define MARVELL_INTERREGS_PBASE 0xd0000000
+#if defined(MVSOC_INTERREGS_PBASE)
+#define MARVELL_INTERREGS_PBASE MVSOC_INTERREGS_PBASE
#else
-#define MARVELL_INTERREGS_PBASE marvell_interregs_pbase
+#define MARVELL_INTERREGS_PBASE 0xf1000000
#endif
#define MARVELL_INTERREGS_SIZE 0x00100000
#define MARVELL_PEXIO_PBASE 0xf2000000
