Module Name: src
Committed By: skrll
Date: Sat Sep 19 16:31:40 UTC 2020
Modified Files:
src/sys/arch/aarch64/include: vmparam.h
src/sys/arch/evbarm/fdt: platform.h
Log Message:
Define VM_KERNEL_VM_{BASE,SIZE} for aarch64 and remove an #ifdef in
fdt/platform.h
NFCI
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/aarch64/include/vmparam.h
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbarm/fdt/platform.h
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/aarch64/include/vmparam.h
diff -u src/sys/arch/aarch64/include/vmparam.h:1.13 src/sys/arch/aarch64/include/vmparam.h:1.14
--- src/sys/arch/aarch64/include/vmparam.h:1.13 Wed Sep 16 18:26:15 2020
+++ src/sys/arch/aarch64/include/vmparam.h Sat Sep 19 16:31:40 2020
@@ -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
*/
Index: src/sys/arch/evbarm/fdt/platform.h
diff -u src/sys/arch/evbarm/fdt/platform.h:1.8 src/sys/arch/evbarm/fdt/platform.h:1.9
--- src/sys/arch/evbarm/fdt/platform.h:1.8 Fri Jul 10 12:14:58 2020
+++ src/sys/arch/evbarm/fdt/platform.h Sat Sep 19 16:31:40 2020
@@ -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 <jmcne...@invisible.ca>
@@ -36,16 +36,7 @@ void fdt_add_reserved_memory_range(uint6
#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 */
