Add a parameter for process boot disk create.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@7933 6f19259b-4bc3-4df7-8a09-765794883524

1 files changed, 46 insertions, 70 deletions

diff --git a/DuetPkg/CreateBootDisk.sh b/DuetPkg/CreateBootDisk.sh
index 70b534f617..4e8f116c09 100644
--- a/DuetPkg/CreateBootDisk.sh
+++ b/DuetPkg/CreateBootDisk.sh
@@ -1,7 +1,7 @@
 
 # Set up environment at fisrt.
-export BASETOOLS_DIR=$WORKSPACE_TOOLS_PATH/Bin/Win32
-export BUILD_DIR=$WORKSPACE/Conf/BaseToolsSource/Source/C/bin
+export BUILD_DIR=$WORKSPACE/Build/DuetPkg/DEBUG_UNIXGCC
+export BASETOOLS_DIR=$WORKSPACE/Conf/BaseToolsSource/Source/C/bin
 export DISK_LABEL=DUET
 
 if [ \
@@ -11,92 +11,101 @@ if [ \
      "$*" = "--help" \
    ]
 then
-	echo "Usage: CreateBootDisk [usb|floppy|ide] DiskNumber [FAT12|FAT16|FAT32]"
+	echo "Usage: CreateBootDisk [usb|floppy|ide] MediaPath DevicePath [FAT12|FAT16|FAT32]"
+	echo "e.g. : CreateBootDisk floppy /media/floppy0 /dev/fd0 FAT12 "
 	exit 1
 fi
 
-export EFI_BOOT_DISK=$2
+export EFI_BOOT_MEDIA=$2
+export EFI_BOOT_DEVICE=$3
 
 case "$1" in
 	floppy)
-		if [ "$3" = FAT12 ]
+		if [ "$4" = FAT12 ]
 		then
 			echo Start to create floppy boot disk ...
-			echo Format $EFI_BOOT_DISK ...
+			echo Format $EFI_BOOT_MEDIA ...
 			## Do some format things , not done yet.
 			echo Create boot sector ...
 			## Linux version of GenBootSector has not pass build yet.
-			$BASETOOLS_DIR/Genbootsector -i $EFI_BOOT_DISK -o FDBs.com
-			$BASETOOLS_DIR/Bootsectimage -g FDBs.com $BUILD_DIR/IA32/DuetPkg/BootSector/BootSector/OUTPUT/Bootsect.com -f
-			$BASETOOLS_DIR/Genbootsector -o $EFI_BOOT_DISK -i $BUILD_DIR/IA32/DuetPkg/BootSector/BootSector/OUTPUT/Bootsect.com
+			$BASETOOLS_DIR/GnuGenBootSector -i $EFI_BOOT_DEVICE -o FDBs.com
+			echo aaa
+			$BASETOOLS_DIR/BootSectImage -g FDBs.com $BUILD_DIR/IA32/DuetPkg/BootSector/BootSector/OUTPUT/bootsect.com -f
+			echo bbb
+			$BASETOOLS_DIR/GnuGenBootSector -o $EFI_BOOT_DEVICE -i $BUILD_DIR/IA32/DuetPkg/BootSector/BootSector/OUTPUT/bootsect.com
+			echo ccc
 	
-			cp $BUILD_DIR/FV/EfiLdr $EFI_BOOT_DISK
-			cat $WORKSPACE/EdkShellBinPkg/bin/ia32/Shell.efi > $EFI_BOOT_DISK/efi/boot/bootia32.efi 
+			cp $BUILD_DIR/FV/Efildr $EFI_BOOT_MEDIA
+	
+			mkdir -p $EFI_BOOT_MEDIA/efi
+			mkdir -p $EFI_BOOT_MEDIA/efi/boot
+
+			cp $WORKSPACE/EdkShellBinPkg/Bin/Ia32/Shell.efi $EFI_BOOT_MEDIA/efi/boot/bootia32.efi 
 	
 			echo Done.
 		else
-			echo "Wrong FAT type $3 for floppy!"
+			echo "Wrong FAT type $4 for floppy!"
 			exit
 		fi
 		;;
 
 	file) # CreateFile
-		if [ "$3" = FAT12 ]
+		if [ "$4" = FAT12 ]
 			then
 			echo "Start to create file boot disk ..."
 			echo Create boot sector ...	
 	
 			## Linux version of GenBootSector has not pass build yet.
-			$BASETOOLS_DIR/Genbootsector -i $EFI_BOOT_DISK -o FDBs.com
-			$BASETOOLS_DIR/Bootsectimage -g FDBs.com $BUILD_DIR/IA32/DuetPkg/BootSector/BootSector/OUTPUT/Bootsect.com -f
-			$BASETOOLS_DIR/Genbootsector -o $EFI_BOOT_DISK -i $BUILD_DIR/IA32/DuetPkg/BootSector/BootSector/OUTPUT/Bootsect.com
+			$BASETOOLS_DIR/GnuGenBootSector -i $EFI_BOOT_MEDIA -o FDBs.com
+			$BASETOOLS_DIR/BootSectImage -g FDBs.com $BUILD_DIR/IA32/DuetPkg/BootSector/BootSector/OUTPUT/Bootsect.com -f
+			$BASETOOLS_DIR/GnuGenBootSector -o $EFI_BOOT_MEDIA -i $BUILD_DIR/IA32/DuetPkg/BootSector/BootSector/OUTPUT/Bootsect.com
 			echo Done.
 		else
-			echo "Wrong FAT type" $3 "for floppy!"
+			echo "Wrong FAT type" $4 "for floppy!"
 			exit
 		fi
 		;;
 
 	usb) # CreateUsb
 
