diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-10-18 21:59:44 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-10-18 21:59:44 +0200 |
| commit | f82642e33899766892499b163e60560fbbf87773 (patch) | |
| tree | ab90f076f18e56b2b3e8c9375b95917daa78c1d9 /include/asm-m68k/immap_5227x.h | |
| parent | b59b16ca24bc7e77ec113021a6d77b9b32fcf192 (diff) | |
| parent | 360fe71e82b83e264c964c9447c537e9a1f643c8 (diff) | |
| download | u-boot-imx-f82642e33899766892499b163e60560fbbf87773.zip u-boot-imx-f82642e33899766892499b163e60560fbbf87773.tar.gz u-boot-imx-f82642e33899766892499b163e60560fbbf87773.tar.bz2 | |
Merge 'next' branch
Conflicts:
board/freescale/mpc8536ds/mpc8536ds.c
include/configs/mgcoge.h
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'include/asm-m68k/immap_5227x.h')
| -rw-r--r-- | include/asm-m68k/immap_5227x.h | 76 |
1 files changed, 38 insertions, 38 deletions
diff --git a/include/asm-m68k/immap_5227x.h b/include/asm-m68k/immap_5227x.h index 1d1e6f1..83da3d5 100644 --- a/include/asm-m68k/immap_5227x.h +++ b/include/asm-m68k/immap_5227x.h @@ -27,44 +27,44 @@ #define __IMMAP_5227X__ /* Module Base Addresses */ -#define MMAP_SCM1 (CFG_MBAR + 0x00000000) -#define MMAP_XBS (CFG_MBAR + 0x00004000) -#define MMAP_FBCS (CFG_MBAR + 0x00008000) -#define MMAP_CAN (CFG_MBAR + 0x00020000) -#define MMAP_RTC (CFG_MBAR + 0x0003C000) -#define MMAP_SCM2 (CFG_MBAR + 0x00040010) -#define MMAP_SCM3 (CFG_MBAR + 0x00040070) -#define MMAP_EDMA (CFG_MBAR + 0x00044000) -#define MMAP_INTC0 (CFG_MBAR + 0x00048000) -#define MMAP_INTC1 (CFG_MBAR + 0x0004C000) -#define MMAP_IACK (CFG_MBAR + 0x00054000) -#define MMAP_I2C (CFG_MBAR + 0x00058000) -#define MMAP_DSPI (CFG_MBAR + 0x0005C000) -#define MMAP_UART0 (CFG_MBAR + 0x00060000) -#define MMAP_UART1 (CFG_MBAR + 0x00064000) -#define MMAP_UART2 (CFG_MBAR + 0x00068000) -#define MMAP_DTMR0 (CFG_MBAR + 0x00070000) -#define MMAP_DTMR1 (CFG_MBAR + 0x00074000) -#define MMAP_DTMR2 (CFG_MBAR + 0x00078000) -#define MMAP_DTMR3 (CFG_MBAR + 0x0007C000) -#define MMAP_PIT0 (CFG_MBAR + 0x00080000) -#define MMAP_PIT1 (CFG_MBAR + 0x00084000) -#define MMAP_PWM (CFG_MBAR + 0x00090000) -#define MMAP_EPORT (CFG_MBAR + 0x00094000) -#define MMAP_RCM (CFG_MBAR + 0x000A0000) -#define MMAP_CCM (CFG_MBAR + 0x000A0004) -#define MMAP_GPIO (CFG_MBAR + 0x000A4000) -#define MMAP_ADC (CFG_MBAR + 0x000A8000) -#define MMAP_LCD (CFG_MBAR + 0x000AC000) -#define MMAP_LCD_BGLUT (CFG_MBAR + 0x000AC800) -#define MMAP_LCD_GWLUT (CFG_MBAR + 0x000ACC00) -#define MMAP_USBHW (CFG_MBAR + 0x000B0000) -#define MMAP_USBCAPS (CFG_MBAR + 0x000B0100) -#define MMAP_USBEHCI (CFG_MBAR + 0x000B0140) -#define MMAP_USBOTG (CFG_MBAR + 0x000B01A0) -#define MMAP_SDRAM (CFG_MBAR + 0x000B8000) -#define MMAP_SSI (CFG_MBAR + 0x000BC000) -#define MMAP_PLL (CFG_MBAR + 0x000C0000) +#define MMAP_SCM1 (CONFIG_SYS_MBAR + 0x00000000) +#define MMAP_XBS (CONFIG_SYS_MBAR + 0x00004000) +#define MMAP_FBCS (CONFIG_SYS_MBAR + 0x00008000) +#define MMAP_CAN (CONFIG_SYS_MBAR + 0x00020000) +#define MMAP_RTC (CONFIG_SYS_MBAR + 0x0003C000) +#define MMAP_SCM2 (CONFIG_SYS_MBAR + 0x00040010) +#define MMAP_SCM3 (CONFIG_SYS_MBAR + 0x00040070) +#define MMAP_EDMA (CONFIG_SYS_MBAR + 0x00044000) +#define MMAP_INTC0 (CONFIG_SYS_MBAR + 0x00048000) +#define MMAP_INTC1 (CONFIG_SYS_MBAR + 0x0004C000) +#define MMAP_IACK (CONFIG_SYS_MBAR + 0x00054000) +#define MMAP_I2C (CONFIG_SYS_MBAR + 0x00058000) +#define MMAP_DSPI (CONFIG_SYS_MBAR + 0x0005C000) +#define MMAP_UART0 (CONFIG_SYS_MBAR + 0x00060000) +#define MMAP_UART1 (CONFIG_SYS_MBAR + 0x00064000) +#define MMAP_UART2 (CONFIG_SYS_MBAR + 0x00068000) +#define MMAP_DTMR0 (CONFIG_SYS_MBAR + 0x00070000) +#define MMAP_DTMR1 (CONFIG_SYS_MBAR + 0x00074000) +#define MMAP_DTMR2 (CONFIG_SYS_MBAR + 0x00078000) +#define MMAP_DTMR3 (CONFIG_SYS_MBAR + 0x0007C000) +#define MMAP_PIT0 (CONFIG_SYS_MBAR + 0x00080000) +#define MMAP_PIT1 (CONFIG_SYS_MBAR + 0x00084000) +#define MMAP_PWM (CONFIG_SYS_MBAR + 0x00090000) +#define MMAP_EPORT (CONFIG_SYS_MBAR + 0x00094000) +#define MMAP_RCM (CONFIG_SYS_MBAR + 0x000A0000) +#define MMAP_CCM (CONFIG_SYS_MBAR + 0x000A0004) +#define MMAP_GPIO (CONFIG_SYS_MBAR + 0x000A4000) +#define MMAP_ADC (CONFIG_SYS_MBAR + 0x000A8000) +#define MMAP_LCD (CONFIG_SYS_MBAR + 0x000AC000) +#define MMAP_LCD_BGLUT (CONFIG_SYS_MBAR + 0x000AC800) +#define MMAP_LCD_GWLUT (CONFIG_SYS_MBAR + 0x000ACC00) +#define MMAP_USBHW (CONFIG_SYS_MBAR + 0x000B0000) +#define MMAP_USBCAPS (CONFIG_SYS_MBAR + 0x000B0100) +#define MMAP_USBEHCI (CONFIG_SYS_MBAR + 0x000B0140) +#define MMAP_USBOTG (CONFIG_SYS_MBAR + 0x000B01A0) +#define MMAP_SDRAM (CONFIG_SYS_MBAR + 0x000B8000) +#define MMAP_SSI (CONFIG_SYS_MBAR + 0x000BC000) +#define MMAP_PLL (CONFIG_SYS_MBAR + 0x000C0000) #include <asm/coldfire/crossbar.h> #include <asm/coldfire/dspi.h> |