Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 373951
b: refs/heads/master
c: da497f6
h: refs/heads/master
i:
  373949: 9d5e56b
  373947: 2986250
  373943: ea1566e
  373935: dfe1a4f
  373919: 2b2e645
  373887: 0a96e55
v: v3
  • Loading branch information
Lior Amsalem authored and Jason Cooper committed Apr 15, 2013
1 parent 5f94219 commit bb0171b
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 99ff056193924005e650ab3f1719995c3ca82646
refs/heads/master: da497f6fbaa190d34907ecc9dd85cfc62ba9f5a2
2 changes: 1 addition & 1 deletion trunk/arch/arm/include/debug/mvebu.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-mvebu/armada-370-xp.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down

0 comments on commit bb0171b

Please sign in to comment.