Module Name: src
Committed By: matt
Date: Sat Mar 29 15:02:00 UTC 2014
Modified Files:
src/sys/arch/evbarm/conf: mk.armadaxp std.armadaxp
Log Message:
Change KERNEL_EXT_BASE to 0x80000000 and KERNEL_BASE_VIRT correspondingly.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/conf/mk.armadaxp
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/conf/std.armadaxp
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/mk.armadaxp
diff -u src/sys/arch/evbarm/conf/mk.armadaxp:1.3 src/sys/arch/evbarm/conf/mk.armadaxp:1.4
--- src/sys/arch/evbarm/conf/mk.armadaxp:1.3 Tue Mar 18 06:23:45 2014
+++ src/sys/arch/evbarm/conf/mk.armadaxp Sat Mar 29 15:02:00 2014
@@ -1,11 +1,11 @@
#
-# $NetBSD: mk.armadaxp,v 1.3 2014/03/18 06:23:45 matt Exp $
+# $NetBSD: mk.armadaxp,v 1.4 2014/03/29 15:02:00 matt Exp $
#
SYSTEM_FIRST_OBJ= armadaxp_start.o
SYSTEM_FIRST_SFILE= ${THISARM}/armadaxp/armadaxp_start.S
-KERNEL_BASE_PHYS=0x00200000
-KERNEL_BASE_VIRT=0xc0200000
+KERNEL_BASE_PHYS?=0x00200000
+KERNEL_BASE_VIRT?=0x80200000
.include "${THISARM}/conf/mk.marvell"
Index: src/sys/arch/evbarm/conf/std.armadaxp
diff -u src/sys/arch/evbarm/conf/std.armadaxp:1.2 src/sys/arch/evbarm/conf/std.armadaxp:1.3
--- src/sys/arch/evbarm/conf/std.armadaxp:1.2 Fri Jun 14 20:02:44 2013
+++ src/sys/arch/evbarm/conf/std.armadaxp Sat Mar 29 15:02:00 2014
@@ -1,4 +1,4 @@
-# $NetBSD: std.armadaxp,v 1.2 2013/06/14 20:02:44 rkujawa Exp $
+# $NetBSD: std.armadaxp,v 1.3 2014/03/29 15:02:00 matt Exp $
#
# standard NetBSD/evbarm for ARMADAXP options
@@ -19,10 +19,12 @@ options __HAVE_PCI_CONF_HOOK # should
# Build for armv7-a, soft-floats only
makeoptions CPUFLAGS="-march=armv7-a -msoft-float"
-options KERNEL_BASE_EXT=0xc0000000
+options KERNEL_BASE_EXT=0x80000000
options STARTUP_PAGETABLE_ADDR=0x00100000
options MEMSTART=0x00000000
makeoptions LOADADDRESS="0x00200000"
+makeoptions KERNEL_BASE_PHYS="0x00200000"
+makeoptions KERNEL_BASE_VIRT="0x80200000"
makeoptions BOARDTYPE="armadaxp"
makeoptions BOARDMKFRAG="${THISARM}/conf/mk.armadaxp"
