socsvn commit: r238345 - in soc2012/aleek/beaglexm-armv6/sys/arm: conf ti/am37x

[aleek at FreeBSD.org]

Author: aleek
Date: Tue Jun 26 17:22:57 2012
New Revision: 238345
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=238345

Log:
  added root filesystem in mfs. Board is booting to prompt now

Modified:
  soc2012/aleek/beaglexm-armv6/sys/arm/conf/BEAGLEBOARD-XM
  soc2012/aleek/beaglexm-armv6/sys/arm/ti/am37x/am37x_gptimer_tc.c

Modified: soc2012/aleek/beaglexm-armv6/sys/arm/conf/BEAGLEBOARD-XM
==============================================================================
--- soc2012/aleek/beaglexm-armv6/sys/arm/conf/BEAGLEBOARD-XM	Tue Jun 26 17:10:28 2012	(r238344)
+++ soc2012/aleek/beaglexm-armv6/sys/arm/conf/BEAGLEBOARD-XM	Tue Jun 26 17:22:57 2012	(r238345)
@@ -57,8 +57,8 @@
 options		DDB			#Enable the kernel debugger
 options		INVARIANTS		#Enable calls of extra sanity checking
 options		INVARIANT_SUPPORT	#Extra sanity checks of internal structures, required by INVARIANTS
-options		WITNESS			#Enable checks to detect deadlocks and cycles
-options		WITNESS_SKIPSPIN	#Don't run witness on spinlocks for speed
+#options		WITNESS			#Enable checks to detect deadlocks and cycles
+#options		WITNESS_SKIPSPIN	#Don't run witness on spinlocks for speed
 #options	DIAGNOSTIC
 #options	DEBUG
 

Modified: soc2012/aleek/beaglexm-armv6/sys/arm/ti/am37x/am37x_gptimer_tc.c
==============================================================================
--- soc2012/aleek/beaglexm-armv6/sys/arm/ti/am37x/am37x_gptimer_tc.c	Tue Jun 26 17:10:28 2012	(r238344)
+++ soc2012/aleek/beaglexm-armv6/sys/arm/ti/am37x/am37x_gptimer_tc.c	Tue Jun 26 17:22:57 2012	(r238345)
@@ -467,7 +467,6 @@
 		sc->callback_data = data;
 		
 		/* Activate the interrupt */
-		printf( "bus_setup_intr(): %s:%d\n", __func__, __LINE__ );
 		if (bus_setup_intr(sc->sc_dev, sc->irq_res, 
 		                   INTR_TYPE_MISC | INTR_MPSAFE, NULL, omap3_gptimer_intr,
 						   (void*)sc, &sc->irq_h)) {
@@ -585,7 +584,6 @@
 	
 	
 	/* Attempt to activate the interrupt for the tick */
-		printf( "bus_setup_intr(): %s:%d\n", __func__, __LINE__ );
 	if (bus_setup_intr(sc->sc_dev, sc->irq_res, INTR_TYPE_CLK,
 	                   filter, NULL, NULL, &sc->irq_h)) {
 		device_printf(sc->sc_dev, "Error: failed to activate interrupt\n");
@@ -665,13 +663,13 @@
 	int32_t counts;
 	//uint32_t first, last;
 
-	if (g_omap3_gptimer_sc_tc == NULL) {
+	//if (g_omap3_gptimer_sc_tc == NULL) {
 		for (; usec > 0; usec--)
 			for (counts = 200; counts > 0; counts--)
 				/* Prevent gcc from optimizing  out the loop */
 				cpufunc_nullop();
 		return;
-	}
+	//}
 }
 
 static void
@@ -819,7 +817,7 @@
 	omap3_gptimer_tc.tc_frequency = timer_freq;
 	
 	/* Setup the time counter */
-	//tc_init(&omap3_gptimer_tc);
+	tc_init(&omap3_gptimer_tc);
 
 	/* Calibrate the delay loop */
 	omap3_calibrate_delay_loop(&omap3_gptimer_tc);