diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-10-24 22:26:09 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-10-24 22:26:09 +0200 |
| commit | 922754cc82a82ac90e486b7565a148c9e4b6b584 (patch) | |
| tree | 7f42bd45ddc7ba92343446af911a4ac5d71cc874 /include/asm-arm/arch-davinci/hardware.h | |
| parent | 4ee63268152594bb7af6bec2b59d53bba68082bf (diff) | |
| parent | 4bc3d2afb380e78fdbb9c501d9a8da6d59eb178e (diff) | |
| download | u-boot-imx-922754cc82a82ac90e486b7565a148c9e4b6b584.zip u-boot-imx-922754cc82a82ac90e486b7565a148c9e4b6b584.tar.gz u-boot-imx-922754cc82a82ac90e486b7565a148c9e4b6b584.tar.bz2 | |
Merge branch 'master-sync' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'include/asm-arm/arch-davinci/hardware.h')
| -rw-r--r-- | include/asm-arm/arch-davinci/hardware.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-arm/arch-davinci/hardware.h b/include/asm-arm/arch-davinci/hardware.h index ac32510..acf12ea 100644 --- a/include/asm-arm/arch-davinci/hardware.h +++ b/include/asm-arm/arch-davinci/hardware.h @@ -71,10 +71,12 @@ typedef volatile unsigned int * dv_reg_p; #define DAVINCI_SPI_BASE (0x01c66800) #define DAVINCI_GPIO_BASE (0x01c67000) #define DAVINCI_VPSS_REGS_BASE (0x01c70000) +#if !defined(CONFIG_SOC_DM646X) #define DAVINCI_ASYNC_EMIF_DATA_CE0_BASE (0x02000000) #define DAVINCI_ASYNC_EMIF_DATA_CE1_BASE (0x04000000) #define DAVINCI_ASYNC_EMIF_DATA_CE2_BASE (0x06000000) #define DAVINCI_ASYNC_EMIF_DATA_CE3_BASE (0x08000000) +#endif #define DAVINCI_DDR_BASE (0x80000000) #ifdef CONFIG_SOC_DM644X |