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

[Ian Lepore]

Author: ian
Date: Fri Feb  7 14:38:51 2014
New Revision: 261596
URL: http://svnweb.freebsd.org/changeset/base/261596

Log:
  Remove references to PHYSADDR where it's used only in debugging output,
  and where the code that references it can safely be elided if it's not
  defined (meaning the code is used for legacy arm platforms that still
  define the compile-time PHYSADDR but not on newer systems that calculate
  the value at runtime).

Modified:
  head/sys/arm/arm/elf_trampoline.c
  head/sys/arm/arm/pmap-v6.c
  head/sys/arm/arm/pmap.c
  head/sys/arm/arm/support.S

Modified: head/sys/arm/arm/elf_trampoline.c
==============================================================================
--- head/sys/arm/arm/elf_trampoline.c	Fri Feb  7 14:34:31 2014	(r261595)
+++ head/sys/arm/arm/elf_trampoline.c	Fri Feb  7 14:38:51 2014	(r261596)
@@ -189,7 +189,7 @@ _startC(void)
 	int physaddr = KERNPHYSADDR;
 	int tmp1;
 	unsigned int sp = ((unsigned int)&_end & ~3) + 4;
-#if defined(FLASHADDR) && defined(LOADERRAMADDR)
+#if defined(FLASHADDR) && defined(PHYSADDR) && defined(LOADERRAMADDR)
 	unsigned int pc;
 
 	__asm __volatile("mov %0, pc\n"

Modified: head/sys/arm/arm/pmap-v6.c
==============================================================================
--- head/sys/arm/arm/pmap-v6.c	Fri Feb  7 14:34:31 2014	(r261595)
+++ head/sys/arm/arm/pmap-v6.c	Fri Feb  7 14:38:51 2014	(r261596)
@@ -1312,8 +1312,6 @@ pmap_init(void)
 	vm_size_t s;
 	int i, pv_npg;
 
-	PDEBUG(1, printf("pmap_init: phys_start = %08x\n", PHYSADDR));
-
 	l2zone = uma_zcreate("L2 Table", L2_TABLE_SIZE_REAL, pmap_l2ptp_ctor,
 	    NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_VM | UMA_ZONE_NOFREE);
 	l2table_zone = uma_zcreate("L2 Table", sizeof(struct l2_dtable), NULL,

Modified: head/sys/arm/arm/pmap.c
==============================================================================
--- head/sys/arm/arm/pmap.c	Fri Feb  7 14:34:31 2014	(r261595)
+++ head/sys/arm/arm/pmap.c	Fri Feb  7 14:38:51 2014	(r261596)
@@ -1826,8 +1826,6 @@ pmap_init(void)
 {
 	int shpgperproc = PMAP_SHPGPERPROC;
 
-	PDEBUG(1, printf("pmap_init: phys_start = %08x\n", PHYSADDR));
-
 	l2zone = uma_zcreate("L2 Table", L2_TABLE_SIZE_REAL, pmap_l2ptp_ctor,
 	    NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_VM | UMA_ZONE_NOFREE);
 	l2table_zone = uma_zcreate("L2 Table", sizeof(struct l2_dtable), NULL,

Modified: head/sys/arm/arm/support.S
==============================================================================
--- head/sys/arm/arm/support.S	Fri Feb  7 14:34:31 2014	(r261595)
+++ head/sys/arm/arm/support.S	Fri Feb  7 14:38:51 2014	(r261596)
@@ -939,7 +939,7 @@ END(memmove)
 ENTRY(memcpy)
 	/* save leaf functions having to store this away */
 	/* Do not check arm_memcpy if we're running from flash */
-#ifdef FLASHADDR
+#if defined(FLASHADDR) && defined(PHYSADDR)
 #if FLASHADDR > PHYSADDR
 	ldr	r3, =FLASHADDR
 	cmp	r3, pc