summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSandeep Paulraj <s-paulraj@ti.com>2009-10-13 12:32:32 -0400
committerTom Rix <Tom.Rix@windriver.com>2009-10-24 09:55:24 -0500
commit11b0102218bbb50ac5c04f1521f2a22ed4e90cf1 (patch)
tree8a076fb5758e0daf4f2cd76eb5e19ea56beae279
parentfac1ef4ba685606bf28349d18e050ea08b50e669 (diff)
downloadu-boot-imx-11b0102218bbb50ac5c04f1521f2a22ed4e90cf1.zip
u-boot-imx-11b0102218bbb50ac5c04f1521f2a22ed4e90cf1.tar.gz
u-boot-imx-11b0102218bbb50ac5c04f1521f2a22ed4e90cf1.tar.bz2
TI DaVinci: Fix DM6467 EVM Compilation Warning
Due to new TI boards being added to U-Boot, the hardware.h is getting very messy. The warning being fixed is due to the EMIF addresses being redefined. The long term solution(after 2009.11) to this is to have SOC specific header files. Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
-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