Fri Feb 27 17:33:31 2015 UTC ()
no need to override ARM_CBAR, remove unused COM_16750 option


(jmcneill)
diff -r1.1 -r1.2 src/sys/arch/evbarm/conf/std.amlogic
cvs diff -r1.1 -r1.2 src/sys/arch/evbarm/conf/Attic/std.amlogic (expand / switch to unified diff)

--- src/sys/arch/evbarm/conf/Attic/std.amlogic 2015/02/07 17:20:16 1.1
+++ src/sys/arch/evbarm/conf/Attic/std.amlogic 2015/02/27 17:33:31 1.2
@@ -1,29 +1,26 @@ @@ -1,29 +1,26 @@
1# $NetBSD: std.amlogic,v 1.1 2015/02/07 17:20:16 jmcneill Exp $ 1# $NetBSD: std.amlogic,v 1.2 2015/02/27 17:33:31 jmcneill Exp $
2# 2#
3 3
4machine evbarm arm 4machine evbarm arm
5include "arch/evbarm/conf/std.evbarm" 5include "arch/evbarm/conf/std.evbarm"
6 6
7include "arch/evbarm/conf/files.amlogic" 7include "arch/evbarm/conf/files.amlogic"
8 8
9options MODULAR 9options MODULAR
10options MODULAR_DEFAULT_AUTOLOAD 10options MODULAR_DEFAULT_AUTOLOAD
11options __HAVE_CPU_COUNTER 11options __HAVE_CPU_COUNTER
12options CORTEX_PMC 12options CORTEX_PMC
13options __HAVE_FAST_SOFTINTS # should be in types.h 13options __HAVE_FAST_SOFTINTS # should be in types.h
14options ARM_HAS_VBAR 14options ARM_HAS_VBAR
15options __HAVE_MM_MD_DIRECT_MAPPED_PHYS 15options __HAVE_MM_MD_DIRECT_MAPPED_PHYS
16options TPIDRPRW_IS_CURCPU 16options TPIDRPRW_IS_CURCPU
17options KERNEL_BASE_EXT=0x80000000 17options KERNEL_BASE_EXT=0x80000000
18options FPU_VFP 18options FPU_VFP
19options ARM_CBAR=0xc4300000 
20 19
21makeoptions KERNEL_BASE_PHYS="0x00100000" 20makeoptions KERNEL_BASE_PHYS="0x00100000"
22makeoptions KERNEL_BASE_VIRT="0x80100000" 21makeoptions KERNEL_BASE_VIRT="0x80100000"
23makeoptions BOARDTYPE="amlogic" 22makeoptions BOARDTYPE="amlogic"
24makeoptions BOARDMKFRAG="${THISARM}/conf/mk.amlogic" 23makeoptions BOARDMKFRAG="${THISARM}/conf/mk.amlogic"
25 24
26options ARM_INTR_IMPL="<arch/arm/amlogic/amlogic_intr.h>" 25options ARM_INTR_IMPL="<arch/arm/amlogic/amlogic_intr.h>"
27options ARM_GENERIC_TODR 26options ARM_GENERIC_TODR
28 
29options COM_16750