Remove exit from batch file

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

diff --git a/DuetPkg/BootSector/efi32.S b/DuetPkg/BootSector/efi32.S
index 11e53b248874f47ba4b6bddfd61e92e2d9f71b1c..a9f100d47b86ddb6ac6bc669fa39c387449031db 100644 (file)
--- a/DuetPkg/BootSector/efi32.S
+++ b/DuetPkg/BootSector/efi32.S
@@ -138,7 +138,7 @@ SectionLoop:
 \r
     movzwl  (Idtr), %eax                  # get size of IDT\r
     incl    %eax\r
 \r
     movzwl  (Idtr), %eax                  # get size of IDT\r
     incl    %eax\r

-    addl    2(Idtr), %eax             # add to base of IDT to get location of memory map... \r
+    addl    (Idtr + 2), %eax             # add to base of IDT to get location of memory map... \r

     pushl   %eax                        # push memory map location on stack for call to EFILDR...\r
 \r
     pushl   %eax                        # push return address (useless, just for stack balance)\r
     pushl   %eax                        # push memory map location on stack for call to EFILDR...\r
 \r
     pushl   %eax                        # push return address (useless, just for stack balance)\r

diff --git a/DuetPkg/DuetPkg.fdf b/DuetPkg/DuetPkg.fdf
index 83f91e0004bb54296072a31b5aff71690f085552..d6718f697aedb0d069dbe1ee9230738c408936f7 100644 (file)
--- a/DuetPkg/DuetPkg.fdf
+++ b/DuetPkg/DuetPkg.fdf
@@ -101,10 +101,10 @@ INF  IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/VgaClassDxe.inf
 #IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBusDxe.inf\r
 \r
   # Usb Support\r
 #IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBusDxe.inf\r
 \r
   # Usb Support\r

-INF  MdeModulePkg/Bus/Pci/UhciDxe/UhciDxe.inf\r
-INF  MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf\r
-INF  MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf\r
-INF  MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf\r
+#INF  MdeModulePkg/Bus/Pci/UhciDxe/UhciDxe.inf\r
+#INF  MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf\r
+#INF  MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf\r
+#INF  MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf\r

 \r
   # ISA Support\r
 INF  PcAtChipsetPkg/IsaAcpiDxe/IsaAcpi.inf\r
 \r
   # ISA Support\r
 INF  PcAtChipsetPkg/IsaAcpiDxe/IsaAcpi.inf\r


@@ -116,10 +116,10 @@ INF  IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/IsaFloppyDxe.inf
 INF  MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf\r
 INF  MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf\r
 INF  MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf\r
 INF  MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf\r
 INF  MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf\r
 INF  MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf\r

-INF  DuetPkg/BiosVideoThunkDxe/BiosVideo.inf\r
+#INF  DuetPkg/BiosVideoThunkDxe/BiosVideo.inf\r

 \r
   # Binary INF file to support toggle among different CPU architectures.\r
 \r
   # Binary INF file to support toggle among different CPU architectures.\r

-INF  FatBinPkg/EnhancedFatDxe/Fat.inf\r
+#INF  FatBinPkg/EnhancedFatDxe/Fat.inf\r

 \r
 FILE FREEFORM = 7BB28B99-61BB-11D5-9A5D-0090273FC14D {\r
     SECTION RAW = MdeModulePkg/Logo/Logo.bmp\r
 \r
 FILE FREEFORM = 7BB28B99-61BB-11D5-9A5D-0090273FC14D {\r
     SECTION RAW = MdeModulePkg/Logo/Logo.bmp\r

diff --git a/DuetPkg/EfiLdr/EfiLdr.inf b/DuetPkg/EfiLdr/EfiLdr.inf
index acef3b9344ba86a6e350af6e3eab79622cf6eb2c..d94267dad78b8b2fc9477e6b0a8de0a4fa352361 100644 (file)
--- a/DuetPkg/EfiLdr/EfiLdr.inf
+++ b/DuetPkg/EfiLdr/EfiLdr.inf
@@ -58,3 +58,4 @@
   MSFT:*_*_IA32_PP_FLAGS == /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
   MSFT:*_*_IA32_ASM_FLAGS == /nologo /W3 /WX /c /coff /Cx /Zd /W0 /Zi\r
   MSFT:*_*_IA32_ASMLINK_FLAGS == /link /nologo /tiny  \r
   MSFT:*_*_IA32_PP_FLAGS == /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
   MSFT:*_*_IA32_ASM_FLAGS == /nologo /W3 /WX /c /coff /Cx /Zd /W0 /Zi\r
   MSFT:*_*_IA32_ASMLINK_FLAGS == /link /nologo /tiny  \r

+  GCC:*_*_IA32_CC_FLAGS = -g

diff --git a/DuetPkg/EfiLdr/EfiLoader.c b/DuetPkg/EfiLdr/EfiLoader.c
index f9804e7ffb35edb12757aa5aa2ddb0619d485464..6b8f5984e9ed3646a340a4ad2401e62c01d1e197 100644 (file)
--- a/DuetPkg/EfiLdr/EfiLoader.c
+++ b/DuetPkg/EfiLdr/EfiLoader.c
@@ -56,6 +56,8 @@ EfiLoader (
   ClearScreen();\r
   \r
   PrintHeader ('A');\r
   ClearScreen();\r
   \r
   PrintHeader ('A');\r

+  
+  CpuDeadLoop();

 \r
   AsciiSPrint (PrintBuffer, 256, "Enter DUET Loader ...\n", BiosMemoryMapBaseAddress);\r
   PrintString (PrintBuffer);\r
 \r
   AsciiSPrint (PrintBuffer, 256, "Enter DUET Loader ...\n", BiosMemoryMapBaseAddress);\r
   PrintString (PrintBuffer);\r

diff --git a/DuetPkg/PostBuild.sh b/DuetPkg/PostBuild.sh
index 4c5757f5a78c370c41c3bd19b77c49272bfd6969..a839ec5fce08b53b67a96c73a275bba6d1da0cf4 100644 (file)
--- a/DuetPkg/PostBuild.sh
+++ b/DuetPkg/PostBuild.sh
@@ -17,7 +17,6 @@ if [ \
 then
        echo Error! Please specific the architecture. 
        echo Usage: "./PostBuild.sh [IA32|X64]"
 then
        echo Error! Please specific the architecture. 
        echo Usage: "./PostBuild.sh [IA32|X64]"

-    exit 1

 fi
 
 case "$1" in
 fi
 
 case "$1" in


@@ -29,7 +28,6 @@ case "$1" in
      ;;
    *)
      echo Invalid Architecture string, should be only IA32 or X64
      ;;
    *)
      echo Invalid Architecture string, should be only IA32 or X64

-     exit 1

 esac
 
 #
 esac
 
 #


@@ -74,4 +72,3 @@ then
        echo Done!
 fi
 
        echo Done!
 fi
 

-exit 0
\ No newline at end of file