Skip site navigation (1)Skip section navigation (2) 
Date:      Tue, 10 Jul 2012 11:21:03 +0000
From:      aleek@FreeBSD.org
To:        svn-soc-all@FreeBSD.org
Subject:   socsvn commit: r239237 - in soc2012/aleek/beaglexm-armv6/sys: arm/conf kern
Message-ID:  <20120710112103.4EA08106566C@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: aleek
Date: Tue Jul 10 11:21:02 2012
New Revision: 239237
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=239237

Log:
  revering sys/kern/init_main.c. BeagleBoard-xM boots FreeBSD from SD card

Modified:
  soc2012/aleek/beaglexm-armv6/sys/arm/conf/BEAGLEBOARD-XM
  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	Tue Jul 10 08:31:28 2012	(r239236)
+++ soc2012/aleek/beaglexm-armv6/sys/arm/conf/BEAGLEBOARD-XM	Tue Jul 10 11:21:02 2012	(r239237)
@@ -79,10 +79,10 @@
 
 # MMC/SD/SDIO card slot support
 device		mmc			# mmc/sd bus
-device		mmcsd			# mmc/sd flash cards
+device		mmcsd		# mmc/sd flash cards
 
 # Boot device is 2nd slice on MMC/SD card
-#options		ROOTDEVNAME=\"msdosfs:mmcsd0s2\"
+options		ROOTDEVNAME=\"msdosfs:mmcsd0s2\"
 
 
 # Console and misc
@@ -128,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/kern/init_main.c
==============================================================================
--- soc2012/aleek/beaglexm-armv6/sys/kern/init_main.c	Tue Jul 10 08:31:28 2012	(r239236)
+++ soc2012/aleek/beaglexm-armv6/sys/kern/init_main.c	Tue Jul 10 11:21:02 2012	(r239237)
@@ -709,7 +709,6 @@
 			printf("start_init: trying %.*s\n", (int)(next - path),
 			    path);
 			
-		printf( "%s:%d\n", __FUNCTION__, __LINE__ );
 		/*
 		 * Move out the boot flag argument.
 		 */
@@ -720,7 +719,6 @@
 			(void)subyte(--ucp, 's');
 			options = 1;
 		}
-		printf( "%s:%d\n", __FUNCTION__, __LINE__ );
 #ifdef notyet
                 if (boothowto & RB_FASTBOOT) {
 			(void)subyte(--ucp, 'f');
@@ -733,7 +731,6 @@
 		options = 1;
 #endif
 
-		printf( "%s:%d\n", __FUNCTION__, __LINE__ );
 		if (options == 0)
 			(void)subyte(--ucp, '-');
 		(void)subyte(--ucp, '-');		/* leading hyphen */
@@ -747,7 +744,6 @@
 			(void)subyte(--ucp, *s);
 		arg0 = ucp;
 
-		printf( "%s:%d\n", __FUNCTION__, __LINE__ );
 		/*
 		 * Move out the arg pointers.
 		 */
@@ -756,7 +752,6 @@
 		(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.
 		 */
@@ -764,7 +759,6 @@
 		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.
@@ -776,11 +770,9 @@
 			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");

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120710112103.4EA08106566C>