From 199de3d71ae58928835e3c08c12a1984f24e6eae Mon Sep 17 00:00:00 2001
From: Andrew Turner <andrew@FreeBSD.org>
Date: Sun, 19 Oct 2014 21:03:42 +0000
Subject: [PATCH] Allow the armv6 kernel to be build with PHYSADDR undefined.
 The kernel will now find the virtual to physical mapping for libkvm to use at
 runtime. This makes PHYSADDR redundant, however keep it around to give
 everyone a chance to update their libkvm.

MFC after:	1 week
---
 sys/arm/arm/locore.S | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/sys/arm/arm/locore.S b/sys/arm/arm/locore.S
index d245e2a9f07d..9518a59eaff5 100644
--- a/sys/arm/arm/locore.S
+++ b/sys/arm/arm/locore.S
@@ -42,6 +42,18 @@
 
 __FBSDID("$FreeBSD$");
 
+/*
+ * Sanity check the configuration.
+ * FLASHADDR and LOADERRAMADDR depend on PHYSADDR in some cases.
+ * ARMv4 and ARMv5 make assumptions on where they are loaded.
+ *
+ * TODO: Fix the ARMv4/v5 case.
+ */
+#if (defined(FLASHADDR) || defined(LOADERRAMADDR) || !defined(_ARM_ARCH_6)) && \
+    !defined(PHYSADDR)
+#error PHYSADDR must be defined for this configuration
+#endif
+
 /* What size should this really be ? It is only used by initarm() */
 #define INIT_ARM_STACK_SIZE	(2048 * 4)
 
@@ -54,15 +66,21 @@ __FBSDID("$FreeBSD$");
 	CPWAIT_BRANCH			/* branch to next insn */
 
 /*
- * This is for kvm_mkdb, and should be the address of the beginning
+ * This is for libkvm, and should be the address of the beginning
  * of the kernel text segment (not necessarily the same as kernbase).
+ *
+ * These are being phased out. Newer copies of libkvm don't need these
+ * values as the information is added to the core file by inspecting
+ * the running kernel.
  */
 	.text
 	.align	0
+#ifdef PHYSADDR
 .globl kernbase
 .set kernbase,KERNBASE
 .globl physaddr
 .set physaddr,PHYSADDR
+#endif
 
 /*
  * On entry for FreeBSD boot ABI: