Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/evbarm Only ent KERNEL_BASE_EXT when we want to cha...



details:   https://anonhg.NetBSD.org/src/rev/22e114076143
branches:  trunk
changeset: 445160:22e114076143
user:      skrll <skrll%NetBSD.org@localhost>
date:      Mon Oct 15 16:54:54 2018 +0000

description:
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

diffstat:

 sys/arch/evbarm/armadaxp/armadaxp_start.S |  12 ++++++------
 sys/arch/evbarm/conf/OPENBLOCKS_AX3       |   4 +---
 sys/arch/evbarm/conf/std.altera           |   3 +--
 sys/arch/evbarm/conf/std.amlogic          |   3 +--
 sys/arch/evbarm/conf/std.armadaxp         |   3 +--
 sys/arch/evbarm/conf/std.bcm53xx          |   3 +--
 sys/arch/evbarm/conf/std.beagle           |   3 +--
 sys/arch/evbarm/conf/std.exynos           |   3 +--
 sys/arch/evbarm/conf/std.igepv2           |   3 +--
 sys/arch/evbarm/conf/std.imx31            |   3 +--
 sys/arch/evbarm/conf/std.imx6ul           |   3 +--
 sys/arch/evbarm/conf/std.imx7             |   3 +--
 sys/arch/evbarm/conf/std.kobo             |   3 +--
 sys/arch/evbarm/conf/std.n900             |   3 +--
 sys/arch/evbarm/conf/std.netwalker        |   3 +--
 sys/arch/evbarm/conf/std.nitrogen6        |   3 +--
 sys/arch/evbarm/conf/std.overo            |   3 +--
 sys/arch/evbarm/conf/std.rpi              |   3 +--
 sys/arch/evbarm/conf/std.sunxi            |   3 +--
 sys/arch/evbarm/conf/std.tegra            |   3 +--
 sys/arch/evbarm/conf/std.ti               |   3 +--
 sys/arch/evbarm/conf/std.tisdp24xx        |   3 +--
 sys/arch/evbarm/conf/std.vexpress         |   3 +--
 sys/arch/evbarm/conf/std.virt             |   3 +--
 sys/arch/evbarm/conf/std.zynq             |   3 +--
 sys/arch/evbarm/imx31/imx31lk_start.S     |   6 +++---
 sys/arch/evbarm/marvell/marvell_start.S   |   8 ++++----
 27 files changed, 37 insertions(+), 62 deletions(-)

diffs (truncated from 496 to 300 lines):

diff -r ab72371389a6 -r 22e114076143 sys/arch/evbarm/armadaxp/armadaxp_start.S
--- a/sys/arch/evbarm/armadaxp/armadaxp_start.S Mon Oct 15 16:29:10 2018 +0000
+++ b/sys/arch/evbarm/armadaxp/armadaxp_start.S Mon Oct 15 16:54:54 2018 +0000
@@ -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 @@
 #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 @@
 
 #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(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).
         */
diff -r ab72371389a6 -r 22e114076143 sys/arch/evbarm/conf/OPENBLOCKS_AX3
--- a/sys/arch/evbarm/conf/OPENBLOCKS_AX3       Mon Oct 15 16:29:10 2018 +0000
+++ b/sys/arch/evbarm/conf/OPENBLOCKS_AX3       Mon Oct 15 16:54:54 2018 +0000
@@ -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       MULTIPROCESSOR
 options        TPIDRPRW_IS_CURCPU
 
-no options     KERNEL_BASE_EXT
-options        KERNEL_BASE_EXT=0x80000000
 makeoptions    KERNEL_BASE_VIRT="0x80008000"
 
 # Standard system options
diff -r ab72371389a6 -r 22e114076143 sys/arch/evbarm/conf/std.altera
--- a/sys/arch/evbarm/conf/std.altera   Mon Oct 15 16:29:10 2018 +0000
+++ b/sys/arch/evbarm/conf/std.altera   Mon Oct 15 16:54:54 2018 +0000
@@ -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_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"
diff -r ab72371389a6 -r 22e114076143 sys/arch/evbarm/conf/std.amlogic
--- a/sys/arch/evbarm/conf/std.amlogic  Mon Oct 15 16:29:10 2018 +0000
+++ b/sys/arch/evbarm/conf/std.amlogic  Mon Oct 15 16:54:54 2018 +0000
@@ -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 @@
 
 makeoptions    BOARDMKFRAG="${THISARM}/conf/mk.amlogic"
 makeoptions    BOARDTYPE="amlogic"
-options        KERNEL_BASE_EXT=0x80000000
 makeoptions    KERNEL_BASE_PHYS="0x00100000"
 makeoptions    KERNEL_BASE_VIRT="0x80100000"
diff -r ab72371389a6 -r 22e114076143 sys/arch/evbarm/conf/std.armadaxp
--- a/sys/arch/evbarm/conf/std.armadaxp Mon Oct 15 16:29:10 2018 +0000
+++ b/sys/arch/evbarm/conf/std.armadaxp Mon Oct 15 16:54:54 2018 +0000
@@ -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 @@
 # 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"
diff -r ab72371389a6 -r 22e114076143 sys/arch/evbarm/conf/std.bcm53xx
--- a/sys/arch/evbarm/conf/std.bcm53xx  Mon Oct 15 16:29:10 2018 +0000
+++ b/sys/arch/evbarm/conf/std.bcm53xx  Mon Oct 15 16:54:54 2018 +0000
@@ -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_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"
diff -r ab72371389a6 -r 22e114076143 sys/arch/evbarm/conf/std.beagle
--- a/sys/arch/evbarm/conf/std.beagle   Mon Oct 15 16:29:10 2018 +0000
+++ b/sys/arch/evbarm/conf/std.beagle   Mon Oct 15 16:54:54 2018 +0000
@@ -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 @@
 
 makeoptions    BOARDMKFRAG="${THISARM}/conf/mk.beagle"
 makeoptions    BOARDTYPE="beagle"
