diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-07-16 22:13:45 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-07-16 22:13:45 +0200 |
| commit | 10faafd5ff103ee493b6a05724eb605d09836d4a (patch) | |
| tree | 14139db1b9cee16996d6cc058e28730350e47ad4 /include/asm-ppc/immap_83xx.h | |
| parent | 6973fb414c36b25b4622917d6a223510be0678f5 (diff) | |
| parent | 4a9932a4364b548773bc131bf85e24a2ec15f2b0 (diff) | |
| download | u-boot-imx-10faafd5ff103ee493b6a05724eb605d09836d4a.zip u-boot-imx-10faafd5ff103ee493b6a05724eb605d09836d4a.tar.gz u-boot-imx-10faafd5ff103ee493b6a05724eb605d09836d4a.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx
Diffstat (limited to 'include/asm-ppc/immap_83xx.h')
| -rw-r--r-- | include/asm-ppc/immap_83xx.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/include/asm-ppc/immap_83xx.h b/include/asm-ppc/immap_83xx.h index 7c6a151..c60a7d2 100644 --- a/include/asm-ppc/immap_83xx.h +++ b/include/asm-ppc/immap_83xx.h @@ -650,6 +650,12 @@ typedef struct immap { u8 res7[0xC0000]; } immap_t; +#ifdef CONFIG_HAS_FSL_MPH_USB +#define CONFIG_SYS_MPC83xx_USB_OFFSET 0x22000 /* use the MPH controller */ +#else +#define CONFIG_SYS_MPC83xx_USB_OFFSET 0x23000 /* use the DR controller */ +#endif + #elif defined(CONFIG_MPC8313) typedef struct immap { sysconf83xx_t sysconf; /* System configuration */ @@ -856,7 +862,10 @@ typedef struct immap { #define CONFIG_SYS_MPC83xx_DMA_ADDR (CONFIG_SYS_IMMR + CONFIG_SYS_MPC83xx_DMA_OFFSET) #define CONFIG_SYS_MPC83xx_ESDHC_OFFSET (0x2e000) #define CONFIG_SYS_MPC83xx_ESDHC_ADDR (CONFIG_SYS_IMMR + CONFIG_SYS_MPC83xx_ESDHC_OFFSET) -#define CONFIG_SYS_MPC83xx_USB_OFFSET 0x23000 + +#ifndef CONFIG_SYS_MPC83xx_USB_OFFSET +#define CONFIG_SYS_MPC83xx_USB_OFFSET 0x23000 +#endif #define CONFIG_SYS_MPC83xx_USB_ADDR \ (CONFIG_SYS_IMMR + CONFIG_SYS_MPC83xx_USB_OFFSET) #endif /* __IMMAP_83xx__ */ |