diff options
| -rw-r--r-- | arch/arm/cpu/arm926ejs/davinci/cpu.c | 44 | ||||
| -rw-r--r-- | include/configs/cam_enc_4xx.h | 1 | ||||
| -rw-r--r-- | include/configs/davinci_dm355evm.h | 1 | ||||
| -rw-r--r-- | include/configs/davinci_dm355leopard.h | 1 | ||||
| -rw-r--r-- | include/configs/davinci_dm6467Tevm.h | 1 | ||||
| -rw-r--r-- | include/configs/davinci_dm6467evm.h | 1 | ||||
| -rw-r--r-- | include/configs/davinci_dvevm.h | 1 | ||||
| -rw-r--r-- | include/configs/davinci_schmoogie.h | 1 | ||||
| -rw-r--r-- | include/configs/davinci_sffsdr.h | 1 | ||||
| -rw-r--r-- | include/configs/davinci_sonata.h | 1 | ||||
| -rw-r--r-- | include/configs/enbw_cmc.h | 1 | 
11 files changed, 0 insertions, 54 deletions
| diff --git a/arch/arm/cpu/arm926ejs/davinci/cpu.c b/arch/arm/cpu/arm926ejs/davinci/cpu.c index 9ea97853c..173555522 100644 --- a/arch/arm/cpu/arm926ejs/davinci/cpu.c +++ b/arch/arm/cpu/arm926ejs/davinci/cpu.c @@ -115,21 +115,8 @@ int clk_get(enum davinci_clk_ids id)  out:  	return pll_out;  } -#ifdef CONFIG_DISPLAY_CPUINFO -int print_cpuinfo(void) -{ -	printf("Cores: ARM %d MHz", -			clk_get(DAVINCI_ARM_CLKID) / 1000000); -	printf("\nDDR:   %d MHz\n", -			/* DDR PHY uses an x2 input clock */ -			clk_get(0x10001) / 1000000); -	return 0; -} -#endif  #else /* CONFIG_SOC_DA8XX */ -#ifdef CONFIG_DISPLAY_CPUINFO -  static unsigned pll_div(volatile void *pllbase, unsigned offset)  {  	u32	div; @@ -185,36 +172,6 @@ static unsigned pll_sysclk_mhz(unsigned pll_addr, unsigned div)  	return DIV_ROUND_UP(base, 1000 * pll_div(pllbase, div));  } -int print_cpuinfo(void) -{ -	/* REVISIT fetch and display CPU ID and revision information -	 * too ... that will matter as more revisions appear. -	 */ -#if defined(CONFIG_SOC_DM365) -	printf("Cores: ARM %d MHz", -			pll_sysclk_mhz(DAVINCI_PLL_CNTRL1_BASE, ARM_PLLDIV)); -#else -	printf("Cores: ARM %d MHz", -			pll_sysclk_mhz(DAVINCI_PLL_CNTRL0_BASE, ARM_PLLDIV)); -#endif - -#ifdef DSP_PLLDIV -	printf(", DSP %d MHz", -			pll_sysclk_mhz(DAVINCI_PLL_CNTRL0_BASE, DSP_PLLDIV)); -#endif - -	printf("\nDDR:   %d MHz\n", -			/* DDR PHY uses an x2 input clock */ -#if defined(CONFIG_SOC_DM365) -			pll_sysclk_mhz(DAVINCI_PLL_CNTRL0_BASE, DDR_PLLDIV) -				/ 2); -#else -			pll_sysclk_mhz(DAVINCI_PLL_CNTRL1_BASE, DDR_PLLDIV) -				/ 2); -#endif -	return 0; -} -  #ifdef DAVINCI_DM6467EVM  unsigned int davinci_arm_clk_get()  { @@ -228,7 +185,6 @@ unsigned int davinci_clk_get(unsigned int div)  	return pll_sysclk_mhz(DAVINCI_PLL_CNTRL0_BASE, div) * 1000000;  }  #endif -#endif /* CONFIG_DISPLAY_CPUINFO */  #endif /* !CONFIG_SOC_DA8XX */  /* diff --git a/include/configs/cam_enc_4xx.h b/include/configs/cam_enc_4xx.h index 14368dfe6..bca9841a1 100644 --- a/include/configs/cam_enc_4xx.h +++ b/include/configs/cam_enc_4xx.h @@ -264,7 +264,6 @@  #define CONFIG_POST	CONFIG_SYS_POST_MEMORY  #define _POST_WORD_ADDR	0x0 -#define CONFIG_DISPLAY_CPUINFO  #define CONFIG_DISPLAY_BOARDINFO  #define CONFIG_SYS_INIT_SP_ADDR		CONFIG_SPL_STACK diff --git a/include/configs/davinci_dm355evm.h b/include/configs/davinci_dm355evm.h index ddf673c84..8578730ba 100644 --- a/include/configs/davinci_dm355evm.h +++ b/include/configs/davinci_dm355evm.h @@ -26,7 +26,6 @@  #define CONFIG_SKIP_LOWLEVEL_INIT	/* U-Boot is a 3rd stage loader */  #define CONFIG_SYS_NO_FLASH		/* that is, no *NOR* flash */  #define CONFIG_SYS_CONSOLE_INFO_QUIET -#define CONFIG_DISPLAY_CPUINFO  /* SoC Configuration */  #define CONFIG_ARM926EJS				/* arm926ejs CPU */ diff --git a/include/configs/davinci_dm355leopard.h b/include/configs/davinci_dm355leopard.h index dc5b408a6..803e8578f 100644 --- a/include/configs/davinci_dm355leopard.h +++ b/include/configs/davinci_dm355leopard.h @@ -25,7 +25,6 @@  #define CONFIG_SKIP_LOWLEVEL_INIT	/* U-Boot is a 3rd stage loader */  #define CONFIG_SYS_NO_FLASH		/* that is, no *NOR* flash */  #define CONFIG_SYS_CONSOLE_INFO_QUIET -#define CONFIG_DISPLAY_CPUINFO  /* SoC Configuration */  #define CONFIG_ARM926EJS				/* arm926ejs CPU */ diff --git a/include/configs/davinci_dm6467Tevm.h b/include/configs/davinci_dm6467Tevm.h index b3a4e4434..f7c994eba 100644 --- a/include/configs/davinci_dm6467Tevm.h +++ b/include/configs/davinci_dm6467Tevm.h @@ -23,7 +23,6 @@  /* Spectrum Digital TMS320DM6467T EVM board */  #define DAVINCI_DM6467EVM  #define DAVINCI_DM6467TEVM -#define CONFIG_DISPLAY_CPUINFO  #define CONFIG_SYS_USE_NAND  #define CONFIG_SYS_NAND_SMALLPAGE diff --git a/include/configs/davinci_dm6467evm.h b/include/configs/davinci_dm6467evm.h index c9a0cd1da..ddfd3ed39 100644 --- a/include/configs/davinci_dm6467evm.h +++ b/include/configs/davinci_dm6467evm.h @@ -22,7 +22,6 @@  /* Spectrum Digital TMS320DM6467 EVM board */  #define DAVINCI_DM6467EVM -#define CONFIG_DISPLAY_CPUINFO  #define CONFIG_SYS_USE_NAND  #define CONFIG_SYS_NAND_SMALLPAGE diff --git a/include/configs/davinci_dvevm.h b/include/configs/davinci_dvevm.h index c0525173e..a2aa3c3fc 100644 --- a/include/configs/davinci_dvevm.h +++ b/include/configs/davinci_dvevm.h @@ -51,7 +51,6 @@  #define DV_EVM  #define CONFIG_SYS_NAND_SMALLPAGE  #define CONFIG_SYS_USE_NAND -#define CONFIG_DISPLAY_CPUINFO  /*===================*/  /* SoC Configuration */  /*===================*/ diff --git a/include/configs/davinci_schmoogie.h b/include/configs/davinci_schmoogie.h index f4ddbeacc..e0a8ee9a9 100644 --- a/include/configs/davinci_schmoogie.h +++ b/include/configs/davinci_schmoogie.h @@ -26,7 +26,6 @@  #define SCHMOOGIE  #define CONFIG_SYS_NAND_LARGEPAGE  #define CONFIG_SYS_USE_NAND -#define CONFIG_DISPLAY_CPUINFO  #define MACH_TYPE_SCHMOOGIE 1255  #define CONFIG_MACH_TYPE MACH_TYPE_SCHMOOGIE diff --git a/include/configs/davinci_sffsdr.h b/include/configs/davinci_sffsdr.h index 0c653915b..a2da65a76 100644 --- a/include/configs/davinci_sffsdr.h +++ b/include/configs/davinci_sffsdr.h @@ -28,7 +28,6 @@  #define CONFIG_SYS_NAND_LARGEPAGE  #define CONFIG_SYS_USE_NAND  #define CONFIG_SYS_USE_DSPLINK		/* don't power up the DSP. */ -#define CONFIG_DISPLAY_CPUINFO  /* SoC Configuration */  #define CONFIG_ARM926EJS			/* arm926ejs CPU core */  #define CONFIG_SYS_TIMERBASE		0x01c21400	/* use timer 0 */ diff --git a/include/configs/davinci_sonata.h b/include/configs/davinci_sonata.h index fc4d8ecea..db4796624 100644 --- a/include/configs/davinci_sonata.h +++ b/include/configs/davinci_sonata.h @@ -51,7 +51,6 @@  #define SONATA_BOARD  #define CONFIG_SYS_NAND_SMALLPAGE  #define CONFIG_SYS_USE_NOR -#define CONFIG_DISPLAY_CPUINFO  #define MACH_TYPE_SONATA 1254  #define CONFIG_MACH_TYPE MACH_TYPE_SONATA  /*===================*/ diff --git a/include/configs/enbw_cmc.h b/include/configs/enbw_cmc.h index 01390b1db..9cffaee11 100644 --- a/include/configs/enbw_cmc.h +++ b/include/configs/enbw_cmc.h @@ -50,7 +50,6 @@  #define CONFIG_ARCH_CPU_INIT  #define CONFIG_DA8XX_GPIO  #define CONFIG_HOSTNAME		enbw_cmc -#define CONFIG_DISPLAY_CPUINFO  #define MACH_TYPE_ENBW_CMC	3585  #define CONFIG_MACH_TYPE	MACH_TYPE_ENBW_CMC |