TI DaVinci: Fix DM6467 EVM Compilation Warning
authorSandeep Paulraj <s-paulraj@ti.com>
Tue, 13 Oct 2009 16:32:32 +0000 (12:32 -0400)
committerTom Rix <Tom.Rix@windriver.com>
Sat, 24 Oct 2009 14:55:24 +0000 (09:55 -0500)
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>
include/asm-arm/arch-davinci/hardware.h

index ac32510a30ce762e0fa2164ce5f4aecc55768c5f..acf12ea7a29954e0d03cacc91f4bfc6c27946fa2 100644 (file)
@@ -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