Module Name: src
Committed By: skrll
Date: Mon Oct 15 16:54:55 UTC 2018
Modified Files:
src/sys/arch/evbarm/armadaxp: armadaxp_start.S
src/sys/arch/evbarm/conf: OPENBLOCKS_AX3 std.altera std.amlogic
std.armadaxp std.bcm53xx std.beagle std.exynos std.igepv2 std.imx31
std.imx6ul std.imx7 std.kobo std.n900 std.netwalker std.nitrogen6
std.overo std.rpi std.sunxi std.tegra std.ti std.tisdp24xx
std.vexpress std.virt std.zynq
src/sys/arch/evbarm/imx31: imx31lk_start.S
src/sys/arch/evbarm/marvell: marvell_start.S
Log Message:
Only ent KERNEL_BASE_EXT when we want to change KERNEL_BASE from its
default of 0x8000_0000
Don't use KERNEL_BASE_EXT where KERNEL_BASE should be instead.
Workaround a as(1) weirdness in armadaxp_start.S
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/armadaxp/armadaxp_start.S
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/evbarm/conf/OPENBLOCKS_AX3
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/conf/std.altera \
src/sys/arch/evbarm/conf/std.imx6ul src/sys/arch/evbarm/conf/std.imx7 \
src/sys/arch/evbarm/conf/std.kobo
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/conf/std.amlogic \
src/sys/arch/evbarm/conf/std.armadaxp src/sys/arch/evbarm/conf/std.n900 \
src/sys/arch/evbarm/conf/std.sunxi
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/evbarm/conf/std.bcm53xx \
src/sys/arch/evbarm/conf/std.beagle
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbarm/conf/std.exynos
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbarm/conf/std.igepv2 \
src/sys/arch/evbarm/conf/std.overo src/sys/arch/evbarm/conf/std.vexpress
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbarm/conf/std.imx31 \
src/sys/arch/evbarm/conf/std.tisdp24xx
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbarm/conf/std.netwalker
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbarm/conf/std.nitrogen6
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/evbarm/conf/std.rpi
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/evbarm/conf/std.tegra
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/conf/std.ti
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/conf/std.virt
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/conf/std.zynq
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/imx31/imx31lk_start.S
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbarm/marvell/marvell_start.S
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/armadaxp/armadaxp_start.S
diff -u src/sys/arch/evbarm/armadaxp/armadaxp_start.S:1.4 src/sys/arch/evbarm/armadaxp/armadaxp_start.S:1.5
--- src/sys/arch/evbarm/armadaxp/armadaxp_start.S:1.4 Wed Apr 15 10:15:40 2015
+++ src/sys/arch/evbarm/armadaxp/armadaxp_start.S Mon Oct 15 16:54:54 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: armadaxp_start.S,v 1.4 2015/04/15 10:15:40 hsuenaga Exp $ */
+/* $NetBSD: armadaxp_start.S,v 1.5 2018/10/15 16:54:54 skrll Exp $ */
/*******************************************************************************
Copyright (C) Marvell International Ltd. and its affiliates
@@ -44,7 +44,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI
#include <evbarm/marvell/marvellvar.h>
#include "assym.h"
-RCSID("$NetBSD: armadaxp_start.S,v 1.4 2015/04/15 10:15:40 hsuenaga Exp $")
+RCSID("$NetBSD: armadaxp_start.S,v 1.5 2018/10/15 16:54:54 skrll Exp $")
#ifdef KERNEL_BASES_EQUAL
#error KERNEL_BASE_VIRT should not equal KERNEL_BASE_PHYS
@@ -143,8 +143,8 @@ uboot_regs_pa:
#define MMU_INIT(va,pa,n_sec,attr) \
.word n_sec ; \
- .word 4*((va)>>L1_S_SHIFT) ; \
- .word (pa)|(attr) ;
+ .word 4*((va & 0xffffffff)>>L1_S_SHIFT) ; \
+ .word (pa & 0xfffff000)|(attr) ;
mmu_init_table:
/* fill all table VA==PA */
@@ -152,9 +152,9 @@ mmu_init_table:
MMU_INIT(MEMSTART, MEMSTART, 64, L1_TYPE_S|L1_S_C|L1_S_AP_KRW)
/* map VA 0x80000000..0x83ffffff to PA */
- MMU_INIT(KERNEL_BASE_EXT, MEMSTART, 64, L1_TYPE_S|L1_S_C|L1_S_AP_KRW)
+ MMU_INIT(KERNEL_BASE, MEMSTART, 64, L1_TYPE_S|L1_S_C|L1_S_AP_KRW)
- /*
+ /*
* In case of early start debugging it might be useful to map
* SoC registers (for UART access).
*/
Index: src/sys/arch/evbarm/conf/OPENBLOCKS_AX3
diff -u src/sys/arch/evbarm/conf/OPENBLOCKS_AX3:1.25 src/sys/arch/evbarm/conf/OPENBLOCKS_AX3:1.26
--- src/sys/arch/evbarm/conf/OPENBLOCKS_AX3:1.25 Wed Aug 1 20:04:11 2018
+++ src/sys/arch/evbarm/conf/OPENBLOCKS_AX3 Mon Oct 15 16:54:54 2018
@@ -1,4 +1,4 @@
-# $NetBSD: OPENBLOCKS_AX3,v 1.25 2018/08/01 20:04:11 maxv Exp $
+# $NetBSD: OPENBLOCKS_AX3,v 1.26 2018/10/15 16:54:54 skrll Exp $
#
# OPENBLOCKS_AX3 -- Plat'Home. OpenBlockS AX3 kernel
#
@@ -33,8 +33,6 @@ options __HAVE_MM_MD_DIRECT_MAPPED_PHYS
#options MULTIPROCESSOR
options TPIDRPRW_IS_CURCPU
-no options KERNEL_BASE_EXT
-options KERNEL_BASE_EXT=0x80000000
makeoptions KERNEL_BASE_VIRT="0x80008000"
# Standard system options
Index: src/sys/arch/evbarm/conf/std.altera
diff -u src/sys/arch/evbarm/conf/std.altera:1.3 src/sys/arch/evbarm/conf/std.altera:1.4
--- src/sys/arch/evbarm/conf/std.altera:1.3 Mon Oct 8 10:22:17 2018
+++ src/sys/arch/evbarm/conf/std.altera Mon Oct 15 16:54:54 2018
@@ -1,4 +1,4 @@
-# $NetBSD: std.altera,v 1.3 2018/10/08 10:22:17 skrll Exp $
+# $NetBSD: std.altera,v 1.4 2018/10/15 16:54:54 skrll Exp $
machine evbarm arm
@@ -18,7 +18,6 @@ options __HAVE_CPU_UAREA_ALLOC_IDLELWP
options __HAVE_FAST_SOFTINTS
options __HAVE_MM_MD_DIRECT_MAPPED_PHYS
-options KERNEL_BASE_EXT=0x80000000
makeoptions KERNEL_BASE_PHYS="0x10000"
makeoptions KERNEL_BASE_VIRT="0x80010000"
makeoptions BOARDTYPE="nanosoc"
Index: src/sys/arch/evbarm/conf/std.imx6ul
diff -u src/sys/arch/evbarm/conf/std.imx6ul:1.3 src/sys/arch/evbarm/conf/std.imx6ul:1.4
--- src/sys/arch/evbarm/conf/std.imx6ul:1.3 Mon Oct 8 10:22:17 2018
+++ src/sys/arch/evbarm/conf/std.imx6ul Mon Oct 15 16:54:54 2018
@@ -1,4 +1,4 @@
-# $NetBSD: std.imx6ul,v 1.3 2018/10/08 10:22:17 skrll Exp $
+# $NetBSD: std.imx6ul,v 1.4 2018/10/15 16:54:54 skrll Exp $
#
# standard NetBSD/evbarm options for i.MX6UL
@@ -25,6 +25,5 @@ options __HAVE_FAST_SOFTINTS # should
makeoptions BOARDMKFRAG="${THISARM}/conf/mk.imx6ul"
makeoptions CPPFLAGS+="-I$S/../../../include"
makeoptions CPUFLAGS="-mcpu=cortex-a7 -mfpu=neon"
-options KERNEL_BASE_EXT=0x80000000
makeoptions KERNEL_BASE_PHYS="0x80800000"
makeoptions KERNEL_BASE_VIRT="0x80800000"
Index: src/sys/arch/evbarm/conf/std.imx7
diff -u src/sys/arch/evbarm/conf/std.imx7:1.3 src/sys/arch/evbarm/conf/std.imx7:1.4
--- src/sys/arch/evbarm/conf/std.imx7:1.3 Sun Oct 7 07:48:44 2018
+++ src/sys/arch/evbarm/conf/std.imx7 Mon Oct 15 16:54:54 2018
@@ -1,4 +1,4 @@
-# $NetBSD: std.imx7,v 1.3 2018/10/07 07:48:44 skrll Exp $
+# $NetBSD: std.imx7,v 1.4 2018/10/15 16:54:54 skrll Exp $
#
# standard NetBSD/evbarm options for i.MX7 board
@@ -24,7 +24,6 @@ options FPU_VFP
options CORTEX_PMC
options CORTEX_PMC_CCNT_HZ=792000000
-options KERNEL_BASE_EXT=0x80000000
makeoptions KERNEL_BASE_PHYS="0x82000000"
makeoptions KERNEL_BASE_VIRT="0x82000000"
Index: src/sys/arch/evbarm/conf/std.kobo
diff -u src/sys/arch/evbarm/conf/std.kobo:1.3 src/sys/arch/evbarm/conf/std.kobo:1.4
--- src/sys/arch/evbarm/conf/std.kobo:1.3 Sun Oct 7 07:48:44 2018
+++ src/sys/arch/evbarm/conf/std.kobo Mon Oct 15 16:54:54 2018
@@ -1,4 +1,4 @@
-# $NetBSD: std.kobo,v 1.3 2018/10/07 07:48:44 skrll Exp $
+# $NetBSD: std.kobo,v 1.4 2018/10/15 16:54:54 skrll Exp $
#
# standard NetBSD/evbarm options for Kobo
@@ -18,7 +18,6 @@ options ARM_HAS_VBAR
options TPIDRPRW_IS_CURCPU
options CORTEX_PMC
options CORTEX_PMC_CCNT_HZ=800000000
-options KERNEL_BASE_EXT=0x80000000
options EVBARM_BOARDTYPE="kobo"
options FPU_VFP
Index: src/sys/arch/evbarm/conf/std.amlogic
diff -u src/sys/arch/evbarm/conf/std.amlogic:1.6 src/sys/arch/evbarm/conf/std.amlogic:1.7
--- src/sys/arch/evbarm/conf/std.amlogic:1.6 Mon Oct 8 10:22:17 2018
+++ src/sys/arch/evbarm/conf/std.amlogic Mon Oct 15 16:54:54 2018
@@ -1,4 +1,4 @@
-# $NetBSD: std.amlogic,v 1.6 2018/10/08 10:22:17 skrll Exp $
+# $NetBSD: std.amlogic,v 1.7 2018/10/15 16:54:54 skrll Exp $
#
machine evbarm arm
@@ -22,6 +22,5 @@ options __HAVE_MM_MD_DIRECT_MAPPED_PHYS
makeoptions BOARDMKFRAG="${THISARM}/conf/mk.amlogic"
makeoptions BOARDTYPE="amlogic"
-options KERNEL_BASE_EXT=0x80000000
makeoptions KERNEL_BASE_PHYS="0x00100000"
makeoptions KERNEL_BASE_VIRT="0x80100000"
Index: src/sys/arch/evbarm/conf/std.armadaxp
diff -u src/sys/arch/evbarm/conf/std.armadaxp:1.6 src/sys/arch/evbarm/conf/std.armadaxp:1.7
--- src/sys/arch/evbarm/conf/std.armadaxp:1.6 Mon Oct 8 10:22:17 2018
+++ src/sys/arch/evbarm/conf/std.armadaxp Mon Oct 15 16:54:54 2018
@@ -1,4 +1,4 @@
-# $NetBSD: std.armadaxp,v 1.6 2018/10/08 10:22:17 skrll Exp $
+# $NetBSD: std.armadaxp,v 1.7 2018/10/15 16:54:54 skrll Exp $
#
# standard NetBSD/evbarm for ARMADAXP options
@@ -29,7 +29,6 @@ options MEMSTART=0x00000000
# Build for armv7-a, soft-floats only
makeoptions CPUFLAGS="-march=armv7-a -msoft-float"
-options KERNEL_BASE_EXT=0x80000000
makeoptions LOADADDRESS="0x00200000"
makeoptions KERNEL_BASE_PHYS="0x00200000"
makeoptions KERNEL_BASE_VIRT="0x80200000"
Index: src/sys/arch/evbarm/conf/std.n900
diff -u src/sys/arch/evbarm/conf/std.n900:1.6 src/sys/arch/evbarm/conf/std.n900:1.7
--- src/sys/arch/evbarm/conf/std.n900:1.6 Sun Oct 7 07:48:44 2018
+++ src/sys/arch/evbarm/conf/std.n900 Mon Oct 15 16:54:54 2018
@@ -1,4 +1,4 @@
-# $NetBSD: std.n900,v 1.6 2018/10/07 07:48:44 skrll Exp $
+# $NetBSD: std.n900,v 1.7 2018/10/15 16:54:54 skrll Exp $
#
# standard NetBSD/evbarm for N900 options
@@ -15,7 +15,6 @@ options __HAVE_FAST_SOFTINTS # should
options ARM_HAS_VBAR
options __HAVE_MM_MD_DIRECT_MAPPED_PHYS
options TPIDRPRW_IS_CURCPU
-options KERNEL_BASE_EXT=0x80000000
options FPU_VFP
makeoptions LOADADDRESS="0x80300000"
Index: src/sys/arch/evbarm/conf/std.sunxi
diff -u src/sys/arch/evbarm/conf/std.sunxi:1.6 src/sys/arch/evbarm/conf/std.sunxi:1.7
--- src/sys/arch/evbarm/conf/std.sunxi:1.6 Mon Oct 8 10:22:17 2018
+++ src/sys/arch/evbarm/conf/std.sunxi Mon Oct 15 16:54:54 2018
@@ -1,4 +1,4 @@
-# $NetBSD: std.sunxi,v 1.6 2018/10/08 10:22:17 skrll Exp $
+# $NetBSD: std.sunxi,v 1.7 2018/10/15 16:54:54 skrll Exp $
#
machine evbarm arm
@@ -27,7 +27,6 @@ options __HAVE_GENERIC_CPU_INITCLOCKS
makeoptions BOARDTYPE="sunxi"
makeoptions BOARDMKFRAG="${THISARM}/conf/mk.sunxi"
makeoptions CPUFLAGS="-march=armv7-a -mfpu=neon"
-options KERNEL_BASE_EXT=0x80000000
makeoptions KERNEL_BASE_PHYS="0x40008000"
makeoptions KERNEL_BASE_VIRT="0x80008000"
Index: src/sys/arch/evbarm/conf/std.bcm53xx
diff -u src/sys/arch/evbarm/conf/std.bcm53xx:1.16 src/sys/arch/evbarm/conf/std.bcm53xx:1.17
--- src/sys/arch/evbarm/conf/std.bcm53xx:1.16 Mon Oct 8 10:22:17 2018
+++ src/sys/arch/evbarm/conf/std.bcm53xx Mon Oct 15 16:54:54 2018
@@ -1,4 +1,4 @@
-# $NetBSD: std.bcm53xx,v 1.16 2018/10/08 10:22:17 skrll Exp $
+# $NetBSD: std.bcm53xx,v 1.17 2018/10/15 16:54:54 skrll Exp $
#
# standard NetBSD/evbarm for BCM5301X options
@@ -25,7 +25,6 @@ options __HAVE_PCI_CONF_HOOK
options __HAVE_MM_MD_DIRECT_MAPPED_PHYS
options __HAVE_MM_MD_CACHE_ALIASING
-options KERNEL_BASE_EXT=0x80000000
makeoptions BOARDTYPE="bcm53xx"
makeoptions KERNEL_BASE_VIRT="0x80100000"
makeoptions LOADADDRESS="0x00100000"
Index: src/sys/arch/evbarm/conf/std.beagle
diff -u src/sys/arch/evbarm/conf/std.beagle:1.16 src/sys/arch/evbarm/conf/std.beagle:1.17
--- src/sys/arch/evbarm/conf/std.beagle:1.16 Mon Oct 8 10:22:17 2018
+++ src/sys/arch/evbarm/conf/std.beagle Mon Oct 15 16:54:54 2018
@@ -1,4 +1,4 @@
-# $NetBSD: std.beagle,v 1.16 2018/10/08 10:22:17 skrll Exp $
+# $NetBSD: std.beagle,v 1.17 2018/10/15 16:54:54 skrll Exp $
#
# standard NetBSD/evbarm for BEAGLEBOARD options
@@ -24,5 +24,4 @@ options __HAVE_MM_MD_DIRECT_MAPPED_PHYS
makeoptions BOARDMKFRAG="${THISARM}/conf/mk.beagle"
makeoptions BOARDTYPE="beagle"
-options KERNEL_BASE_EXT=0x80000000
makeoptions LOADADDRESS="0x80300000"
Index: src/sys/arch/evbarm/conf/std.exynos
diff -u src/sys/arch/evbarm/conf/std.exynos:1.8 src/sys/arch/evbarm/conf/std.exynos:1.9
--- src/sys/arch/evbarm/conf/std.exynos:1.8 Mon Oct 8 10:22:17 2018
+++ src/sys/arch/evbarm/conf/std.exynos Mon Oct 15 16:54:54 2018
@@ -1,4 +1,4 @@
-# $NetBSD: std.exynos,v 1.8 2018/10/08 10:22:17 skrll Exp $
+# $NetBSD: std.exynos,v 1.9 2018/10/15 16:54:54 skrll Exp $
#
machine evbarm arm
@@ -32,6 +32,5 @@ options __HAVE_PCI_CONF_HOOK
makeoptions BOARDMKFRAG="${THISARM}/conf/mk.exynos"
makeoptions BOARDTYPE="exynos"
-options KERNEL_BASE_EXT=0x80000000
makeoptions KERNEL_BASE_PHYS="0x40000000"
makeoptions KERNEL_BASE_VIRT="0x80000000"
Index: src/sys/arch/evbarm/conf/std.igepv2
diff -u src/sys/arch/evbarm/conf/std.igepv2:1.9 src/sys/arch/evbarm/conf/std.igepv2:1.10
--- src/sys/arch/evbarm/conf/std.igepv2:1.9 Sun Oct 7 07:48:44 2018
+++ src/sys/arch/evbarm/conf/std.igepv2 Mon Oct 15 16:54:54 2018
@@ -1,4 +1,4 @@
-# $NetBSD: std.igepv2,v 1.9 2018/10/07 07:48:44 skrll Exp $
+# $NetBSD: std.igepv2,v 1.10 2018/10/15 16:54:54 skrll Exp $
#
# standard NetBSD/evbarm for IGEPV2 options
@@ -19,7 +19,6 @@ options __HAVE_MM_MD_DIRECT_MAPPED_PHYS
options ARM_HAS_VBAR
options FPU_VFP
options TPIDRPRW_IS_CURCPU
-options KERNEL_BASE_EXT=0x80000000
makeoptions LOADADDRESS="0x80300000"
makeoptions BOARDTYPE="igepv2"
Index: src/sys/arch/evbarm/conf/std.overo
diff -u src/sys/arch/evbarm/conf/std.overo:1.9 src/sys/arch/evbarm/conf/std.overo:1.10
--- src/sys/arch/evbarm/conf/std.overo:1.9 Sun Oct 7 07:48:44 2018
+++ src/sys/arch/evbarm/conf/std.overo Mon Oct 15 16:54:54 2018
@@ -1,4 +1,4 @@
-# $NetBSD: std.overo,v 1.9 2018/10/07 07:48:44 skrll Exp $
+# $NetBSD: std.overo,v 1.10 2018/10/15 16:54:54 skrll Exp $
#
# standard NetBSD/evbarm for OVERO options
@@ -11,7 +11,6 @@ options CORTEX_PMC
options __HAVE_FAST_SOFTINTS # should be in types.h
options TPIDRPRW_IS_CURCPU
-options KERNEL_BASE_EXT=0x80000000
makeoptions LOADADDRESS="0x80200000"
makeoptions BOARDMKFRAG="${THISARM}/conf/mk.gumstix"
Index: src/sys/arch/evbarm/conf/std.vexpress
diff -u src/sys/arch/evbarm/conf/std.vexpress:1.9 src/sys/arch/evbarm/conf/std.vexpress:1.10
--- src/sys/arch/evbarm/conf/std.vexpress:1.9 Mon Oct 8 10:22:17 2018
+++ src/sys/arch/evbarm/conf/std.vexpress Mon Oct 15 16:54:54 2018
@@ -1,4 +1,4 @@
-# $NetBSD: std.vexpress,v 1.9 2018/10/08 10:22:17 skrll Exp $
+# $NetBSD: std.vexpress,v 1.10 2018/10/15 16:54:54 skrll Exp $
#
# standard NetBSD/evbarm for VEXPRESS options
@@ -26,7 +26,6 @@ options __HAVE_FAST_SOFTINTS
makeoptions BOARDMKFRAG="${THISARM}/conf/mk.vexpress"
makeoptions BOARDTYPE="vexpress"
makeoptions CPUFLAGS="-mcpu=cortex-a15 -mfpu=neon"
-options KERNEL_BASE_EXT=0x80000000
makeoptions KERNEL_BASE_PHYS="0x81000000"
makeoptions KERNEL_BASE_VIRT="0x81000000"
Index: src/sys/arch/evbarm/conf/std.imx31
diff -u src/sys/arch/evbarm/conf/std.imx31:1.10 src/sys/arch/evbarm/conf/std.imx31:1.11
--- src/sys/arch/evbarm/conf/std.imx31:1.10 Sun Oct 7 07:48:44 2018
+++ src/sys/arch/evbarm/conf/std.imx31 Mon Oct 15 16:54:54 2018
@@ -1,4 +1,4 @@
-# $NetBSD: std.imx31,v 1.10 2018/10/07 07:48:44 skrll Exp $
+# $NetBSD: std.imx31,v 1.11 2018/10/15 16:54:54 skrll Exp $
#
# standard NetBSD/evbarm options for FreeScale I.MX31
@@ -8,7 +8,6 @@ include "arch/evbarm/conf/std.evbarm"
# Pull in i.mx31 config definitions.
include "arch/evbarm/conf/files.imx31"
-options KERNEL_BASE_EXT=0x80000000
makeoptions CPUFLAGS="-march=armv6k -mtune=arm1136j-s -mfpu=vfp"
options ARM11_PMC
Index: src/sys/arch/evbarm/conf/std.tisdp24xx
diff -u src/sys/arch/evbarm/conf/std.tisdp24xx:1.10 src/sys/arch/evbarm/conf/std.tisdp24xx:1.11
--- src/sys/arch/evbarm/conf/std.tisdp24xx:1.10 Sun Oct 7 07:48:44 2018
+++ src/sys/arch/evbarm/conf/std.tisdp24xx Mon Oct 15 16:54:54 2018
@@ -1,4 +1,4 @@
-# $NetBSD: std.tisdp24xx,v 1.10 2018/10/07 07:48:44 skrll Exp $
+# $NetBSD: std.tisdp24xx,v 1.11 2018/10/15 16:54:54 skrll Exp $
#
# standard NetBSD/evbarm for SDP2430 options
@@ -13,7 +13,6 @@ options ARM11_PMC_CCNT_HZ=266000000
options __HAVE_FAST_SOFTINTS # should be in types.h
#options TPIDRPRW_IS_CURLWP
#options TPIDRPRW_IS_CURCPU
-options KERNEL_BASE_EXT=0x80000000
makeoptions LOADADDRESS="0x80300000"
#makeoptions LOADADDRESS="0xc0000000"
Index: src/sys/arch/evbarm/conf/std.netwalker
diff -u src/sys/arch/evbarm/conf/std.netwalker:1.11 src/sys/arch/evbarm/conf/std.netwalker:1.12
--- src/sys/arch/evbarm/conf/std.netwalker:1.11 Sun Oct 7 07:48:44 2018
+++ src/sys/arch/evbarm/conf/std.netwalker Mon Oct 15 16:54:54 2018
@@ -1,4 +1,4 @@
-# $NetBSD: std.netwalker,v 1.11 2018/10/07 07:48:44 skrll Exp $
+# $NetBSD: std.netwalker,v 1.12 2018/10/15 16:54:54 skrll Exp $
#
# standard NetBSD/evbarm options for Sharp NetWalker
@@ -17,7 +17,6 @@ options ARM_HAS_VBAR
options TPIDRPRW_IS_CURCPU
options CORTEX_PMC
options CORTEX_PMC_CCNT_HZ=800000000
-options KERNEL_BASE_EXT=0x80000000
options EVBARM_BOARDTYPE="netwalker"
options FPU_VFP
Index: src/sys/arch/evbarm/conf/std.nitrogen6
diff -u src/sys/arch/evbarm/conf/std.nitrogen6:1.7 src/sys/arch/evbarm/conf/std.nitrogen6:1.8
--- src/sys/arch/evbarm/conf/std.nitrogen6:1.7 Mon Oct 8 10:22:17 2018
+++ src/sys/arch/evbarm/conf/std.nitrogen6 Mon Oct 15 16:54:54 2018
@@ -1,4 +1,4 @@
-# $NetBSD: std.nitrogen6,v 1.7 2018/10/08 10:22:17 skrll Exp $
+# $NetBSD: std.nitrogen6,v 1.8 2018/10/15 16:54:54 skrll Exp $
#
# standard NetBSD/evbarm options for Nitrogen6X
@@ -26,6 +26,5 @@ options __HAVE_FAST_SOFTINTS # should
makeoptions BOARDMKFRAG="${THISARM}/conf/mk.nitrogen6"
makeoptions CPPFLAGS+="-I$S/../../../include"
makeoptions CPUFLAGS="-mcpu=cortex-a9"
-options KERNEL_BASE_EXT=0x80000000
makeoptions KERNEL_BASE_PHYS="0x10800000"
makeoptions KERNEL_BASE_VIRT="0x80800000"
Index: src/sys/arch/evbarm/conf/std.rpi
diff -u src/sys/arch/evbarm/conf/std.rpi:1.22 src/sys/arch/evbarm/conf/std.rpi:1.23
--- src/sys/arch/evbarm/conf/std.rpi:1.22 Mon Oct 8 10:22:17 2018
+++ src/sys/arch/evbarm/conf/std.rpi Mon Oct 15 16:54:54 2018
@@ -1,4 +1,4 @@
-# $NetBSD: std.rpi,v 1.22 2018/10/08 10:22:17 skrll Exp $
+# $NetBSD: std.rpi,v 1.23 2018/10/15 16:54:54 skrll Exp $
#
# standard NetBSD/evbarm for Raspberry Pi options
@@ -25,4 +25,3 @@ options __HAVE_MM_MD_DIRECT_MAPPED_PHYS
makeoptions BOARDMKFRAG="${THISARM}/conf/mk.rpi"
makeoptions LOADADDRESS="0x80008000"
-options KERNEL_BASE_EXT=0x80000000
Index: src/sys/arch/evbarm/conf/std.tegra
diff -u src/sys/arch/evbarm/conf/std.tegra:1.18 src/sys/arch/evbarm/conf/std.tegra:1.19
--- src/sys/arch/evbarm/conf/std.tegra:1.18 Mon Oct 8 10:22:17 2018
+++ src/sys/arch/evbarm/conf/std.tegra Mon Oct 15 16:54:54 2018
@@ -1,4 +1,4 @@
-# $NetBSD: std.tegra,v 1.18 2018/10/08 10:22:17 skrll Exp $
+# $NetBSD: std.tegra,v 1.19 2018/10/15 16:54:54 skrll Exp $
#
machine evbarm arm
@@ -27,7 +27,6 @@ options __HAVE_PCI_CONF_HOOK
makeoptions BOARDMKFRAG="${THISARM}/conf/mk.tegra"
makeoptions BOARDTYPE="tegra"
-options KERNEL_BASE_EXT=0x80000000
makeoptions KERNEL_BASE_PHYS="0x81000000"
makeoptions KERNEL_BASE_VIRT="0x81000000"
Index: src/sys/arch/evbarm/conf/std.ti
diff -u src/sys/arch/evbarm/conf/std.ti:1.2 src/sys/arch/evbarm/conf/std.ti:1.3
--- src/sys/arch/evbarm/conf/std.ti:1.2 Sun Oct 7 07:48:44 2018
+++ src/sys/arch/evbarm/conf/std.ti Mon Oct 15 16:54:54 2018
@@ -1,4 +1,4 @@
-# $NetBSD: std.ti,v 1.2 2018/10/07 07:48:44 skrll Exp $
+# $NetBSD: std.ti,v 1.3 2018/10/15 16:54:54 skrll Exp $
#
machine evbarm arm
@@ -15,7 +15,6 @@ options __HAVE_CPU_UAREA_ALLOC_IDLELWP
options ARM_HAS_VBAR
options __HAVE_MM_MD_DIRECT_MAPPED_PHYS
options TPIDRPRW_IS_CURCPU
-options KERNEL_BASE_EXT=0x80000000
options FPU_VFP
options __BUS_SPACE_HAS_STREAM_METHODS
options __HAVE_GENERIC_CPU_INITCLOCKS
Index: src/sys/arch/evbarm/conf/std.virt
diff -u src/sys/arch/evbarm/conf/std.virt:1.5 src/sys/arch/evbarm/conf/std.virt:1.6
--- src/sys/arch/evbarm/conf/std.virt:1.5 Mon Oct 8 10:22:17 2018
+++ src/sys/arch/evbarm/conf/std.virt Mon Oct 15 16:54:54 2018
@@ -1,4 +1,4 @@
-# $NetBSD: std.virt,v 1.5 2018/10/08 10:22:17 skrll Exp $
+# $NetBSD: std.virt,v 1.6 2018/10/15 16:54:54 skrll Exp $
#
# standard NetBSD/evbarm for VIRT options
@@ -26,7 +26,6 @@ options __HAVE_FAST_SOFTINTS
makeoptions BOARDMKFRAG="${THISARM}/conf/mk.virt"
makeoptions BOARDTYPE="virt"
makeoptions CPUFLAGS="-march=armv7-a -mfpu=neon"
-options KERNEL_BASE_EXT=0x80000000
makeoptions KERNEL_BASE_PHYS="0x41000000"
makeoptions KERNEL_BASE_VIRT="0x81000000"
Index: src/sys/arch/evbarm/conf/std.zynq
diff -u src/sys/arch/evbarm/conf/std.zynq:1.4 src/sys/arch/evbarm/conf/std.zynq:1.5
--- src/sys/arch/evbarm/conf/std.zynq:1.4 Mon Oct 8 10:22:17 2018
+++ src/sys/arch/evbarm/conf/std.zynq Mon Oct 15 16:54:54 2018
@@ -1,4 +1,4 @@
-# $NetBSD: std.zynq,v 1.4 2018/10/08 10:22:17 skrll Exp $
+# $NetBSD: std.zynq,v 1.5 2018/10/15 16:54:54 skrll Exp $
#
# standard NetBSD/evbarm for ZYNQ options
@@ -27,6 +27,5 @@ options __HAVE_MM_MD_DIRECT_MAPPED_PHYS
makeoptions BOARDMKFRAG="${THISARM}/conf/mk.zynq"
makeoptions CPPFLAGS+="-I$S/../../../include"
-options KERNEL_BASE_EXT=0x80000000
makeoptions LOADADDRESS_VIRT="0x80100000"
makeoptions LOADADDRESS="0x00100000"
Index: src/sys/arch/evbarm/imx31/imx31lk_start.S
diff -u src/sys/arch/evbarm/imx31/imx31lk_start.S:1.5 src/sys/arch/evbarm/imx31/imx31lk_start.S:1.6
--- src/sys/arch/evbarm/imx31/imx31lk_start.S:1.5 Sun Mar 30 23:12:26 2014
+++ src/sys/arch/evbarm/imx31/imx31lk_start.S Mon Oct 15 16:54:54 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: imx31lk_start.S,v 1.5 2014/03/30 23:12:26 matt Exp $ */
+/* $NetBSD: imx31lk_start.S,v 1.6 2018/10/15 16:54:54 skrll Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -32,7 +32,7 @@
#include <arm/armreg.h>
#include "assym.h"
-RCSID("$NetBSD: imx31lk_start.S,v 1.5 2014/03/30 23:12:26 matt Exp $")
+RCSID("$NetBSD: imx31lk_start.S,v 1.6 2018/10/15 16:54:54 skrll Exp $")
#ifndef SDRAM_START
#define SDRAM_START 0x80000000
@@ -60,7 +60,7 @@ _C_LABEL(imx31lk_start):
mcr p15, 0, r3, c2, c0, 2 /* set TTBCR to enable TTBR1 */
#endif
- mov r1, #(KERNEL_BASE_EXT >> L1_S_SHIFT)
+ mov r1, #(KERNEL_BASE >> L1_S_SHIFT)
add r2, r1, #0x80 /* 128 1MB entries */
ldr r3, .Lsdram_pde
1:
Index: src/sys/arch/evbarm/marvell/marvell_start.S
diff -u src/sys/arch/evbarm/marvell/marvell_start.S:1.8 src/sys/arch/evbarm/marvell/marvell_start.S:1.9
--- src/sys/arch/evbarm/marvell/marvell_start.S:1.8 Sat Aug 30 13:28:07 2014
+++ src/sys/arch/evbarm/marvell/marvell_start.S Mon Oct 15 16:54:55 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: marvell_start.S,v 1.8 2014/08/30 13:28:07 kiyohara Exp $ */
+/* $NetBSD: marvell_start.S,v 1.9 2018/10/15 16:54:55 skrll Exp $ */
/*
* Copyright (C) 2005, 2006 WIDE Project and SOUM Corporation.
* All rights reserved.
@@ -66,7 +66,7 @@
#include <evbarm/marvell/marvellreg.h>
#include "assym.h"
-RCSID("$NetBSD: marvell_start.S,v 1.8 2014/08/30 13:28:07 kiyohara Exp $")
+RCSID("$NetBSD: marvell_start.S,v 1.9 2018/10/15 16:54:55 skrll Exp $")
#ifndef SDRAM_START
#define SDRAM_START 0x00000000
@@ -256,8 +256,8 @@ mmu_init_table:
MMU_INIT(SDRAM_START, SDRAM_START,
128, L1_TYPE_S | L1_S_C | L1_S_AP_KRW)
- /* map VA KERNEL_BASE_EXT..KERNEL_BASE_EXT+7ffffff to PA 0x00000000..0x07ffffff */
- MMU_INIT(KERNEL_BASE_EXT, SDRAM_START,
+ /* map VA KERNEL_BASE..KERNEL_BASE+7ffffff to PA 0x00000000..0x07ffffff */
+ MMU_INIT(KERNEL_BASE, SDRAM_START,
128, L1_TYPE_S | L1_S_C | L1_S_AP_KRW)
.word 0 /* end of table */
