socsvn commit: r239187 - in soc2012/aleek/beaglexm-armv6/sys:
arm/conf arm/ti kern
aleek at FreeBSD.org
aleek at FreeBSD.org
Mon Jul 9 16:14:52 UTC 2012
Author: aleek
Date: Mon Jul 9 16:14:50 2012
New Revision: 239187
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=239187
Log:
trying to find bug in mmc
Modified:
soc2012/aleek/beaglexm-armv6/sys/arm/conf/BEAGLEBOARD-XM
soc2012/aleek/beaglexm-armv6/sys/arm/ti/ti_machdep.c
soc2012/aleek/beaglexm-armv6/sys/arm/ti/ti_mmchs.c
soc2012/aleek/beaglexm-armv6/sys/kern/init_main.c
Modified: soc2012/aleek/beaglexm-armv6/sys/arm/conf/BEAGLEBOARD-XM
==============================================================================
--- soc2012/aleek/beaglexm-armv6/sys/arm/conf/BEAGLEBOARD-XM Mon Jul 9 15:44:35 2012 (r239186)
+++ soc2012/aleek/beaglexm-armv6/sys/arm/conf/BEAGLEBOARD-XM Mon Jul 9 16:14:50 2012 (r239187)
@@ -59,8 +59,9 @@
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 DIAGNOSTIC
-#options DEBUG
+options DIAGNOSTIC
+options DEBUG
+
# NFS support
#options NFSCL
@@ -81,7 +82,7 @@
device mmcsd # mmc/sd flash cards
# Boot device is 2nd slice on MMC/SD card
-options ROOTDEVNAME=\"ufs:mmcsd0s2\"
+#options ROOTDEVNAME=\"msdosfs:mmcsd0s2\"
# Console and misc
@@ -127,7 +128,7 @@
options FDT_DTB_STATIC
makeoptions FDT_DTS_FILE=beagleboardxm.dts
-#options MD_ROOT
-#options MD_ROOT_SIZE=8192
-#makeoptions MFS_IMAGE=/home/alek/beaglexm-armv6/arm.ramfs
-#options ROOTDEVNAME=\"ufs:md0\"
+options MD_ROOT
+options MD_ROOT_SIZE=8192
+makeoptions MFS_IMAGE=/home/alek/beaglexm-armv6/arm.ramfs
+options ROOTDEVNAME=\"ufs:md0\"
Modified: soc2012/aleek/beaglexm-armv6/sys/arm/ti/ti_machdep.c
==============================================================================
--- soc2012/aleek/beaglexm-armv6/sys/arm/ti/ti_machdep.c Mon Jul 9 15:44:35 2012 (r239186)
+++ soc2012/aleek/beaglexm-armv6/sys/arm/ti/ti_machdep.c Mon Jul 9 16:14:50 2012 (r239187)
@@ -334,7 +334,7 @@
u_int l1pagetable;
int i = 0, j = 0;
- arm_early_puts( "BeagleBoard-XM revC FreeBSD hababababa booting...\n" );
+ arm_early_puts( "BeagleBoard-XM revC FreeBSD booting...\n" );
kmdp = NULL;
lastaddr = 0;
@@ -346,6 +346,8 @@
set_cpufuncs();
arm_early_puts( "done!\n" );
+ bootverbose = 1;
+
/*
* Mask metadata pointer: it is supposed to be on page boundary. If
* the first argument (mdp) doesn't point to a valid address the
Modified: soc2012/aleek/beaglexm-armv6/sys/arm/ti/ti_mmchs.c
==============================================================================
--- soc2012/aleek/beaglexm-armv6/sys/arm/ti/ti_mmchs.c Mon Jul 9 15:44:35 2012 (r239186)
+++ soc2012/aleek/beaglexm-armv6/sys/arm/ti/ti_mmchs.c Mon Jul 9 16:14:50 2012 (r239187)
@@ -91,6 +91,7 @@
#include <arm/ti/twl/twl.h>
#include <arm/ti/twl/twl_vreg.h>
+
#ifdef DEBUG
#define ti_mmchs_dbg(sc, fmt, args...) \
device_printf((sc)->sc_dev, fmt, ## args);
Modified: soc2012/aleek/beaglexm-armv6/sys/kern/init_main.c
==============================================================================
--- soc2012/aleek/beaglexm-armv6/sys/kern/init_main.c Mon Jul 9 15:44:35 2012 (r239186)
+++ soc2012/aleek/beaglexm-armv6/sys/kern/init_main.c Mon Jul 9 16:14:50 2012 (r239187)
@@ -709,6 +709,7 @@
printf("start_init: trying %.*s\n", (int)(next - path),
path);
+ printf( "%s:%d\n", __FUNCTION__, __LINE__ );
/*
* Move out the boot flag argument.
*/
@@ -719,6 +720,7 @@
(void)subyte(--ucp, 's');
options = 1;
}
+ printf( "%s:%d\n", __FUNCTION__, __LINE__ );
#ifdef notyet
if (boothowto & RB_FASTBOOT) {
(void)subyte(--ucp, 'f');
@@ -731,6 +733,7 @@
options = 1;
#endif
+ printf( "%s:%d\n", __FUNCTION__, __LINE__ );
if (options == 0)
(void)subyte(--ucp, '-');
(void)subyte(--ucp, '-'); /* leading hyphen */
@@ -744,6 +747,7 @@
(void)subyte(--ucp, *s);
arg0 = ucp;
+ printf( "%s:%d\n", __FUNCTION__, __LINE__ );
/*
* Move out the arg pointers.
*/
@@ -752,6 +756,7 @@
(void)suword((caddr_t)--uap, (long)(intptr_t)arg1);
(void)suword((caddr_t)--uap, (long)(intptr_t)arg0);
+ printf( "%s:%d\n", __FUNCTION__, __LINE__ );
/*
* Point at the arguments.
*/
@@ -759,6 +764,7 @@
args.argv = uap;
args.envv = NULL;
+ printf( "%s:%d\n", __FUNCTION__, __LINE__ );
/*
* Now try to exec the program. If can't for any reason
* other than it doesn't exist, complain.
@@ -770,9 +776,11 @@
mtx_unlock(&Giant);
return;
}
+ printf( "%s:%d\n", __FUNCTION__, __LINE__ );
if (error != ENOENT)
printf("exec %.*s: error %d\n", (int)(next - path),
path, error);
+ printf( "%s:%d\n", __FUNCTION__, __LINE__ );
}
printf("init: not found in path %s\n", init_path);
panic("no init");
More information about the svn-soc-all
mailing list