From bb0171b2f4d0730cc4e798e14776ff298645b1c2 Mon Sep 17 00:00:00 2001 From: Lior Amsalem Date: Tue, 9 Apr 2013 00:52:11 +0200 Subject: [PATCH] --- yaml --- r: 373951 b: refs/heads/master c: da497f6fbaa190d34907ecc9dd85cfc62ba9f5a2 h: refs/heads/master i: 373949: 9d5e56b831211a0ddc9d6a8441cd52bd6bc63415 373947: 29862509e23d16f2d1ddeca21fe7342d6fd35a88 373943: ea1566e9de7e161cc20d88684f0a92264e3ac4f7 373935: dfe1a4fff04a1cd04a46568265d27c27f2c70526 373919: 2b2e645cda6d7f48cec60922ced0130f33c49109 373887: 0a96e55fb4db503e2b8aaccf3160a756a3f2af0b v: v3 --- [refs] | 2 +- trunk/arch/arm/include/debug/mvebu.S | 2 +- trunk/arch/arm/mach-mvebu/armada-370-xp.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a7c786dbe494..c5734e9d0af8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 99ff056193924005e650ab3f1719995c3ca82646 +refs/heads/master: da497f6fbaa190d34907ecc9dd85cfc62ba9f5a2 diff --git a/trunk/arch/arm/include/debug/mvebu.S b/trunk/arch/arm/include/debug/mvebu.S index 865c6d02b332..df191afa3be1 100644 --- a/trunk/arch/arm/include/debug/mvebu.S +++ b/trunk/arch/arm/include/debug/mvebu.S @@ -12,7 +12,7 @@ */ #define ARMADA_370_XP_REGS_PHYS_BASE 0xd0000000 -#define ARMADA_370_XP_REGS_VIRT_BASE 0xfeb00000 +#define ARMADA_370_XP_REGS_VIRT_BASE 0xfec00000 .macro addruart, rp, rv, tmp ldr \rp, =ARMADA_370_XP_REGS_PHYS_BASE diff --git a/trunk/arch/arm/mach-mvebu/armada-370-xp.h b/trunk/arch/arm/mach-mvebu/armada-370-xp.h index 978308717284..2070e1b4f342 100644 --- a/trunk/arch/arm/mach-mvebu/armada-370-xp.h +++ b/trunk/arch/arm/mach-mvebu/armada-370-xp.h @@ -16,7 +16,7 @@ #define __MACH_ARMADA_370_XP_H #define ARMADA_370_XP_REGS_PHYS_BASE 0xd0000000 -#define ARMADA_370_XP_REGS_VIRT_BASE IOMEM(0xfeb00000) +#define ARMADA_370_XP_REGS_VIRT_BASE IOMEM(0xfec00000) #define ARMADA_370_XP_REGS_SIZE SZ_1M /* These defines can go away once mvebu-mbus has a DT binding */