---

yaml --- r: 123635 b: refs/heads/master c: 877d1f3 h: refs/heads/master i: 123633: 480772e 123631: 0496594 v: v3
git-mirror · Nov 10, 2008 · 35a2b2f · 35a2b2f
1 parent df4e69b
commit 35a2b2f
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2c0aec814d259e35366a0a22747f8c9d5e39ee9c
+refs/heads/master: 877d1f338912c1bf49a026eeca1d411755efece5
diff --git a/trunk/arch/arm/mach-realview/include/mach/debug-macro.S b/trunk/arch/arm/mach-realview/include/mach/debug-macro.S
@@ -35,7 +35,7 @@
 		mrc	p15, 0, \rx, c1, c0
 		tst	\rx, #1			@ MMU enabled?
 		moveq	\rx,      #0x10000000
-		movne	\rx,      #0xf0000000	@ virtual base
+		movne	\rx,      #0xfb000000	@ virtual base
 		orr	\rx, \rx, #DEBUG_LL_UART_OFFSET
 		.endm
 

diff --git a/trunk/arch/arm/mach-realview/include/mach/hardware.h b/trunk/arch/arm/mach-realview/include/mach/hardware.h
@@ -25,7 +25,14 @@
 #include <asm/sizes.h>
 
 /* macro to get at IO space when running virtually */
-#define IO_ADDRESS(x)		(((x) & 0x0fffffff) + 0xf0000000)
+/*
+ * Statically mapped addresses:
+ *
+ * 10xx xxxx -> fbxx xxxx
+ * 1exx xxxx -> fdxx xxxx
+ * 1fxx xxxx -> fexx xxxx
+ */
+#define IO_ADDRESS(x)		(((x) & 0x03ffffff) + 0xfb000000)
 #define __io_address(n)		__io(IO_ADDRESS(n))
 
 #endif
diff --git a/trunk/arch/arm/mach-realview/include/mach/vmalloc.h b/trunk/arch/arm/mach-realview/include/mach/vmalloc.h
@@ -18,4 +18,4 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-#define VMALLOC_END		(PAGE_OFFSET + 0x18000000)
+#define VMALLOC_END		0xf8000000