summaryrefslogtreecommitdiff
path: root/arch/arm/imx-common/cpu.c
diff options
context:
space:
mode:
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>2013-01-14 17:00:02 +0100
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2013-01-14 17:00:02 +0100
commita17617d6553369ba72c080128ed8d0b0c33dfc89 (patch)
treec8903ddc48e628192c56cc95667f702fd1d77c6e /arch/arm/imx-common/cpu.c
parent1199c377cf14c240b903e351ab02b3b2cd3800c6 (diff)
parent11d80af4876b609832856853b63d06a1011bccf1 (diff)
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.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/arm/imx-common/cpu.c b/arch/arm/imx-common/cpu.c
index 50819085550..a9b86c11732 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;