Module Name: src
Committed By: skrll
Date: Fri Jul 10 07:31:33 UTC 2020
Modified Files:
src/sys/arch/arm/include/arm32: vmparam.h
src/sys/arch/evbarm/fdt: platform.h
Log Message:
Do previous differently for now
To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/sys/arch/arm/include/arm32/vmparam.h
cvs rdiff -u -r1.6 -r1.7 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/arm/include/arm32/vmparam.h
diff -u src/sys/arch/arm/include/arm32/vmparam.h:1.49 src/sys/arch/arm/include/arm32/vmparam.h:1.50
--- src/sys/arch/arm/include/arm32/vmparam.h:1.49 Wed Jul 8 09:50:45 2020
+++ src/sys/arch/arm/include/arm32/vmparam.h Fri Jul 10 07:31:33 2020
@@ -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
*
*/
-#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
+#define VM_KERNEL_VM_BASE 0xc0000000
#else
-#define KERNEL_VM_BASE 0x90000000
+#define VM_KERNEL_VM_BASE 0x90000000
#endif
-#define KERNEL_VM_SIZE (KERNEL_IO_VBASE - KERNEL_VM_BASE)
+#define VM_KERNEL_VM_SIZE (VM_KERNEL_IO_ADDRESS - VM_KERNEL_VM_BASE)
-#endif
+#define VM_KERNEL_IO_ADDRESS 0xf0000000
+#define VM_KERNEL_IO_SIZE (VM_MAX_KERNEL_ADDRESS - VM_KERNEL_IO_ADDRESS)
#endif /* _ARM_ARM32_VMPARAM_H_ */
Index: src/sys/arch/evbarm/fdt/platform.h
diff -u src/sys/arch/evbarm/fdt/platform.h:1.6 src/sys/arch/evbarm/fdt/platform.h:1.7
--- src/sys/arch/evbarm/fdt/platform.h:1.6 Wed Jul 8 09:50:45 2020
+++ src/sys/arch/evbarm/fdt/platform.h Fri Jul 10 07:31:33 2020
@@ -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 <[email protected]>
@@ -41,6 +41,11 @@ void fdt_add_reserved_memory_range(uint6
#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 */
