dm6467Tevm: Use a common configuration file for davinci_dm6467evm and…

… davinci_dm6467Tevm In commit 2d575e4 a separate header file was introduced for the DM6467T EVM, include/configs/davinci_dm6467Tevm.h. The substantial difference between the davinci_dm6467evm and the davinci_dm6467Tevm configuration is a single bit in the hardware revision that is passed to the Linux kernel and davinci_dm6467evm has REFCLK_FREQ = 27000000 where as davinci_dm6467Tevm.h has a REFCLK_FREQ = 33000000. This patch removes include/configs/davinci_dm6467Tevm.h. Instead the include/configs/davinci_dm6467evm.h configuration is used for DM6467T EVMs and renamed CFG_REFCLK_FREQ to CONFIG_REFCLK_FREQ and CONFIG_REFCLK_FREQ is defined in boards.cfg. Signed-off-by: Prabhakar Lad <[email protected]> Cc: Tom Rini <[email protected]>
chewitt · Feb 27, 2012 · fda9c20 · fda9c20
1 parent 512dce0
commit fda9c20
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 172 deletions.
diff --git a/arch/arm/cpu/arm926ejs/davinci/cpu.c b/arch/arm/cpu/arm926ejs/davinci/cpu.c
@@ -156,7 +156,7 @@ static unsigned pll_sysclk_mhz(unsigned pll_addr, unsigned div)
 {
 	volatile void	*pllbase = (volatile void *) pll_addr;
 #ifdef CONFIG_SOC_DM646X
-	unsigned	base = CFG_REFCLK_FREQ / 1000;
+	unsigned	base = CONFIG_REFCLK_FREQ / 1000;
 #else
 	unsigned	base = CONFIG_SYS_HZ_CLOCK / 1000;
 #endif

diff --git a/board/davinci/dm6467evm/dm6467evm.c b/board/davinci/dm6467evm/dm6467evm.c
@@ -36,7 +36,7 @@ DECLARE_GLOBAL_DATA_PTR;
 u32 get_board_rev(void)
 {
 
-#ifdef DAVINCI_DM6467TEVM
+#ifdef CONFIG_DAVINCI_DM6467TEVM
 	return REV_DM6467TEVM;
 #else
 	return REV_DM6467EVM;

diff --git a/boards.cfg b/boards.cfg
@@ -125,8 +125,8 @@ da850evm                     arm         arm926ejs   da8xxevm            davinci
 davinci_dm355evm             arm         arm926ejs   dm355evm            davinci        davinci
 davinci_dm355leopard         arm         arm926ejs   dm355leopard        davinci        davinci
 davinci_dm365evm             arm         arm926ejs   dm365evm            davinci        davinci
-davinci_dm6467evm            arm         arm926ejs   dm6467evm           davinci        davinci
-davinci_dm6467Tevm           arm         arm926ejs   dm6467evm           davinci        davinci
+davinci_dm6467evm            arm         arm926ejs   dm6467evm           davinci        davinci     davinci_dm6467evm:REFCLK_FREQ=27000000
+davinci_dm6467Tevm           arm         arm926ejs   dm6467evm           davinci        davinci     davinci_dm6467evm:DAVINCI_DM6467TEVM,REFCLK_FREQ=33000000
 davinci_dvevm                arm         arm926ejs   dvevm               davinci        davinci
 davinci_schmoogie            arm         arm926ejs   schmoogie           davinci        davinci
 davinci_sffsdr               arm         arm926ejs   sffsdr              davinci        davinci

diff --git a/include/configs/davinci_dm6467Tevm.h b/include/configs/davinci_dm6467Tevm.h
diff --git a/include/configs/davinci_dm6467evm.h b/include/configs/davinci_dm6467evm.h
@@ -35,7 +35,6 @@
 extern unsigned int davinci_arm_clk_get(void);
 #endif
 
-#define CFG_REFCLK_FREQ		27000000
 /* Arm Clock frequency    */
 #define CONFIG_SYS_CLK_FREQ	davinci_arm_clk_get()
 /* Timer Input clock freq */