[src/trunk]: src/sys/arch/evbarm/fdt Do previous differently for now

[skrll <skrll%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/42bc13c34d9d
branches:  trunk
changeset: 1011768:42bc13c34d9d
user:      skrll <skrll%NetBSD.org@localhost>
date:      Fri Jul 10 07:31:33 2020 +0000

description:
Do previous differently for now

diffstat:

 sys/arch/arm/include/arm32/vmparam.h |  22 ++++++++++------------
 sys/arch/evbarm/fdt/platform.h       |   7 ++++++-
 2 files changed, 16 insertions(+), 13 deletions(-)

diffs (65 lines):

diff -r 1f2e5cdcef6b -r 42bc13c34d9d sys/arch/arm/include/arm32/vmparam.h
--- a/sys/arch/arm/include/arm32/vmparam.h      Fri Jul 10 06:28:49 2020 +0000
+++ b/sys/arch/arm/include/arm32/vmparam.h      Fri Jul 10 07:31:33 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vmparam.h,v 1.49 2020/07/08 09:50:45 skrll Exp $       */
+/*     $NetBSD: vmparam.h,v 1.50 2020/07/10 07:31:33 skrll Exp $       */
 
 /*
  * Copyright (c) 2001, 2002 Wasabi Systems, Inc.
@@ -94,7 +94,6 @@
 #define        VM_MIN_KERNEL_ADDRESS   ((vaddr_t) KERNEL_BASE)
 #define        VM_MAX_KERNEL_ADDRESS   ((vaddr_t) -(PAGE_SIZE+1))
 
-#ifdef ARM_MMU_EXTENDED
 /*
  * kernel virtual space layout without direct map (common case)
  *
@@ -108,17 +107,16 @@
  *   0xf000_0000 -  256MB IO
  *
  */
+
+#ifdef __HAVE_MM_MD_DIRECT_MAPPED_PHYS
+#define VM_KERNEL_VM_BASE      0xc0000000
+#else
+#define VM_KERNEL_VM_BASE      0x90000000
+#endif
+
+#define VM_KERNEL_VM_SIZE      (VM_KERNEL_IO_ADDRESS - VM_KERNEL_VM_BASE)
+
 #define VM_KERNEL_IO_ADDRESS   0xf0000000
 #define VM_KERNEL_IO_SIZE      (VM_MAX_KERNEL_ADDRESS - VM_KERNEL_IO_ADDRESS)
 
-#ifdef __HAVE_MM_MD_DIRECT_MAPPED_PHYS
-#define KERNEL_VM_BASE         0xc0000000
-#else
-#define KERNEL_VM_BASE         0x90000000
-#endif
-
-#define KERNEL_VM_SIZE         (KERNEL_IO_VBASE - KERNEL_VM_BASE)
-
-#endif
-
 #endif /* _ARM_ARM32_VMPARAM_H_ */
diff -r 1f2e5cdcef6b -r 42bc13c34d9d sys/arch/evbarm/fdt/platform.h
--- a/sys/arch/evbarm/fdt/platform.h    Fri Jul 10 06:28:49 2020 +0000
+++ b/sys/arch/evbarm/fdt/platform.h    Fri Jul 10 07:31:33 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: platform.h,v 1.6 2020/07/08 09:50:45 skrll Exp $ */
+/* $NetBSD: platform.h,v 1.7 2020/07/10 07:31:33 skrll Exp $ */
 
 /*-
  * Copyright (c) 2015-2017 Jared McNeill <jmcneill%invisible.ca@localhost>
@@ -41,6 +41,11 @@
 #define KERNEL_VM_BASE         VM_MIN_KERNEL_ADDRESS
 #define KERNEL_VM_SIZE         (VM_MAX_KERNEL_ADDRESS - VM_MIN_KERNEL_ADDRESS)
 
+#else
+
+#define KERNEL_VM_BASE         VM_KERNEL_VM_BASE
+#define KERNEL_VM_SIZE         VM_KERNEL_VM_SIZE
+
 #endif /* !__aarch64 */
 
 #endif /* _EVBARM_FDT_PLATFORM_H */