svn commit: r273288 - head/sys/arm/arm

[Andrew Turner]

Author: andrew
Date: Sun Oct 19 21:03:42 2014
New Revision: 273288
URL: https://svnweb.freebsd.org/changeset/base/273288

Log:
  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

Modified:
  head/sys/arm/arm/locore.S

Modified: head/sys/arm/arm/locore.S
==============================================================================
--- head/sys/arm/arm/locore.S	Sun Oct 19 20:56:05 2014	(r273287)
+++ head/sys/arm/arm/locore.S	Sun Oct 19 21:03:42 2014	(r273288)
@@ -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: