diff options
| author | Tom Rini <trini@ti.com> | 2013-11-14 11:48:15 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-11-14 11:48:15 -0500 |
| commit | c3ebb8c38a5da5e40da2786c5d850d1f6555ff95 (patch) | |
| tree | 5a31873d2a4994cd9b5a4fc4bed9bb0c4f28f62b /arch/powerpc/include/asm/immap_83xx.h | |
| parent | f9de54e9b09b4836fb3cda9d98a6dfba367b9734 (diff) | |
| parent | 51abee64eee0186634858d1e6f91a65969c90125 (diff) | |
| download | u-boot-imx-c3ebb8c38a5da5e40da2786c5d850d1f6555ff95.zip u-boot-imx-c3ebb8c38a5da5e40da2786c5d850d1f6555ff95.tar.gz u-boot-imx-c3ebb8c38a5da5e40da2786c5d850d1f6555ff95.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Diffstat (limited to 'arch/powerpc/include/asm/immap_83xx.h')
| -rw-r--r-- | arch/powerpc/include/asm/immap_83xx.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/powerpc/include/asm/immap_83xx.h b/arch/powerpc/include/asm/immap_83xx.h index 3c86ff6..289f7ca 100644 --- a/arch/powerpc/include/asm/immap_83xx.h +++ b/arch/powerpc/include/asm/immap_83xx.h @@ -763,6 +763,7 @@ typedef struct immap { u8 res7[0xC0000]; } immap_t; +#ifndef CONFIG_MPC834x #ifdef CONFIG_HAS_FSL_MPH_USB #define CONFIG_SYS_MPC83xx_USB1_OFFSET 0x22000 /* use the MPH controller */ #define CONFIG_SYS_MPC83xx_USB2_OFFSET 0 @@ -770,6 +771,10 @@ typedef struct immap { #define CONFIG_SYS_MPC83xx_USB1_OFFSET 0 #define CONFIG_SYS_MPC83xx_USB2_OFFSET 0x23000 /* use the DR controller */ #endif +#else +#define CONFIG_SYS_MPC83xx_USB1_OFFSET 0x22000 +#define CONFIG_SYS_MPC83xx_USB2_OFFSET 0x23000 +#endif #elif defined(CONFIG_MPC8313) typedef struct immap { |