Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 12123
b: refs/heads/master
c: 7ee2cf5
h: refs/heads/master
i:
  12121: 4574aba
  12119: 47cfa77
v: v3
  • Loading branch information
Greg Ungerer authored and Linus Torvalds committed Nov 2, 2005
1 parent dc6f608 commit 3a9bb50
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ed65fa16d54a015ef0855692901a6cf362046622
refs/heads/master: 7ee2cf5f43e8fefa53cf6f32ba8205cce962a348
10 changes: 8 additions & 2 deletions trunk/include/asm-m68knommu/coldfire.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,14 @@
*/
#define MCF_MBAR 0x10000000
#define MCF_MBAR2 0x80000000
#if defined(CONFIG_M520x)
#define MCF_IPSBAR 0xFC000000
#else
#define MCF_IPSBAR 0x40000000
#endif

#if defined(CONFIG_M523x) || defined(CONFIG_M527x) || defined(CONFIG_M528x)
#if defined(CONFIG_M523x) || defined(CONFIG_M527x) || defined(CONFIG_M528x) || \
defined(CONFIG_M520x)
#undef MCF_MBAR
#define MCF_MBAR MCF_IPSBAR
#endif
Expand Down Expand Up @@ -78,7 +83,8 @@
* One some ColdFire family members the bus clock (used by internal
* peripherals) is not the same as the CPU clock.
*/
#if defined(CONFIG_M523x) || defined(CONFIG_M5249) || defined(CONFIG_M527x)
#if defined(CONFIG_M523x) || defined(CONFIG_M5249) || defined(CONFIG_M527x) || \
defined(CONFIG_M520x)
#define MCF_BUSCLK (MCF_CLK / 2)
#else
#define MCF_BUSCLK MCF_CLK
Expand Down

0 comments on commit 3a9bb50

Please sign in to comment.