diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-07-13 14:44:04 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-07-13 14:44:04 +0200 |
| commit | 0740ac26f4e590bf5b4e7b9a9886208dc2dacb32 (patch) | |
| tree | 5d18fcb91d491f602c17c550af70a9a092b883f8 /include | |
| parent | af577da58642b81eb94067e3d9e9dc6998cd620d (diff) | |
| parent | 47bf9c71ae838305a3ea3161af8d14e6f3fc2c82 (diff) | |
| download | talos-obmc-uboot-0740ac26f4e590bf5b4e7b9a9886208dc2dacb32.tar.gz talos-obmc-uboot-0740ac26f4e590bf5b4e7b9a9886208dc2dacb32.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-coldfire
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-m68k/timer.h | 2 | ||||
| -rw-r--r-- | include/configs/EB+MCF-EV123.h | 2 | ||||
| -rw-r--r-- | include/configs/M5475EVB.h | 4 | ||||
| -rw-r--r-- | include/configs/M5485EVB.h | 4 |
4 files changed, 7 insertions, 5 deletions
diff --git a/include/asm-m68k/timer.h b/include/asm-m68k/timer.h index 030720c89f..1a5de05871 100644 --- a/include/asm-m68k/timer.h +++ b/include/asm-m68k/timer.h @@ -33,7 +33,7 @@ /****************************************************************************/ /* DMA Timer module registers */ typedef struct dtimer_ctrl { -#if defined(CONFIG_M5249) || defined(CONFIG_M5253) +#if defined(CONFIG_M5249) || defined(CONFIG_M5253) || defined(CONFIG_M5272) u16 tmr; /* 0x00 Mode register */ u16 res1; /* 0x02 */ u16 trr; /* 0x04 Reference register */ diff --git a/include/configs/EB+MCF-EV123.h b/include/configs/EB+MCF-EV123.h index 417099e037..324eb6ce15 100644 --- a/include/configs/EB+MCF-EV123.h +++ b/include/configs/EB+MCF-EV123.h @@ -84,6 +84,8 @@ #define CONFIG_CMD_MII #define CONFIG_CMD_NET +#define CONFIG_MCFTMR + #define CONFIG_MCFFEC #ifdef CONFIG_MCFFEC # define CONFIG_NET_MULTI 1 diff --git a/include/configs/M5475EVB.h b/include/configs/M5475EVB.h index a19c342270..e8804b5660 100644 --- a/include/configs/M5475EVB.h +++ b/include/configs/M5475EVB.h @@ -303,9 +303,9 @@ #define CFG_CS0_CTRL 0x00101980 #ifdef CFG_NOR1SZ -#define CFG_CS1_BASE 0xF8000000 +#define CFG_CS1_BASE 0xE0000000 #define CFG_CS1_MASK (((CFG_NOR1SZ << 20) - 1) & 0xFFFF0001) -#define CFG_CS1_CTRL 0x00000D80 +#define CFG_CS1_CTRL 0x00101D80 #endif #endif /* _M5475EVB_H */ diff --git a/include/configs/M5485EVB.h b/include/configs/M5485EVB.h index b73e2e006d..0f957fff58 100644 --- a/include/configs/M5485EVB.h +++ b/include/configs/M5485EVB.h @@ -289,9 +289,9 @@ #define CFG_CS0_CTRL 0x00101980 #ifdef CFG_NOR1SZ -#define CFG_CS1_BASE 0xF8000000 +#define CFG_CS1_BASE 0xE0000000 #define CFG_CS1_MASK (((CFG_NOR1SZ << 20) - 1) & 0xFFFF0001) -#define CFG_CS1_CTRL 0x00000D80 +#define CFG_CS1_CTRL 0x00101D80 #endif #endif /* _M5485EVB_H */ |
