OvmfPkg: remove gUefiOvmfPkgTokenSpaceGuid.PcdSecureBootEnable

[mirror_edk2.git] / OvmfPkg / OvmfPkgIa32X64.dsc

diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
index 71ac62f023b5f6c9e707d384fdceaac697e3b78f..fd554f8f375cb1287bc61d4bb63fd6b0dc9c7399 100644 (file)
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
@@ -40,6 +40,25 @@
   DEFINE SMM_REQUIRE             = FALSE\r
   DEFINE TLS_ENABLE              = FALSE\r
 \r
+  #\r
+  # Flash size selection. Setting FD_SIZE_IN_KB on the command line directly to\r
+  # one of the supported values, in place of any of the convenience macros, is\r
+  # permitted.\r
+  #\r
+!ifdef $(FD_SIZE_1MB)\r
+  DEFINE FD_SIZE_IN_KB           = 1024\r
+!else\r
+!ifdef $(FD_SIZE_2MB)\r
+  DEFINE FD_SIZE_IN_KB           = 2048\r
+!else\r
+!ifdef $(FD_SIZE_4MB)\r
+  DEFINE FD_SIZE_IN_KB           = 4096\r
+!else\r
+  DEFINE FD_SIZE_IN_KB           = 2048\r
+!endif\r
+!endif\r
+!endif\r
+\r
 [BuildOptions]\r
   GCC:*_UNIXGCC_*_CC_FLAGS             = -DMDEPKG_NDEBUG\r
   GCC:RELEASE_*_*_CC_FLAGS             = -DMDEPKG_NDEBUG\r
@@ -386,9 +405,6 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport|TRUE\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdConOutUgaSupport|FALSE\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdInstallAcpiSdtProtocol|TRUE\r
-!if $(SECURE_BOOT_ENABLE) == TRUE\r
-  gUefiOvmfPkgTokenSpaceGuid.PcdSecureBootEnable|TRUE\r
-!endif\r
 !if $(SMM_REQUIRE) == TRUE\r
   gUefiOvmfPkgTokenSpaceGuid.PcdSmmSmramRequire|TRUE\r
   gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmEnableBspElection|FALSE\r
@@ -400,8 +416,14 @@
   gEfiMdePkgTokenSpaceGuid.PcdMaximumGuidedExtractHandler|0x10\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxFvSupported|6\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxPeimPerFv|32\r
+!if ($(FD_SIZE_IN_KB) == 1024) || ($(FD_SIZE_IN_KB) == 2048)\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize|0x2000\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdMaxAuthVariableSize|0x2800\r
+!endif\r
+!if $(FD_SIZE_IN_KB) == 4096\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize|0x8400\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxAuthVariableSize|0x8400\r
+!endif\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdVariableStoreSize|0xe000\r
 \r
   gEfiMdeModulePkgTokenSpaceGuid.PcdVpdBaseAddress|0x0\r