From 810bd26129925d5eee0c805f9f669df05b6389a8 Mon Sep 17 00:00:00 2001 From: Catalin Marinas Date: Fri, 18 Apr 2008 22:43:12 +0100 Subject: [PATCH] --- yaml --- r: 91119 b: refs/heads/master c: 51faf9b5c048f9e465322f8256e838586f4c11a7 h: refs/heads/master i: 91117: fcfdbf6fea445d76153b9998efd3015e9445a435 91115: 45a6c5132b1b5bca08051534755c3ff687c993fd 91111: 784b8b4b1b68bf93ecd484c39ec65534c80a2537 91103: 14af99ba37e0fa3ab792fa46d2291aaace800b71 v: v3 --- [refs] | 2 +- trunk/include/asm-arm/arch-realview/debug-macro.S | 2 +- trunk/include/asm-arm/arch-realview/hardware.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 5e75a30b985d..c64fd911741f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 41267e208e3ad5d960284a908c58d4c27cc5857b +refs/heads/master: 51faf9b5c048f9e465322f8256e838586f4c11a7 diff --git a/trunk/include/asm-arm/arch-realview/debug-macro.S b/trunk/include/asm-arm/arch-realview/debug-macro.S index f17efc65518a..c8c860c3c26e 100644 --- a/trunk/include/asm-arm/arch-realview/debug-macro.S +++ b/trunk/include/asm-arm/arch-realview/debug-macro.S @@ -15,7 +15,7 @@ mrc p15, 0, \rx, c1, c0 tst \rx, #1 @ MMU enabled? moveq \rx, #0x10000000 - movne \rx, #0xf1000000 @ virtual base + movne \rx, #0xf0000000 @ virtual base orr \rx, \rx, #0x00009000 .endm diff --git a/trunk/include/asm-arm/arch-realview/hardware.h b/trunk/include/asm-arm/arch-realview/hardware.h index bad8d7ce9bfe..1ee8313ceb6a 100644 --- a/trunk/include/asm-arm/arch-realview/hardware.h +++ b/trunk/include/asm-arm/arch-realview/hardware.h @@ -25,7 +25,7 @@ #include /* macro to get at IO space when running virtually */ -#define IO_ADDRESS(x) ((((x) & 0x0effffff) | (((x) >> 4) & 0x0f000000)) + 0xf0000000) +#define IO_ADDRESS(x) (((x) & 0x0fffffff) + 0xf0000000) #define __io_address(n) __io(IO_ADDRESS(n)) #endif