svn commit: r231182 - projects/armv6/sys/arm/ti

[Oleksandr Tymoshenko]

Author: gonzo
Date: Wed Feb  8 06:15:38 2012
New Revision: 231182
URL: http://svn.freebsd.org/changeset/base/231182

Log:
  Provide placeholder for per-board reset function implementation
  
  - Minor empty lines clean-up

Modified:
  projects/armv6/sys/arm/ti/omapvar.h
  projects/armv6/sys/arm/ti/ti_machdep.c

Modified: projects/armv6/sys/arm/ti/omapvar.h
==============================================================================
--- projects/armv6/sys/arm/ti/omapvar.h	Wed Feb  8 05:03:04 2012	(r231181)
+++ projects/armv6/sys/arm/ti/omapvar.h	Wed Feb  8 06:15:38 2012	(r231182)
@@ -62,6 +62,8 @@
 
 
 extern struct bus_space omap_bs_tag;
+/* board-dependent reset function implementation */
+extern void (*ti_cpu_reset)(void);
 
 unsigned int
 omap_sdram_size(void);
@@ -97,9 +99,6 @@ omap_teardown_intr(device_t dev, device_
 #define OMAP_CPUID_OMAP4430_ES1_2   0xB852
 #define OMAP_CPUID_OMAP4430         0xB95C
 
-
-
-
 /**
  *	struct omap_softc
  *
@@ -114,7 +113,6 @@ omap_cpu_is(uint32_t cpu)
 	return ((omap3_chip_id & 0xffff) == cpu);
 }
 
-
 /**
  *	struct omap_softc
  *
@@ -131,7 +129,6 @@ struct omap_softc {
 	bus_dma_tag_t      sc_dmat;
 };
 
-
 struct omap_mem_range {
 	bus_addr_t  base;
 	bus_size_t  size;
@@ -152,14 +149,8 @@ struct omap_cpu_dev {
 	int                   irqs[16];
 };
 
-
-
 struct omap_ivar {
 	struct resource_list resources;
 };
 
-
-
-
-
 #endif /* _OMAP3VAR_H_ */

Modified: projects/armv6/sys/arm/ti/ti_machdep.c
==============================================================================
--- projects/armv6/sys/arm/ti/ti_machdep.c	Wed Feb  8 05:03:04 2012	(r231181)
+++ projects/armv6/sys/arm/ti/ti_machdep.c	Wed Feb  8 06:15:38 2012	(r231182)
@@ -155,6 +155,7 @@ static void print_kernel_section_addr(vo
 
 static void physmap_init(void);
 static int platform_devmap_init(void);
+void (*ti_cpu_reset)(void);
 
 static char *
 kenv_next(char *cp)
@@ -210,6 +211,7 @@ physmap_init(void)
 
 	phys_kernelend = KERNPHYSADDR + (virtual_avail - KERNVIRTADDR);
 	kernload = KERNPHYSADDR;
+	ti_cpu_reset = NULL;
 
 	/*
 	 * Remove kernel physical address range from avail
@@ -640,7 +642,10 @@ bus_dma_get_range_nb(void)
 void
 cpu_reset()
 {
-//	omap_prcm_reset();
+	if (ti_cpu_reset)
+		(*ti_cpu_reset)();
+	else
+		printf("no cpu_reset implementation\n");
 	printf("Reset failed!\n");
 	while (1);
 }