[U-Boot] [PATCH] TI DaVinci: Fix DM6467 EVM Compilation Warning
From: Sandeep Paulraj s-paulraj@ti.com
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 | 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
s-paulraj@ti.com wrote:
From: Sandeep Paulraj s-paulraj@ti.com
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 | 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
You have already pushed this so mostly this is for the future.. This can be cleaned up so the default #defines are set only if they are not already defined by the board. Or handled with the board files are you are planning. Tom
-----Original Message----- From: Tom Rix [mailto:tom@bumblecow.com] Sent: Tuesday, October 13, 2009 9:49 PM To: Paulraj, Sandeep Cc: u-boot@lists.denx.de Subject: Re: [U-Boot] [PATCH] TI DaVinci: Fix DM6467 EVM Compilation Warning
s-paulraj@ti.com wrote:
From: Sandeep Paulraj s-paulraj@ti.com
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 | 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
You have already pushed this so mostly this is for the future.. This can be cleaned up so the default #defines are set only if they are not already defined by the board. Or handled with the board files are you are planning.
I will clean it up soon. But this will be considered a feature and thus cannot make it to 2009.11; hence this quick fix solution.
In fact I might work on the clean up this weekend and even send for review but even if accepted, I will have to keep it in my next
Tom
Sandeep
participants (3)
-
Paulraj, Sandeep -
s-paulraj＠ti.com
-
Tom Rix