Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Support options MVSOC_INTERREGS_PBASE for *old* Armada {XP,370} machines.

Browse Source
This commit is contained in:
kiyohara 2014-03-15 13:56:19 +00:00
parent 59b031efd4
commit 6597406b24
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/arch/evbarm/conf/OPENBLOCKS_AX3
View File

@ -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)

5
sys/arch/evbarm/conf/files.marvell
View File

@ -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.c
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

11
sys/arch/evbarm/marvell/marvellreg.h
View File

@ -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