socsvn commit: r238334 - in soc2012/aleek/beaglexm-armv6: sys/arm/conf usr.bin/make

[aleek at FreeBSD.org]

Author: aleek
Date: Tue Jun 26 13:07:43 2012
New Revision: 238334
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=238334

Log:
  patched file usr.bin/make/Makefile and added MFS root for beagleboard kernel

Modified:
  soc2012/aleek/beaglexm-armv6/sys/arm/conf/BEAGLEBOARD-XM
  soc2012/aleek/beaglexm-armv6/usr.bin/make/Makefile

Modified: soc2012/aleek/beaglexm-armv6/sys/arm/conf/BEAGLEBOARD-XM
==============================================================================
--- soc2012/aleek/beaglexm-armv6/sys/arm/conf/BEAGLEBOARD-XM	Tue Jun 26 12:51:54 2012	(r238333)
+++ soc2012/aleek/beaglexm-armv6/sys/arm/conf/BEAGLEBOARD-XM	Tue Jun 26 13:07:43 2012	(r238334)
@@ -81,7 +81,8 @@
 #device		mmcsd			# mmc/sd flash cards
 
 # Boot device is 2nd slice on MMC/SD card
-options		ROOTDEVNAME=\"ufs:mmcsd0s2\"
+#options		ROOTDEVNAME=\"ufs:mmcsd0s2\"
+
 
 # Console and misc
 device		uart
@@ -126,3 +127,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\"

Modified: soc2012/aleek/beaglexm-armv6/usr.bin/make/Makefile
==============================================================================
--- soc2012/aleek/beaglexm-armv6/usr.bin/make/Makefile	Tue Jun 26 12:51:54 2012	(r238333)
+++ soc2012/aleek/beaglexm-armv6/usr.bin/make/Makefile	Tue Jun 26 13:07:43 2012	(r238334)
@@ -10,7 +10,8 @@
 	lst.c main.c make.c parse.c proc.c shell.c str.c suff.c targ.c	\
 	util.c var.c
 
-.if ${MK_SHARED_TOOLCHAIN} == "no"
+#.if ${MK_SHARED_TOOLCHAIN} == "no"
+.if !defined(MK_SHARED_TOOLCHAIN) || ${MK_SHARED_TOOLCHAIN} == "no"
 NO_SHARED?=	YES
 .endif