[src/trunk]: src/sys/arch Define VM_KERNEL_VM_{BASE,SIZE} for aarch64 and rem...

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

details:   https://anonhg.NetBSD.org/src/rev/4dc2ca3c41aa
branches:  trunk
changeset: 955108:4dc2ca3c41aa
user:      skrll <skrll%NetBSD.org@localhost>
date:      Sat Sep 19 16:31:40 2020 +0000

description:
Define VM_KERNEL_VM_{BASE,SIZE} for aarch64 and remove an #ifdef in
fdt/platform.h

NFCI

diffstat:

 sys/arch/aarch64/include/vmparam.h |   5 ++++-
 sys/arch/evbarm/fdt/platform.h     |  11 +----------
 2 files changed, 5 insertions(+), 11 deletions(-)

diffs (45 lines):

diff -r 47f30d2ecc22 -r 4dc2ca3c41aa sys/arch/aarch64/include/vmparam.h
--- a/sys/arch/aarch64/include/vmparam.h        Sat Sep 19 13:33:08 2020 +0000
+++ b/sys/arch/aarch64/include/vmparam.h        Sat Sep 19 16:31:40 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.13 2020/09/16 18:26:15 skrll Exp $ */
+/* $NetBSD: vmparam.h,v 1.14 2020/09/19 16:31:40 skrll Exp $ */
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -150,6 +150,9 @@
 #define VM_KERNEL_IO_ADDRESS   0xfffffffff0000000L
 #define VM_KERNEL_IO_SIZE      (VM_MAX_KERNEL_ADDRESS - VM_KERNEL_IO_ADDRESS)
 
+#define VM_KERNEL_VM_BASE      VM_MIN_KERNEL_ADDRESS
+#define VM_KERNEL_VM_SIZE      (VM_MAX_KERNEL_ADDRESS - VM_KERNEL_VM_BASE)
+
 /*
  * Reserved space for EFI runtime services
  */
diff -r 47f30d2ecc22 -r 4dc2ca3c41aa sys/arch/evbarm/fdt/platform.h
--- a/sys/arch/evbarm/fdt/platform.h    Sat Sep 19 13:33:08 2020 +0000
+++ b/sys/arch/evbarm/fdt/platform.h    Sat Sep 19 16:31:40 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: platform.h,v 1.8 2020/07/10 12:14:58 skrll Exp $ */
+/* $NetBSD: platform.h,v 1.9 2020/09/19 16:31:40 skrll Exp $ */
 
 /*-
  * Copyright (c) 2015-2017 Jared McNeill <jmcneill%invisible.ca@localhost>
@@ -36,16 +36,7 @@
 #define KERNEL_IO_VBASE                VM_KERNEL_IO_ADDRESS
 #define KERNEL_IO_VSIZE                VM_KERNEL_IO_SIZE
 
-#ifdef __aarch64__
-
-#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 */