X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=DuetPkg%2FCreateBootDisk.sh;h=bfe1abd83e6872ff533d3dad5126aff7bfabacd3;hp=4e8f116c09b49c9cefd5992e319dc04828eb82ef;hb=6dec88649aefe8c302d32871adfe791407911788;hpb=536c563dd902c17bd5ae98083687d4196ae28317

diff --git a/DuetPkg/CreateBootDisk.sh b/DuetPkg/CreateBootDisk.sh
old mode 100644
new mode 100755
index 4e8f116c09..bfe1abd83e
--- a/DuetPkg/CreateBootDisk.sh
+++ b/DuetPkg/CreateBootDisk.sh
@@ -1,8 +1,11 @@
+#! /bin/sh
 
 # Set up environment at fisrt.
 export BUILD_DIR=$WORKSPACE/Build/DuetPkg/DEBUG_UNIXGCC
 export BASETOOLS_DIR=$WORKSPACE/Conf/BaseToolsSource/Source/C/bin
+export BOOTSECTOR_BIN_DIR=$WORKSPACE/DuetPkg/BootSector/bin
 export DISK_LABEL=DUET
+export PROCESS_MARK=TRUE
 
 if [ \
      -z "$*" -o \
@@ -11,117 +14,142 @@ if [ \
      "$*" = "--help" \
    ]
 then
-	echo "Usage: CreateBootDisk [usb|floppy|ide] MediaPath DevicePath [FAT12|FAT16|FAT32]"
-	echo "e.g. : CreateBootDisk floppy /media/floppy0 /dev/fd0 FAT12 "
-	exit 1
+	echo "Usage: CreateBootDisk [usb|floppy|ide] MediaPath DevicePath [FAT12|FAT16|FAT32] [IA32|X64]"
+	echo "e.g. : CreateBootDisk floppy /media/floppy0 /dev/fd0 FAT12 IA32"
+	PROCESS_MARK=FALSE
 fi
 
 export EFI_BOOT_MEDIA=$2
 export EFI_BOOT_DEVICE=$3
 
-case "$1" in
-	floppy)
-		if [ "$4" = FAT12 ]
-		then
-			echo Start to create floppy 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/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_MEDIA
+if [ "$PROCESS_MARK" = TRUE ]
+then
+	case "$1" in
+		floppy)
+			if [ "$4" = FAT12 ]
+			then
+				echo Start to create floppy boot disk ...
+				echo Format $EFI_BOOT_MEDIA ...
+				## Format floppy disk
+				umount $EFI_BOOT_MEDIA
+				mkfs.msdos $EFI_BOOT_DEVICE
+				mount $EFI_BOOT_DEVICE $EFI_BOOT_MEDIA
+				echo Create boot sector ...
+				## Linux version of GenBootSector has not pass build yet.
+				$BASETOOLS_DIR/GnuGenBootSector -i $EFI_BOOT_DEVICE -o FDBs.com
+				$BASETOOLS_DIR/BootSectImage -g FDBs.com $BOOTSECTOR_BIN_DIR/bootsect.com -f
+				$BASETOOLS_DIR/GnuGenBootSector -o $EFI_BOOT_DEVICE -i $BOOTSECTOR_BIN_DIR/bootsect.com
 	
-			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 
+				cp $BUILD_DIR/FV/Efildr $EFI_BOOT_MEDIA
 	
-			echo Done.
-		else
-			echo "Wrong FAT type $4 for floppy!"
-			exit
-		fi
-		;;
+				mkdir -p $EFI_BOOT_MEDIA/efi
+				mkdir -p $EFI_BOOT_MEDIA/efi/boot
+				if [ "$5" = IA32 ]
+				then
+					cp $WORKSPACE/EdkShellBinPkg/MinimumShell/Ia32/Shell.efi $EFI_BOOT_MEDIA/efi/boot/bootia32.efi 
+				else
+					if [ "$5" = X64 ]
+					then
+						cp $WORKSPACE/EdkShellBinPkg/MinimumShell/X64/Shell.efi $EFI_BOOT_MEDIA/efi/boot/bootx64.efi 
+					else
+						echo Wrong Arch!
+					fi
+				fi
+				echo Done.
+			else
+				echo "Wrong FAT type $4 for floppy!"
+			fi
+			;;
 
-	file) # CreateFile
-		if [ "$4" = FAT12 ]
-			then
-			echo "Start to create file boot disk ..."
-			echo Create boot sector ...	
+		file) # CreateFile
+			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/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" $4 "for floppy!"
-			exit
-		fi
-		;;
+				## Linux version of GenBootSector has not pass build yet.
+				$BASETOOLS_DIR/GnuGenBootSector -i $EFI_BOOT_MEDIA -o FDBs.com
+				$BASETOOLS_DIR/BootSectImage -g FDBs.com $BOOTSECTOR_BIN_DIR/bootsect.com -f
+				$BASETOOLS_DIR/GnuGenBootSector -o $EFI_BOOT_MEDIA -i $BOOTSECTOR_BIN_DIR/bootsect.com
+				echo Done.
+			else
+				echo "Wrong FAT type" $4 "for floppy!"
+			fi
+			;;
 
