Prevent infinite recursion when ASSERT(), DEBUG(), or any other use of ReportStatusCo...

[mirror_edk2.git] / UnixPkg / UnixPkgX64.fdf

diff --git a/UnixPkg/UnixPkgX64.fdf b/UnixPkg/UnixPkgX64.fdf
index 706824d21c605fd228c620f7b762603fa10a6be1..9f677464e1efe0ad0876bcffd2777250d4f9c2c3 100644 (file)
--- a/UnixPkg/UnixPkgX64.fdf
+++ b/UnixPkg/UnixPkgX64.fdf
@@ -31,7 +31,7 @@
 # buffer for the FD (0x41000000). If this address does not match the FV will get\r
 # relocated in place (works, but not a great idea).\r
 #\r
-BaseAddress   = 0x41000000|gEfiUnixPkgTokenSpaceGuid.PcdUnixFdBaseAddress   #The base address of the FLASH Device.\r
+BaseAddress   = 0x102000000|gEfiUnixPkgTokenSpaceGuid.PcdUnixFdBaseAddress   #The base address of the FLASH Device.\r
 Size          = 0x004a0000|gEfiUnixPkgTokenSpaceGuid.PcdUnixFirmwareFdSize  #The size in bytes of the FLASH Device\r
 ErasePolarity = 1\r
 BlockSize     = 0x10000\r
@@ -244,16 +244,17 @@ INF  MdeModulePkg/Application/HelloWorld/HelloWorld.inf
 #INF  MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf\r
 #INF  UnixPkg/SnpUnixDxe/SnpUnixDxe.inf\r
  \r
+!if $(COMPILE_BINS)\r
 INF FatPkg/EnhancedFatDxe/Fat.inf\r
 \r
-FILE APPLICATION = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile) {\r
-  SECTION PE32 =Build/GccShellPkg/DEBUG_XCODE32/X64/ShellFull.efi\r
+ FILE APPLICATION = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile) {\r
+  SECTION PE32 =Build/GccShellPkg/DEBUG_UNIXPKG/X64/ShellFull.efi\r
  }\r
-\r
-# Note: Warning current X64 port does not use EFI ABI so thease bins will crash\r
-#INF  RuleOverride = BINARY USE = X64 FatBinPkg/EnhancedFatDxe/Fat.inf\r
-#INF  RuleOverride = BINARY USE = X64 EdkShellBinPkg/FullShell/FullShell.inf\r
-\r
+!else\r
+# Used checked in Visual Studio binaries\r
+INF  RuleOverride = BINARY USE = X64 FatBinPkg/EnhancedFatDxe/Fat.inf\r
+INF  RuleOverride = BINARY USE = X64 EdkShellBinPkg/FullShell/FullShell.inf\r
+!endif\r
 \r
 FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {\r
         SECTION RAW = MdeModulePkg/Logo/Logo.bmp\r