-options        KERNEL_BASE_EXT=0x80000000
 makeoptions    LOADADDRESS="0x80300000"
diff -r ab72371389a6 -r 22e114076143 sys/arch/evbarm/conf/std.exynos
--- a/sys/arch/evbarm/conf/std.exynos   Mon Oct 15 16:29:10 2018 +0000
+++ b/sys/arch/evbarm/conf/std.exynos   Mon Oct 15 16:54:54 2018 +0000
@@ -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 @@
 
 makeoptions    BOARDMKFRAG="${THISARM}/conf/mk.exynos"
 makeoptions    BOARDTYPE="exynos"
-options        KERNEL_BASE_EXT=0x80000000
 makeoptions    KERNEL_BASE_PHYS="0x40000000"
 makeoptions    KERNEL_BASE_VIRT="0x80000000"
diff -r ab72371389a6 -r 22e114076143 sys/arch/evbarm/conf/std.igepv2
--- a/sys/arch/evbarm/conf/std.igepv2   Mon Oct 15 16:29:10 2018 +0000
+++ b/sys/arch/evbarm/conf/std.igepv2   Mon Oct 15 16:54:54 2018 +0000
@@ -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        ARM_HAS_VBAR
 options        FPU_VFP
 options        TPIDRPRW_IS_CURCPU
-options        KERNEL_BASE_EXT=0x80000000
 
 makeoptions    LOADADDRESS="0x80300000"
 makeoptions    BOARDTYPE="igepv2"
diff -r ab72371389a6 -r 22e114076143 sys/arch/evbarm/conf/std.imx31
--- a/sys/arch/evbarm/conf/std.imx31    Mon Oct 15 16:29:10 2018 +0000
+++ b/sys/arch/evbarm/conf/std.imx31    Mon Oct 15 16:54:54 2018 +0000
@@ -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 @@
 # 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
diff -r ab72371389a6 -r 22e114076143 sys/arch/evbarm/conf/std.imx6ul
--- a/sys/arch/evbarm/conf/std.imx6ul   Mon Oct 15 16:29:10 2018 +0000
+++ b/sys/arch/evbarm/conf/std.imx6ul   Mon Oct 15 16:54:54 2018 +0000
@@ -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 @@
 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"
diff -r ab72371389a6 -r 22e114076143 sys/arch/evbarm/conf/std.imx7
--- a/sys/arch/evbarm/conf/std.imx7     Mon Oct 15 16:29:10 2018 +0000
+++ b/sys/arch/evbarm/conf/std.imx7     Mon Oct 15 16:54:54 2018 +0000
@@ -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        CORTEX_PMC
 options        CORTEX_PMC_CCNT_HZ=792000000
 
-options        KERNEL_BASE_EXT=0x80000000
 makeoptions    KERNEL_BASE_PHYS="0x82000000"
 makeoptions    KERNEL_BASE_VIRT="0x82000000"
 
diff -r ab72371389a6 -r 22e114076143 sys/arch/evbarm/conf/std.kobo
--- a/sys/arch/evbarm/conf/std.kobo     Mon Oct 15 16:29:10 2018 +0000
+++ b/sys/arch/evbarm/conf/std.kobo     Mon Oct 15 16:54:54 2018 +0000
@@ -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        TPIDRPRW_IS_CURCPU
 options        CORTEX_PMC
 options        CORTEX_PMC_CCNT_HZ=800000000
-options        KERNEL_BASE_EXT=0x80000000
 options        EVBARM_BOARDTYPE="kobo"
 options        FPU_VFP
 
diff -r ab72371389a6 -r 22e114076143 sys/arch/evbarm/conf/std.n900
--- a/sys/arch/evbarm/conf/std.n900     Mon Oct 15 16:29:10 2018 +0000
+++ b/sys/arch/evbarm/conf/std.n900     Mon Oct 15 16:54:54 2018 +0000
@@ -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        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"
diff -r ab72371389a6 -r 22e114076143 sys/arch/evbarm/conf/std.netwalker
--- a/sys/arch/evbarm/conf/std.netwalker        Mon Oct 15 16:29:10 2018 +0000
+++ b/sys/arch/evbarm/conf/std.netwalker        Mon Oct 15 16:54:54 2018 +0000
@@ -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        TPIDRPRW_IS_CURCPU
 options        CORTEX_PMC
 options        CORTEX_PMC_CCNT_HZ=800000000
-options        KERNEL_BASE_EXT=0x80000000
 options        EVBARM_BOARDTYPE="netwalker"
 options        FPU_VFP
 
diff -r ab72371389a6 -r 22e114076143 sys/arch/evbarm/conf/std.nitrogen6
--- a/sys/arch/evbarm/conf/std.nitrogen6        Mon Oct 15 16:29:10 2018 +0000
+++ b/sys/arch/evbarm/conf/std.nitrogen6        Mon Oct 15 16:54:54 2018 +0000
@@ -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 @@
 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"
diff -r ab72371389a6 -r 22e114076143 sys/arch/evbarm/conf/std.overo
--- a/sys/arch/evbarm/conf/std.overo    Mon Oct 15 16:29:10 2018 +0000
+++ b/sys/arch/evbarm/conf/std.overo    Mon Oct 15 16:54:54 2018 +0000
@@ -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
 



Home | Main Index | Thread Index | Old Index