From: klu2 Date: Sun, 15 Mar 2009 11:49:12 +0000 (+0000) Subject: Remove exit from batch file X-Git-Tag: edk2-stable201903~18373 X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=49794755ba41d962f4448364d301939e26eb2bf2 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 11e53b2488..a9f100d47b 100644 --- a/DuetPkg/BootSector/efi32.S +++ b/DuetPkg/BootSector/efi32.S @@ -138,7 +138,7 @@ SectionLoop: movzwl (Idtr), %eax # get size of IDT incl %eax - addl 2(Idtr), %eax # add to base of IDT to get location of memory map... + addl (Idtr + 2), %eax # add to base of IDT to get location of memory map... pushl %eax # push memory map location on stack for call to EFILDR... pushl %eax # push return address (useless, just for stack balance) diff --git a/DuetPkg/DuetPkg.fdf b/DuetPkg/DuetPkg.fdf index 83f91e0004..d6718f697a 100644 --- 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 # Usb Support -INF MdeModulePkg/Bus/Pci/UhciDxe/UhciDxe.inf -INF MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf -INF MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf -INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf +#INF MdeModulePkg/Bus/Pci/UhciDxe/UhciDxe.inf +#INF MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf +#INF MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf +#INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf # ISA Support INF PcAtChipsetPkg/IsaAcpiDxe/IsaAcpi.inf @@ -116,10 +116,10 @@ INF IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/IsaFloppyDxe.inf INF MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf -INF DuetPkg/BiosVideoThunkDxe/BiosVideo.inf +#INF DuetPkg/BiosVideoThunkDxe/BiosVideo.inf # Binary INF file to support toggle among different CPU architectures. -INF FatBinPkg/EnhancedFatDxe/Fat.inf +#INF FatBinPkg/EnhancedFatDxe/Fat.inf FILE FREEFORM = 7BB28B99-61BB-11D5-9A5D-0090273FC14D { SECTION RAW = MdeModulePkg/Logo/Logo.bmp diff --git a/DuetPkg/EfiLdr/EfiLdr.inf b/DuetPkg/EfiLdr/EfiLdr.inf index acef3b9344..d94267dad7 100644 --- 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 MSFT:*_*_IA32_ASM_FLAGS == /nologo /W3 /WX /c /coff /Cx /Zd /W0 /Zi MSFT:*_*_IA32_ASMLINK_FLAGS == /link /nologo /tiny + GCC:*_*_IA32_CC_FLAGS = -g diff --git a/DuetPkg/EfiLdr/EfiLoader.c b/DuetPkg/EfiLdr/EfiLoader.c index f9804e7ffb..6b8f5984e9 100644 --- a/DuetPkg/EfiLdr/EfiLoader.c +++ b/DuetPkg/EfiLdr/EfiLoader.c @@ -56,6 +56,8 @@ EfiLoader ( ClearScreen(); PrintHeader ('A'); + + CpuDeadLoop(); AsciiSPrint (PrintBuffer, 256, "Enter DUET Loader ...\n", BiosMemoryMapBaseAddress); PrintString (PrintBuffer); diff --git a/DuetPkg/PostBuild.sh b/DuetPkg/PostBuild.sh index 4c5757f5a7..a839ec5fce 100644 --- 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]" - exit 1 fi case "$1" in @@ -29,7 +28,6 @@ case "$1" in ;; *) echo Invalid Architecture string, should be only IA32 or X64 - exit 1 esac # @@ -74,4 +72,3 @@ then echo Done! fi -exit 0 \ No newline at end of file