diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-11-09 00:01:42 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-11-09 00:01:42 +0100 |
| commit | c06d9bbbeb0416f189e841ffb214ada6194ed874 (patch) | |
| tree | 07ffabf1f239a50bb5a0d6d77745d9e83ad0c9d4 /include/asm-m68k/immap_547x_8x.h | |
| parent | a80b21d5127583171d6e9bc7f722947641898012 (diff) | |
| parent | e4f69d1bd21a12049744989d2dd6b5199c9b8f23 (diff) | |
| download | u-boot-imx-c06d9bbbeb0416f189e841ffb214ada6194ed874.zip u-boot-imx-c06d9bbbeb0416f189e841ffb214ada6194ed874.tar.gz u-boot-imx-c06d9bbbeb0416f189e841ffb214ada6194ed874.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-coldfire
Diffstat (limited to 'include/asm-m68k/immap_547x_8x.h')
| -rw-r--r-- | include/asm-m68k/immap_547x_8x.h | 40 |
1 files changed, 9 insertions, 31 deletions
diff --git a/include/asm-m68k/immap_547x_8x.h b/include/asm-m68k/immap_547x_8x.h index c221936..50f8b05d98 100644 --- a/include/asm-m68k/immap_547x_8x.h +++ b/include/asm-m68k/immap_547x_8x.h @@ -57,7 +57,11 @@ #define MMAP_SRAMCFG (CONFIG_SYS_MBAR + 0x0001FF00) #define MMAP_SEC (CONFIG_SYS_MBAR + 0x00020000) +#include <asm/coldfire/dspi.h> +#include <asm/coldfire/eport.h> #include <asm/coldfire/flexbus.h> +#include <asm/coldfire/flexcan.h> +#include <asm/coldfire/intctrl.h> typedef struct siu { u32 mbar; /* 0x00 */ @@ -98,37 +102,6 @@ typedef struct xlb_arb { u32 pri; /* 0x268 */ } xlbarb_t; -typedef struct int0_ctrl { - u32 iprh0; /* 0x00 */ - u32 iprl0; /* 0x04 */ - u32 imrh0; /* 0x08 */ - u32 imrl0; /* 0x0C */ - u32 frch0; /* 0x10 */ - u32 frcl0; /* 0x14 */ - u8 irlr; /* 0x18 */ - u8 iacklpr; /* 0x19 */ - u16 res1; /* 0x1A - 0x1B */ - u32 res2[9]; /* 0x1C - 0x3F */ - u8 icr0[64]; /* 0x40 - 0x7F */ - u32 res3[24]; /* 0x80 - 0xDF */ - u8 swiack0; /* 0xE0 */ - u8 res4[3]; /* 0xE1 - 0xE3 */ - u8 Lniack0_1; /* 0xE4 */ - u8 res5[3]; /* 0xE5 - 0xE7 */ - u8 Lniack0_2; /* 0xE8 */ - u8 res6[3]; /* 0xE9 - 0xEB */ - u8 Lniack0_3; /* 0xEC */ - u8 res7[3]; /* 0xED - 0xEF */ - u8 Lniack0_4; /* 0xF0 */ - u8 res8[3]; /* 0xF1 - 0xF3 */ - u8 Lniack0_5; /* 0xF4 */ - u8 res9[3]; /* 0xF5 - 0xF7 */ - u8 Lniack0_6; /* 0xF8 */ - u8 resa[3]; /* 0xF9 - 0xFB */ - u8 Lniack0_7; /* 0xFC */ - u8 resb[3]; /* 0xFD - 0xFF */ -} int0_t; - typedef struct gptmr { u8 ocpw; u8 octict; @@ -147,6 +120,11 @@ typedef struct gptmr { u8 intr; /* Interrupts */ } gptmr_t; +typedef struct canex_ctrl { + can_msg_t msg[16]; /* 0x00 Message Buffer 0-15 */ +} canex_t; + + typedef struct slt { u32 tcnt; /* 0x00 */ u32 cr; /* 0x04 */ |