PERFORCE change 153483 for review

[Sam Leffler]

http://perforce.freebsd.org/chv.cgi?CH=153483

Change 153483 by sam at sam_ebb on 2008/11/24 23:39:14

	remove hardwired assumption that PHYADDR is 0x10000000
	Submitted by:	cognet

Affected files ...

.. //depot/projects/vap/sys/arm/xscale/ixp425/avila_machdep.c#7 edit

Differences ...

==== //depot/projects/vap/sys/arm/xscale/ixp425/avila_machdep.c#7 (text+ko) ====

@@ -243,8 +243,6 @@
     }
 };
 
-#define SDRAM_START 0x10000000
-
 extern vm_offset_t xscale_cache_clean_addr;
 
 void *
@@ -346,11 +344,11 @@
 	    		&kernel_pt_table[KERNEL_PT_IO + 2]);
 	pmap_link_l2pt(l1pagetable, KERNBASE,
 	    &kernel_pt_table[KERNEL_PT_BEFOREKERN]);
-	pmap_map_chunk(l1pagetable, KERNBASE, SDRAM_START, 0x100000,
+	pmap_map_chunk(l1pagetable, KERNBASE, PHYSADDR, 0x100000,
 	    VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE);
-	pmap_map_chunk(l1pagetable, KERNBASE + 0x100000, SDRAM_START + 0x100000,
+	pmap_map_chunk(l1pagetable, KERNBASE + 0x100000, PHYSADDR + 0x100000,
 	    0x100000, VM_PROT_READ|VM_PROT_WRITE, PTE_PAGETABLE);
-	pmap_map_chunk(l1pagetable, KERNBASE + 0x200000, SDRAM_START + 0x200000,
+	pmap_map_chunk(l1pagetable, KERNBASE + 0x200000, PHYSADDR + 0x200000,
 	   (((uint32_t)(lastaddr) - KERNBASE - 0x200000) + L1_S_SIZE) & ~(L1_S_SIZE - 1),
 	    VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE);
 	freemem_after = ((int)lastaddr + PAGE_SIZE) & ~(PAGE_SIZE - 1);
@@ -452,8 +450,8 @@
 
 
 	pmap_curmaxkvaddr = afterkern + PAGE_SIZE;
-	dump_avail[0] = 0x10000000;
-	dump_avail[1] = 0x10000000 + memsize;
+	dump_avail[0] = PHYSADDR;
+	dump_avail[1] = PHYSADDR + memsize;
 	dump_avail[2] = 0;
 	dump_avail[3] = 0;
 					
@@ -465,14 +463,14 @@
 	
 	i = 0;
 #ifdef ARM_USE_SMALL_ALLOC
-	phys_avail[i++] = 0x10000000;
-	phys_avail[i++] = 0x10001000; 	/*
+	phys_avail[i++] = PHYSADDR;
+	phys_avail[i++] = PHYSADDR + PAGE_SIZE; 	/*
 					 *XXX: Gross hack to get our
 					 * pages in the vm_page_array
 					 . */
 #endif
-	phys_avail[i++] = round_page(virtual_avail - KERNBASE + SDRAM_START);
-	phys_avail[i++] = trunc_page(0x10000000 + memsize - 1);
+	phys_avail[i++] = round_page(virtual_avail - KERNBASE + PHYSADDR);
+	phys_avail[i++] = trunc_page(PHYSADDR + memsize - 1);
 	phys_avail[i++] = 0;
 	phys_avail[i] = 0;