-	usb) # CreateUsb
+		usb) # CreateUsb
 
-		if [ "$4" = FAT16 ]
-		then
-			if [ "$5" = step2 ]
+			if [ "$4" = FAT16 ]
 			then
-				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!"
+				if [ "$6" = step2 ]
+				then
+					cp $BUILD_DIR/FV/Efildr16 $EFI_BOOT_MEDIA
+					mkdir $EFI_BOOT_MEDIA/efi/boot
+					if [ "$5" = IA32 ]
+					then
+						cp $WORKSPACE/EdkShellBinPkg/MinimumShell/Ia32/Shell.efi $EFI_BOOT_MEDIA/efi/boot/bootia32.efi 
+					else
+						if [ "$5" = X64 ]
+						then
+							cp $WORKSPACE/EdkShellBinPkg/MinimumShell/X64/Shell.efi $EFI_BOOT_MEDIA/efi/boot/bootx64.efi 
+						else
+							echo Wrong Arch!
+						fi
+					fi
+					echo "step2 Done!"
+				else
+					echo Format $EFI_BOOT_DEVICE ...
+					#Do format command.
+					echo Create boot sector ...
+					## Linux version of GenBootSector & Bootsectimage has not pass build yet.
+					$BASETOOLS_DIR/GnuGenBootSector -i $EFI_BOOT_DEVICE -o UsbBs16.com
+					$BASETOOLS_DIR/BootSectImage -g UsbBs16.com $BOOTSECTOR_BIN_DIR/bs16.com -f
+					$BASETOOLS_DIR/GnuGenBootSector -o $EFI_BOOT_DEVICE -i $BOOTSECTOR_BIN_DIR/bs16.com
+					$BASETOOLS_DIR/GnuGenBootSector -m -o $EFI_BOOT_DEVICE -i $BOOTSECTOR_BIN_DIR/Mbr.com
+					echo Done.
+					echo PLEASE UNPLUG USB, THEN PLUG IT AGAIN TO DO STEP2!
+				fi
+			elif [ "$4" = FAT32 ]
+			then 
+				if [ "$6" = step2 ]
+				then
+					cp $BUILD_DIR/FV/Efildr20 $EFI_BOOT_MEDIA
+					mkdir $EFI_BOOT_MEDIA/efi/boot
+					if [ "$5" = IA32 ]
+					then
+						cp $WORKSPACE/EdkShellBinPkg/MinimumShell/Ia32/Shell.efi $EFI_BOOT_MEDIA/efi/boot/bootia32.efi 
+					else
+						if [ "$5" = X64 ]
+						then
+							cp $WORKSPACE/EdkShellBinPkg/MinimumShell/X64/Shell.efi $EFI_BOOT_MEDIA/efi/boot/bootx64.efi 
+						else
+							echo Wrong Arch!
+						fi
+					fi
+					echo "step2 Done!"
+				else
+					echo Format $EFI_BOOT_DEVICE ...
+					#Do format command.
+					echo Create boot sector ...
+					## Linux version of GenBootSector & Bootsectimage has not pass build yet.
+					$BASETOOLS_DIR/GnuGenBootSector -i $EFI_BOOT_DEVICE -o UsbBs32.com
+					$BASETOOLS_DIR/BootSectImage -g UsbBs32.com $BOOTSECTOR_BIN_DIR/bs32.com -f
+					$BASETOOLS_DIR/GnuGenBootSector -o $EFI_BOOT_DEVICE -i $BOOTSECTOR_BIN_DIR/bs32.com
+					$BASETOOLS_DIR/GnuGenBootSector -m -o $EFI_BOOT_DEVICE -i $BOOTSECTOR_BIN_DIR/Mbr.com
+					echo Done.
+					echo PLEASE UNPLUG USB, THEN PLUG IT AGAIN TO DO STEP2!
+				fi			
 			else
-				echo Format $EFI_BOOT_DEVICE ...
-				#Do format command.
-				echo Create boot sector ...
-				## Linux version of GenBootSector & Bootsectimage has not pass build yet.
-				$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
+				echo "Wrong FAT type $1 for floppy!"
 			fi
-		elif [ "$4" = FAT32 ]
-		then 
-			if [ "$5" = step2 ]
-			then
-				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_DEVICE ...
-				#Do format command.
-				echo Create boot sector ...
-				## Linux version of GenBootSector & Bootsectimage has not pass build yet.
-				$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
-			fi			
-		else
-			echo "Wrong FAT type $1 for floppy!"
-		fi
 	
-		;;
+			;;
 
-	ide) # CreateIde
-	exit 1
-	;;
-	*)
-	echo "Arg1 should be [floopy | file | usb | ide] !"
-	exit 1
-
-esac
+		ide) # CreateIde
+		echo "Not support yet!"
+		;;
+		*)
+		echo "Arg1 should be [floppy | file | usb | ide] !"
 
+	esac
+fi