summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgonzo <gonzo@FreeBSD.org>2013-02-11 11:33:56 +0000
committergonzo <gonzo@FreeBSD.org>2013-02-11 11:33:56 +0000
commit3647f040d3f9d32573905dc01b99edcd0493cbf7 (patch)
treebe78147142a99d53bdb270b6e9d518d6d7e2fdaf
parentb841d961bdb65b88fa586cc5c52c50acda097cee (diff)
downloadFreeBSD-src-3647f040d3f9d32573905dc01b99edcd0493cbf7.zip
FreeBSD-src-3647f040d3f9d32573905dc01b99edcd0493cbf7.tar.gz
A10 reset mechanism is the same for all boards in this family so remove
redundant reset function implementation pointer. We might want to ressurect it later when support for other Allwinner chips is introduced.
-rw-r--r--sys/arm/allwinner/a10_machdep.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/sys/arm/allwinner/a10_machdep.c b/sys/arm/allwinner/a10_machdep.c
index 1ad9ea1..5282013 100644
--- a/sys/arm/allwinner/a10_machdep.c
+++ b/sys/arm/allwinner/a10_machdep.c
@@ -49,16 +49,16 @@ __FBSDID("$FreeBSD$");
#include <dev/fdt/fdt_common.h>
+#include <arm/allwinner/a10_wdog.h>
+
/* Start of address space used for bootstrap map */
#define DEVMAP_BOOTSTRAP_MAP_START 0xE0000000
-void (*a10_cpu_reset)(void);
vm_offset_t
initarm_lastaddr(void)
{
- a10_cpu_reset = NULL;
return (DEVMAP_BOOTSTRAP_MAP_START - ARM_NOCACHE_KVA_SIZE);
}
@@ -113,10 +113,7 @@ bus_dma_get_range_nb(void)
void
cpu_reset()
{
- if (a10_cpu_reset)
- (*a10_cpu_reset)();
- else
- printf("no cpu_reset implementation\n");
+ a10wd_watchdog_reset();
printf("Reset failed!\n");
while (1);
}
OpenPOWER on IntegriCloud