Sat Aug 30 13:45:56 2014 UTC ()
Move options __HAVE_MM_MD_DIRECT_MAPPED_PHYS from MIRABOX to ARMADAXP.
It is must required.


(kiyohara)
diff -r1.14 -r1.15 src/sys/arch/evbarm/conf/ARMADAXP
diff -r1.4 -r1.5 src/sys/arch/evbarm/conf/MIRABOX
cvs diff -r1.14 -r1.15 src/sys/arch/evbarm/conf/ARMADAXP (expand / switch to unified diff)

--- src/sys/arch/evbarm/conf/ARMADAXP 2014/08/23 20:26:57 1.14
+++ src/sys/arch/evbarm/conf/ARMADAXP 2014/08/30 13:45:56 1.15
@@ -1,39 +1,40 @@ @@ -1,39 +1,40 @@
1# 1#
2# $NetBSD: ARMADAXP,v 1.14 2014/08/23 20:26:57 dholland Exp $ 2# $NetBSD: ARMADAXP,v 1.15 2014/08/30 13:45:56 kiyohara Exp $
3# 3#
4# ARMADA XP DEV BOARD 4# ARMADA XP DEV BOARD
5# 5#
6 6
7include "arch/evbarm/conf/std.armadaxp" 7include "arch/evbarm/conf/std.armadaxp"
8 8
9# estimated number of users 9# estimated number of users
10 10
11maxusers 32 11maxusers 32
12 12
13# Standard system options 13# Standard system options
14 14
15options RTC_OFFSET=0 # hardware clock is this many mins. west of GMT 15options RTC_OFFSET=0 # hardware clock is this many mins. west of GMT
16#options NTP # NTP phase/frequency locked loop 16#options NTP # NTP phase/frequency locked loop
17 17
18# CPU options 18# CPU options
19options CPU_PJ4B 19options CPU_PJ4B
20 20
21# Architecture options 21# Architecture options
22options ARMADAXP 22options ARMADAXP
23options L2CACHE_ENABLE 23options L2CACHE_ENABLE
24#options AURORA_IO_CACHE_COHERENCY 24#options AURORA_IO_CACHE_COHERENCY
25options AURORA_L2_PT_WALK 25options AURORA_L2_PT_WALK
26 26
 27options __HAVE_MM_MD_DIRECT_MAPPED_PHYS
27#options VERBOSE_INIT_ARM 28#options VERBOSE_INIT_ARM
28#options MVSOC_CONSOLE_EARLY 29#options MVSOC_CONSOLE_EARLY
29 30
30# File systems 31# File systems
31file-system FFS # UFS 32file-system FFS # UFS
32#file-system LFS # log-structured file system 33#file-system LFS # log-structured file system
33file-system MFS # memory file system 34file-system MFS # memory file system
34file-system NFS # Network file system 35file-system NFS # Network file system
35#file-system ADOSFS # AmigaDOS-compatible file system 36#file-system ADOSFS # AmigaDOS-compatible file system
36#file-system EXT2FS # second extended file system (linux) 37#file-system EXT2FS # second extended file system (linux)
37#file-system CD9660 # ISO 9660 + Rock Ridge file system 38#file-system CD9660 # ISO 9660 + Rock Ridge file system
38file-system MSDOSFS # MS-DOS file system 39file-system MSDOSFS # MS-DOS file system
39#file-system FDESC # /dev/fd 40#file-system FDESC # /dev/fd
cvs diff -r1.4 -r1.5 src/sys/arch/evbarm/conf/MIRABOX (expand / switch to unified diff)

--- src/sys/arch/evbarm/conf/MIRABOX 2014/04/06 19:47:20 1.4
+++ src/sys/arch/evbarm/conf/MIRABOX 2014/08/30 13:45:56 1.5
@@ -1,28 +1,27 @@ @@ -1,28 +1,27 @@
1# $NetBSD: MIRABOX,v 1.4 2014/04/06 19:47:20 matt Exp $ 1# $NetBSD: MIRABOX,v 1.5 2014/08/30 13:45:56 kiyohara Exp $
2# 2#
3# This configuration supports for generically GlobalScale MiraBox 3# This configuration supports for generically GlobalScale MiraBox
4# 4#
5 5
6include "arch/evbarm/conf/ARMADAXP" 6include "arch/evbarm/conf/ARMADAXP"
7 7
8# Board Type 8# Board Type
9no makeoptions BOARDTYPE 9no makeoptions BOARDTYPE
10makeoptions BOARDTYPE="mirabox" 10makeoptions BOARDTYPE="mirabox"
11no options EVBARM_BOARDTYPE 11no options EVBARM_BOARDTYPE
12options EVBARM_BOARDTYPE=mirabox 12options EVBARM_BOARDTYPE=mirabox
13#options VERBOSE_INIT_ARM 13#options VERBOSE_INIT_ARM
14no options MEMSIZE 14no options MEMSIZE
15options MEMSIZE=0x40000000 15options MEMSIZE=0x40000000
16options __HAVE_MM_MD_DIRECT_MAPPED_PHYS 
17#options UVMHIST 16#options UVMHIST
18#options UVMHIST_PRINT,KERNHIST_DELAY=0 17#options UVMHIST_PRINT,KERNHIST_DELAY=0
19no makeoptions KERNEL_BASE_PHYS 18no makeoptions KERNEL_BASE_PHYS
20makeoptions KERNEL_BASE_PHYS="0x01000000" 19makeoptions KERNEL_BASE_PHYS="0x01000000"
21no makeoptions KERNEL_BASE_VIRT 20no makeoptions KERNEL_BASE_VIRT
22makeoptions KERNEL_BASE_VIRT="0x81000000" 21makeoptions KERNEL_BASE_VIRT="0x81000000"
23 22
24# CPU options 23# CPU options
25options FPU_VFP 24options FPU_VFP
26no makeoptions CPUFLAGS 25no makeoptions CPUFLAGS
27makeoptions CPUFLAGS="-march=armv7-a -msoft-float -mfpu=vfpv3" 26makeoptions CPUFLAGS="-march=armv7-a -msoft-float -mfpu=vfpv3"
28no options CONSFREQ 27no options CONSFREQ