diff --git a/OvmfPkg/Include/Dsc/OvmfOptHwComponents.dsc.inc b/OvmfPkg/Include/Dsc/OvmfOptHwComponents.dsc.inc
index 569abb2ec6..e3f955eca3 100644
--- a/OvmfPkg/Include/Dsc/OvmfOptHwComponents.dsc.inc
+++ b/OvmfPkg/Include/Dsc/OvmfOptHwComponents.dsc.inc
@@ -14,7 +14,12 @@
   OvmfPkg/LsiScsiDxe/LsiScsiDxe.inf
 !endif
 !if $(SDCARD_ENABLE) == TRUE
-  MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.inf
+  MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.inf {
+    <LibraryClasses>
+      UefiDriverEntryPoint|OvmfPkg/Library/UefiDriverEntryPointFwCfgOverrideLib/UefiDriverEntryPointFwCfgOverrideLib.inf
+    <PcdsFixedAtBuild>
+      gUefiOvmfPkgTokenSpaceGuid.PcdEntryPointOverrideFwCfgVarName|"opt/org.tianocore/SDCardSupport"
+  }
   MdeModulePkg/Bus/Sd/SdDxe/SdDxe.inf
   MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.inf
 !endif
diff --git a/OvmfPkg/RUNTIME_CONFIG.md b/OvmfPkg/RUNTIME_CONFIG.md
index 42a472652c..b75a5dacad 100644
--- a/OvmfPkg/RUNTIME_CONFIG.md
+++ b/OvmfPkg/RUNTIME_CONFIG.md
@@ -247,3 +247,13 @@ qemu-system-x86_64 -fw_cfg name=opt/org.tianocore/UsbStorageSupport,string=yes
 ```
 
 
+## Other: opt/org.tianocore/SDCardSupport
+
+This enables/disables the edk2 drivers SD card support.
+Default: enabled.  Usage:
+
+```
+qemu-system-x86_64 -fw_cfg name=opt/org.tianocore/SDCardSupport,string=no
+```
+
+