Index: sys/arm/arm/locore-v6.S
===================================================================
--- sys/arm/arm/locore-v6.S
+++ sys/arm/arm/locore-v6.S
@@ -188,7 +188,7 @@
 	ldr	r1, =SOCDEV_PA
 	ldr	r2, =SOCDEV_VA
 	mov	r3, #1
-	bl	build_pagetables
+	bl	build_pagetables_dev
 #endif
 	bl	init_mmu
 
@@ -418,6 +418,41 @@
 
 	mov	pc, lr
 
+/*
+ * Builds the page table for device memory
+ * r0 -	The table base address
+ * r1 -	The physical address (trashed)
+ * r2 -	The virtual address (trashed)
+ * r3 -	The number of 1MiB sections
+ * r4 -	Trashed
+ *
+ * Addresses must be 1MiB aligned
+ */
+build_pagetables_dev:
+	/* Set the required page attributed */
+#if defined(ARM_NEW_PMAP)
+	/* TODO: find device attribute in new PMAP and add it here */
+	ldr	r4, =PTE1_V|PTE1_A|PTE1_AP_KRW|TEX1_CLASS_0
+#elif defined(SMP)
+	ldr	r4, =(L1_TYPE_S|L1_S_B|L1_S_AP(AP_KRW)|L1_SHARED)
+#else
+	ldr	r4, =(L1_TYPE_S|L1_S_B|L1_S_AP(AP_KRW))
+#endif
+	orr	r1, r4
+
+	/* Move	the virtual address to the correct bit location	*/
+	lsr	r2, #(PTE1_SHIFT - 2)
+
+	mov	r4, r3
+1:
+	str	r1, [r0, r2]
+	add	r2, r2,	#4
+	add	r1, r1,	#(PTE1_SIZE)
+	adds	r4, r4,	#-1
+	bhi	1b
+
+	mov	pc, lr
+
 VA_TO_PA_POINTER(Lpagetable, boot_pt1)