Fri Feb 21 22:31:58 2014 UTC ()
Rearrange KERNEL_BASE_PHYS
(matt)
diff -r1.16 -r1.17 src/sys/arch/evbarm/conf/BCM5301X
diff -r1.1 -r1.2 src/sys/arch/evbarm/conf/BCM56340
diff -r1.13 -r1.14 src/sys/arch/evbarm/conf/std.bcm53xx
--- src/sys/arch/evbarm/conf/BCM5301X 2013/10/28 22:35:07 1.16
+++ src/sys/arch/evbarm/conf/BCM5301X 2014/02/21 22:31:58 1.17
@@ -1,5 +1,5 @@
#
-# $NetBSD: BCM5301X,v 1.16 2013/10/28 22:35:07 matt Exp $
+# $NetBSD: BCM5301X,v 1.17 2014/02/21 22:31:58 matt Exp $
#
# BCM5301X -- Broadcom BCM5301X Eval Board Kernel
#
@@ -28,6 +28,7 @@
options BCM5301X
options PMAPCOUNTERS
options BUSDMA_COUNTERS
+makeoptions KERNEL_BASE_PHYS="0x80100000"
# Architecture options
--- src/sys/arch/evbarm/conf/BCM56340 2013/10/28 22:35:07 1.1
+++ src/sys/arch/evbarm/conf/BCM56340 2014/02/21 22:31:58 1.2
@@ -1,5 +1,5 @@
#
-# $NetBSD: BCM56340,v 1.1 2013/10/28 22:35:07 matt Exp $
+# $NetBSD: BCM56340,v 1.2 2014/02/21 22:31:58 matt Exp $
#
# BCM5301X -- Broadcom BCM5301X Eval Board Kernel
#
@@ -28,6 +28,7 @@
options BCM563XX
options PMAPCOUNTERS
options BUSDMA_COUNTERS
+makeoptions KERNEL_BASE_PHYS="0x60100000"
# Architecture options
@@ -151,7 +152,7 @@
options DB_MAX_LINE=INT_MAX
#options KGDB
makeoptions DEBUG="-g" # compile full symbol table
-options SYMTAB_SPACE=575000
+options SYMTAB_SPACE=590000
## USB Debugging options
options USB_DEBUG
--- src/sys/arch/evbarm/conf/std.bcm53xx 2013/11/01 18:41:06 1.13
+++ src/sys/arch/evbarm/conf/std.bcm53xx 2014/02/21 22:31:58 1.14
@@ -1,4 +1,4 @@
-# $NetBSD: std.bcm53xx,v 1.13 2013/11/01 18:41:06 skrll Exp $
+# $NetBSD: std.bcm53xx,v 1.14 2014/02/21 22:31:58 matt Exp $
#
# standard NetBSD/evbarm for BCM5301X options
@@ -19,14 +19,12 @@
options __HAVE_FAST_SOFTINTS # should be in types.h
options __HAVE_CPU_UAREA_ALLOC_IDLELWP
options __HAVE_CPU_COUNTER
-options __HAVE_ATOMIC64_OPS
options __HAVE_PCI_CONF_HOOK
options TPIDRPRW_IS_CURCPU
options KERNEL_BASE_EXT=0x80000000
options EVBARM_BOARDTYPE="bcm53xx"
makeoptions BOARDTYPE="bcm53xx"
-makeoptions KERNEL_BASE_PHYS="0x60100000"
makeoptions KERNEL_BASE_VIRT="0x80100000"
makeoptions LOADADDRESS="0x00100000"
makeoptions BOARDMKFRAG="${THISARM}/conf/mk.bcm53xx"