OvmfPkg: Fix SMM/RT driver section alignment for XCODE5/CLANGPDB

[mirror_edk2.git] / OvmfPkg / OvmfXen.dsc

diff --git a/OvmfPkg/OvmfXen.dsc b/OvmfPkg/OvmfXen.dsc
index 5751ff1f035291f1d2904b9d419717b575db4ec7..f997a196e2ef02c5fbdbfd85bb3b0a5a9dddc9d5 100644 (file)
--- a/OvmfPkg/OvmfXen.dsc
+++ b/OvmfPkg/OvmfXen.dsc
@@ -82,13 +82,17 @@
 \r
 [BuildOptions.common.EDKII.DXE_RUNTIME_DRIVER]\r
   GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000\r
-  XCODE:*_*_*_DLINK_FLAGS =\r
+  XCODE:*_*_*_DLINK_FLAGS = -seg1addr 0x1000 -segalign 0x1000\r
+  XCODE:*_*_*_MTOC_FLAGS = -align 0x1000\r
+  CLANGPDB:*_*_*_DLINK_FLAGS = /ALIGN:4096\r
 \r
 # Force PE/COFF sections to be aligned at 4KB boundaries to support page level\r
 # protection of DXE_SMM_DRIVER/SMM_CORE modules\r
 [BuildOptions.common.EDKII.DXE_SMM_DRIVER, BuildOptions.common.EDKII.SMM_CORE]\r
   GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000\r
-  XCODE:*_*_*_DLINK_FLAGS =\r
+  XCODE:*_*_*_DLINK_FLAGS = -seg1addr 0x1000 -segalign 0x1000\r
+  XCODE:*_*_*_MTOC_FLAGS = -align 0x1000\r
+  CLANGPDB:*_*_*_DLINK_FLAGS = /ALIGN:4096\r
 \r
 ################################################################################\r
 #\r
@@ -151,7 +155,7 @@
   UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf\r
   SerializeVariablesLib|OvmfPkg/Library/SerializeVariablesLib/SerializeVariablesLib.inf\r
   QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgDxeLib.inf\r
-  LoadLinuxLib|OvmfPkg/Library/LoadLinuxLib/LoadLinuxLib.inf\r
+  QemuLoadImageLib|OvmfPkg/Library/GenericQemuLoadImageLib/GenericQemuLoadImageLib.inf\r
   MemEncryptSevLib|OvmfPkg/Library/BaseMemEncryptSevLib/BaseMemEncryptSevLib.inf\r
   LockBoxLib|OvmfPkg/Library/LockBoxLib/LockBoxBaseLib.inf\r
   CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.inf\r
@@ -692,6 +696,10 @@
       gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE\r
   }\r
 !endif\r
+  OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf {\r
+    <PcdsFixedAtBuild>\r
+      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE\r
+  }\r
   ShellPkg/Application/Shell/Shell.inf {\r
     <LibraryClasses>\r
       ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf\r