summaryrefslogtreecommitdiff
path: root/include/asm-arm/arch-davinci
diff options
context:
space:
mode:
authorMinkyu Kang <mk7.kang@samsung.com>2009-10-30 12:14:40 +0900
committerMinkyu Kang <mk7.kang@samsung.com>2009-10-30 12:14:40 +0900
commit0bf7de838096e804f0cece8f2d94905477381b6e (patch)
treefc57495ade62aeba85b935353955a28444e5b65b /include/asm-arm/arch-davinci
parentd43bc3d2d09022bcffa1302b8f51e7fabe2dc68a (diff)
parent4bc3d2afb380e78fdbb9c501d9a8da6d59eb178e (diff)
downloadu-boot-imx-0bf7de838096e804f0cece8f2d94905477381b6e.zip
u-boot-imx-0bf7de838096e804f0cece8f2d94905477381b6e.tar.gz
u-boot-imx-0bf7de838096e804f0cece8f2d94905477381b6e.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-arm
Conflicts: board/eukrea/cpu9260/cpu9260.c drivers/serial/serial_s5pc1xx.c include/asm-arm/arch-s5pc1xx/clock.h include/asm-arm/arch-s5pc1xx/gpio.h include/asm-arm/arch-s5pc1xx/pwm.h include/asm-arm/arch-s5pc1xx/uart.h include/configs/cpu9260.h include/configs/cpuat91.h include/configs/davinci_dm355evm.h include/linux/mtd/samsung_onenand.h
Diffstat (limited to 'include/asm-arm/arch-davinci')
-rw-r--r--include/asm-arm/arch-davinci/hardware.h2
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