X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=DuetPkg%2FCreateBootDisk.sh;h=bfe1abd83e6872ff533d3dad5126aff7bfabacd3;hb=c943ee03368202540a841e77b21da2c09406a1ac;hp=faa9032cc39bf654d594625d50129e0900c8430f;hpb=e7b2c17aad3953d1c314c1e82cb5c6cad97885cd;p=mirror_edk2.git

diff --git a/DuetPkg/CreateBootDisk.sh b/DuetPkg/CreateBootDisk.sh
old mode 100644
new mode 100755
index faa9032cc3..bfe1abd83e
--- a/DuetPkg/CreateBootDisk.sh
+++ b/DuetPkg/CreateBootDisk.sh
@@ -2,7 +2,7 @@
 
 # Set up environment at fisrt.
 export BUILD_DIR=$WORKSPACE/Build/DuetPkg/DEBUG_UNIXGCC
-export BASETOOLS_DIR=$EDK_TOOLS_PATH/Source/C/bin
+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
@@ -14,8 +14,8 @@ if [ \
      "$*" = "--help" \
    ]
 then
-	echo "Usage: CreateBootDisk [usb|floppy|ide] MediaPath DevicePath [FAT12|FAT16|FAT32]"
-	echo "e.g. : CreateBootDisk floppy /media/floppy0 /dev/fd0 FAT12 "
+	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
 
@@ -44,9 +44,17 @@ then
 	
 				mkdir -p $EFI_BOOT_MEDIA/efi
 				mkdir -p $EFI_BOOT_MEDIA/efi/boot
-
-				cp $WORKSPACE/EdkShellBinPkg/MinimumShell/Ia32/Shell.efi $EFI_BOOT_MEDIA/efi/boot/bootia32.efi 
-	
+				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!"
@@ -57,23 +65,12 @@ then
 			if [ "$4" = FAT12 ]
 				then
 				echo "Start to create file boot disk ..."
-				dd if=/dev/zero of=$EFI_BOOT_MEDIA bs=512 count=2880 2> /dev/null
-				mformat -i $EFI_BOOT_MEDIA -f 1440 ::
 				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 $BOOTSECTOR_BIN_DIR/bootsect.com -f
-				$BASETOOLS_DIR/GnuGenBootSector -o tmp.$EFI_BOOT_MEDIA -i $BOOTSECTOR_BIN_DIR/bootsect.com
-				dd if=tmp.$EFI_BOOT_MEDIA of=$EFI_BOOT_MEDIA conv=notrunc 2> /dev/null
-				rm -f tmp.$EFI_BOOT_MEDIA
-
-				mcopy -i $EFI_BOOT_MEDIA $BUILD_DIR/FV/Efildr ::/Efildr
-	
-				mmd -i $EFI_BOOT_MEDIA ::/efi
-				mmd -i $EFI_BOOT_MEDIA ::/efi/boot
-
-				mcopy -i $EFI_BOOT_MEDIA $WORKSPACE/EdkShellBinPkg/MinimumShell/Ia32/Shell.efi ::/efi/boot/bootia32.efi 
+				$BASETOOLS_DIR/GnuGenBootSector -o $EFI_BOOT_MEDIA -i $BOOTSECTOR_BIN_DIR/bootsect.com
 				echo Done.
 			else
 				echo "Wrong FAT type" $4 "for floppy!"
@@ -84,11 +81,21 @@ then
 
 			if [ "$4" = FAT16 ]
 			then
-				if [ "$5" = step2 ]
+				if [ "$6" = step2 ]
 				then
 					cp $BUILD_DIR/FV/Efildr16 $EFI_BOOT_MEDIA
 					mkdir $EFI_BOOT_MEDIA/efi/boot
-					cp $WORKSPACE/EdkShellBinPkg/MinimumShell/ia32/Shell.efi $EFI_BOOT_MEDIA/efi/boot/bootia32.efi
+					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 ...
@@ -104,11 +111,21 @@ then
 				fi
 			elif [ "$4" = FAT32 ]
 			then 
-				if [ "$5" = step2 ]
+				if [ "$6" = step2 ]
 				then
 					cp $BUILD_DIR/FV/Efildr20 $EFI_BOOT_MEDIA
 					mkdir $EFI_BOOT_MEDIA/efi/boot
-					cp $WORKSPACE/EdkShellBinPkg/MinimumShell/ia32/Shell.efi $EFI_BOOT_MEDIA/efi/boot/bootia32.efi
+					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 ...