-		if [ "$3" = FAT16 ]
+		if [ "$4" = FAT16 ]
 		then
-			if [ "$4" = step2 ]
+			if [ "$5" = step2 ]
 			then
-				cp $BUILD_DIR/FV/EfiLdr16 $EFI_BOOT_DISK
-				mkdir $EFI_BOOT_DISK/efi/boot
-				cp $WORKSPACE/EdkShellBinPkg/bin/ia32/Shell.efi $EFI_BOOT_DISK/efi/boot/bootia32.efi
+				cp $BUILD_DIR/FV/Efildr16 $EFI_BOOT_MEDIA
+				mkdir $EFI_BOOT_MEDIA/efi/boot
+				cp $WORKSPACE/EdkShellBinPkg/bin/ia32/Shell.efi $EFI_BOOT_MEDIA/efi/boot/bootia32.efi
 				echo "step2 Done!"
 			else
-				echo Format $EFI_BOOT_DISK ...
+				echo Format $EFI_BOOT_DEVICE ...
 				#Do format command.
 				echo Create boot sector ...
 				## Linux version of GenBootSector & Bootsectimage has not pass build yet.
-				$BASETOOLS_DIR/Genbootsector -i $EFI_BOOT_DISK -o UsbBs16.com
-				$BASETOOLS_DIR/Bootsectimage -g UsbBs16.com $BUILD_DIR/IA32/DuetPkg/BootSector/BootSector/OUTPUT/Bs16.com -f
-				$BASETOOLS_DIR/Genbootsector -o $EFI_BOOT_DISK -i $BUILD_DIR/IA32/DuetPkg/BootSector/BootSector/OUTPUT/Bs16.com
-				$BASETOOLS_DIR/Genbootsector -m -o $EFI_BOOT_DISK -i $BUILD_DIR/IA32/DuetPkg/BootSector/BootSector/OUTPUT/Mbr.com
+				$BASETOOLS_DIR/GnuGenBootSector -i $EFI_BOOT_DEVICE -o UsbBs16.com
+				$BASETOOLS_DIR/BootSectImage -g UsbBs16.com $BUILD_DIR/IA32/DuetPkg/BootSector/BootSector/OUTPUT/Bs16.com -f
+				$BASETOOLS_DIR/GnuGenBootSector -o $EFI_BOOT_DEVICE -i $BUILD_DIR/IA32/DuetPkg/BootSector/BootSector/OUTPUT/Bs16.com
+				$BASETOOLS_DIR/GnuGenBootSector -m -o $EFI_BOOT_DEVICE -i $BUILD_DIR/IA32/DuetPkg/BootSector/BootSector/OUTPUT/Mbr.com
 				echo Done.
 				echo PLEASE UNPLUG USB, THEN PLUG IT AGAIN TO DO STEP2!
 				exit 1
 			fi
-		elif [ "$3" = FAT32 ]
+		elif [ "$4" = FAT32 ]
 		then 
-			if [ "$4" = step2 ]
+			if [ "$5" = step2 ]
 			then
-				cp $BUILD_DIR/FV/EfiLdr20 $EFI_BOOT_DISK
-				mkdir $EFI_BOOT_DISK/efi/boot
-				cp $WORKSPACE/EdkShellBinPkg/bin/ia32/Shell.efi $EFI_BOOT_DISK/efi/boot/bootia32.efi
+				cp $BUILD_DIR/FV/Efildr20 $EFI_BOOT_MEDIA
+				mkdir $EFI_BOOT_MEDIA/efi/boot
+				cp $WORKSPACE/EdkShellBinPkg/bin/ia32/Shell.efi $EFI_BOOT_MEDIA/efi/boot/bootia32.efi
 				echo "step2 Done!"
 			else
-				echo Format $EFI_BOOT_DISK ...
+				echo Format $EFI_BOOT_DEVICE ...
 				#Do format command.
 				echo Create boot sector ...
 				## Linux version of GenBootSector & Bootsectimage has not pass build yet.
-				$BASETOOLS_DIR/Genbootsector -i $EFI_BOOT_DISK -o UsbBs32.com
-				$BASETOOLS_DIR/Bootsectimage -g UsbBs32.com $BUILD_DIR/IA32/DuetPkg/BootSector/BootSector/OUTPUT/Bs32.com -f
-				$BASETOOLS_DIR/Genbootsector -o $EFI_BOOT_DISK -i $BUILD_DIR/IA32/DuetPkg/BootSector/BootSector/OUTPUT/Bs32.com
-				$BASETOOLS_DIR/Genbootsector -m -o $EFI_BOOT_DISK -i $BUILD_DIR/IA32/DuetPkg/BootSector/BootSector/OUTPUT/Mbr.com
+				$BASETOOLS_DIR/GnuGenBootSector -i $EFI_BOOT_DEVICE -o UsbBs32.com
+				$BASETOOLS_DIR/BootSectImage -g UsbBs32.com $BUILD_DIR/IA32/DuetPkg/BootSector/BootSector/OUTPUT/Bs32.com -f
+				$BASETOOLS_DIR/GnuGenBootSector -o $EFI_BOOT_DEVICE -i $BUILD_DIR/IA32/DuetPkg/BootSector/BootSector/OUTPUT/Bs32.com
+				$BASETOOLS_DIR/GnuGenBootSector -m -o $EFI_BOOT_DEVICE -i $BUILD_DIR/IA32/DuetPkg/BootSector/BootSector/OUTPUT/Mbr.com
 				echo Done.
 				echo PLEASE UNPLUG USB, THEN PLUG IT AGAIN TO DO STEP2!
 				exit 1
@@ -116,36 +125,3 @@ case "$1" in
 
 esac
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-