diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-01-14 17:00:02 +0100 | 
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-01-14 17:00:02 +0100 | 
| commit | a17617d6553369ba72c080128ed8d0b0c33dfc89 (patch) | |
| tree | c8903ddc48e628192c56cc95667f702fd1d77c6e /arch/arm/imx-common/cpu.c | |
| parent | 1199c377cf14c240b903e351ab02b3b2cd3800c6 (diff) | |
| parent | 11d80af4876b609832856853b63d06a1011bccf1 (diff) | |
| download | olio-uboot-2014.01-a17617d6553369ba72c080128ed8d0b0c33dfc89.tar.xz olio-uboot-2014.01-a17617d6553369ba72c080128ed8d0b0c33dfc89.zip | |
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
Diffstat (limited to 'arch/arm/imx-common/cpu.c')
| -rw-r--r-- | arch/arm/imx-common/cpu.c | 5 | 
1 files changed, 0 insertions, 5 deletions
| diff --git a/arch/arm/imx-common/cpu.c b/arch/arm/imx-common/cpu.c index 508190855..a9b86c117 100644 --- a/arch/arm/imx-common/cpu.c +++ b/arch/arm/imx-common/cpu.c @@ -175,11 +175,6 @@ int cpu_mmc_init(bd_t *bis)  }  #endif -void reset_cpu(ulong addr) -{ -	__raw_writew(4, WDOG1_BASE_ADDR); -} -  u32 get_ahb_clk(void)  {  	struct mxc_ccm_reg *imx_ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR; |